Fix du crash lors de la sauvegarde de nouveaux paramètres wifi

Author: Devdevdavid

lightkit/software/data/wifi_settings.html

@@ -77,7 +77,7 @@ <h2>Wifi</h2>
         <!-- Client -->
           <div id="wifiClientForm">
             <p class="classic_form_help">
-              Le module se connecte à un réseau wifi existant grâce au SSID et mode passe wifi.
+              Le module se connecte à un réseau wifi existant grâce au SSID et mot de passe wifi.
             </p>
 
             <label for="wifiClientSSID">SSID :</label><br>
@@ -132,8 +132,8 @@ <h2>Wifi</h2>
 
     function write_wifi_form(json)
     {
-      document.getElementById('wifiModeAP').checked = (json["mode"] == MODE_AP);
-      document.getElementById('wifiModeClient').checked = (json["mode"] == MODE_CLIENT);
+      document.getElementById('wifiModeAP').checked = (json["userMode"] == MODE_AP);
+      document.getElementById('wifiModeClient').checked = (json["userMode"] == MODE_CLIENT);
       document.getElementById('wifiAPSSID').value = json["ap"]["ssid"];
       document.getElementById('wifiAPPassword').value = json["ap"]["password"];
       document.getElementById('wifiAPIP').value = json["ap"]["ip"];
@@ -154,11 +154,11 @@ <h2>Wifi</h2>
       json["use_default"] = false;
 
       if (document.getElementById('wifiModeAP').checked) {
-        json["mode"] = MODE_AP;
+        json["userMode"] = MODE_AP;
       } else if (document.getElementById('wifiModeClient').checked) {
-        json["mode"] = MODE_CLIENT;
+        json["userMode"] = MODE_CLIENT;
       } else {
-        json["mode"] = MODE_NONE;
+        json["userMode"] = MODE_NONE;
       }
       json["ap"] = {};
       json["ap"]["ssid"] = document.getElementById('wifiAPSSID').value;

lightkit/software/src/web/web_server.cpp

@@ -396,7 +396,7 @@ void handle_get_wifi_settings(void)
 
 	wifiHandle = wifi_get_handle();
 
-	json["mode"] = wifiHandle->mode;
+	json["userMode"] = wifiHandle->userMode;
 	json["ap"]["ssid"] = wifiHandle->ap.ssid;
 	json["ap"]["password"] = wifiHandle->ap.password;
 	json["ap"]["channel"] = wifiHandle->ap.channel;
@@ -420,12 +420,9 @@ void handle_set_wifi_settings(void)
 {
 	String reason = "";
 	int32_t ret = 0;
-	wifi_handle_t * wifiHandle;
 	wifi_handle_t wifiHandleTmp;
 	DynamicJsonDocument json(1024);
 
-	wifiHandle = wifi_get_handle();
-
 	if (!server.hasArg("v")) {
 		handle_bad_parameter();
 		return;
@@ -434,10 +431,10 @@ void handle_set_wifi_settings(void)
 	deserializeJson(json, server.arg("v"));
 
 	if (json["use_default"] == true) {
-		ret = wifi_use_default_settings(reason);
+		ret = wifi_use_default_settings();
 	} else {
 		// Copy data
-		wifiHandleTmp.mode = json["mode"];
+		wifiHandleTmp.userMode = json["userMode"];
 		strncpy(wifiHandleTmp.ap.ssid, json["ap"]["ssid"].as<char*>(), WIFI_SSID_MAX_LEN);
 		strncpy(wifiHandleTmp.ap.password, json["ap"]["password"].as<char*>(), WIFI_PASSWORD_MAX_LEN);
 		wifiHandleTmp.ap.channel = json["ap"]["channel"];
@@ -454,8 +451,10 @@ void handle_set_wifi_settings(void)
 	}
 
 	if (ret == 0) {
+		log_info("Using new wifi settings");
 		server.send(200, "text/plain", "ok");
 	} else {
+		log_info("Failed to update wifi settings: %s", reason.c_str());
 		server.send(200, "text/plain", reason);
 	}
 }

lightkit/software/src/wifi/wifi.cpp

@@ -98,10 +98,20 @@ static int wifi_client_init(void)
 	return 0;
 }
 
+/**
+ * @brief Check if pWifiHandle contains valid data
+ *
+ * @param pWifiHandle Data to check
+ * @param reason Text message containing the reason of not valid
+ * @warning This text message appears in the webserver, it has to be
+ * written using the appropriate language
+ *
+ * @return boolean
+ */
 static bool wifi_is_handle_valid(wifi_handle_t * pWifiHandle, String &reason)
 {
-	if (pWifiHandle->mode >= MODE_MAX) {
-		reason = "Mauvais mode";
+	if (pWifiHandle->userMode >= MODE_MAX) {
+		reason = "Mauvais mode wifi";
 		return false;
 	}
 
@@ -153,7 +163,9 @@ int32_t wifi_use_new_settings(wifi_handle_t * pWifiHandle, String &reason)
 {
 	if (wifi_is_handle_valid(pWifiHandle, reason)) {
 		// Copy new data to handle
-		memcpy(&wifiHandle, pWifiHandle, sizeof(wifi_handle_t));
+		memcpy(wifiHandle, pWifiHandle, sizeof(wifi_handle_t));
+		wifiHandle->forcedMode = MODE_NONE;
+		wifiHandle->mode = MODE_NONE;
 
 		// Save handle to flash
 		return flash_write();
@@ -165,8 +177,9 @@ int32_t wifi_use_new_settings(wifi_handle_t * pWifiHandle, String &reason)
 /**
  * @brief Use default settings for wifi module
  */
-int32_t wifi_use_default_settings(String &reason)
+int32_t wifi_use_default_settings(void)
 {
+	String reason;
 	return wifi_use_new_settings(&defaultWifiSettings, reason);
 }
 
@@ -204,6 +217,10 @@ int wifi_init(void)
 		wifi_print();
 	} else {
 		log_error("Wifi mode not supported: %d", wifiHandle->mode);
+
+		// Somehow, we managed to save a wrong configuration
+		// Use default for next reset
+		wifi_use_default_settings();
 	}
 
 	// Check error

lightkit/software/src/wifi/wifi.hpp

@@ -76,7 +76,7 @@ typedef struct {
 // PROTOTYPES
 wifi_handle_t * wifi_get_handle(void);
 int32_t wifi_use_new_settings(wifi_handle_t * pWifiHandle, String &reason);
-int32_t wifi_use_default_settings(String &reason);
+int32_t wifi_use_default_settings(void);
 int  wifi_init(void);
 void wifi_main(void);