Affichage sur le webserveur de la dernière IP attribuée en tant que client

Author: Devdevdavid

lightkit/software/data/wifi_settings.html

@@ -114,6 +114,12 @@ <h2>Wifi</h2>
               Si le module ne parvient pas à se connecter au réseau existant avec les paramètres fournis, il basculera en mode Point d'Accès après le délais indiqué ci-dessus.
             </p>
 
+            <label for="wifiClientLastIP">Dernière IP :</label><br>
+            <input type="text" id="wifiClientLastIP" name="wifiClientLastIP" autocomplete="off" placeholder="Aucune IP enregistrée" readonly><br>
+            <p class="classic_form_help">
+              IP attribuée au module lors de sa dernière connexion en tant que client.
+            </p>
+
           </div>
         </div>
 
@@ -169,6 +175,7 @@ <h2>Wifi</h2>
       document.getElementById('wifiClientSSID').value = json["client"]["ssid"];
       document.getElementById('wifiClientPassword').value = json["client"]["password"];
       document.getElementById('wifiClientDelayBeforeAPFallbackMs').value = json["client"]["delayBeforeAPFallbackMs"] / 1000;
+      document.getElementById('wifiClientLastIP').value = json["client"]["lastIp"];
     }
 
     function read_wifi_form(json)
@@ -197,6 +204,7 @@ <h2>Wifi</h2>
       json["client"]["ssid"] = document.getElementById('wifiClientSSID').value;
       json["client"]["password"] = document.getElementById('wifiClientPassword').value;
       json["client"]["delayBeforeAPFallbackMs"] = document.getElementById('wifiClientDelayBeforeAPFallbackMs').value * 1000;
+      // wifiClientLastIP is readonly
 
       var params = 'v=' + JSON.stringify(json);
 

lightkit/software/platformio.ini

@@ -7,6 +7,9 @@
 ;
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
+;
+; Note:
+; export envid=board_ring && pio run -e $envid -t upload && pio run -e $envid -t uploadfs && pio device monitor -e $envid
 
 [env]
 monitor_speed = 115200

lightkit/software/src/flash/flash.hpp

@@ -16,7 +16,7 @@
 #define EEPROM_USED_SIZE 256
 
 /** Increment this each time flash_settings_t is incompatible with previous version */
-#define FLASH_STRUCT_VERSION 3
+#define FLASH_STRUCT_VERSION 4
 
 typedef struct {
 	wifi_handle_t     wifiHandle;

lightkit/software/src/web/web_server.cpp

@@ -386,6 +386,8 @@ static void handle_get_wifi_settings(void)
 	json["client"]["ssid"]                    = wifiHandle->client.ssid;
 	json["client"]["password"]                = wifiHandle->client.password;
 	json["client"]["delayBeforeAPFallbackMs"] = wifiHandle->client.delayBeforeAPFallbackMs;
+	IPAddress lastIp                          = IPAddress(wifiHandle->client.lastIp);
+	json["client"]["lastIp"]                  = lastIp.toString();
 
 	serializeJson(json, jsonString);
 	server.send(200, "text/plain", jsonString);

lightkit/software/src/wifi/wifi.cpp

@@ -47,7 +47,8 @@ wifi_handle_t defaultWifiSettings = {
 	.client = {
 		{ .ssid = WIFI_DEFAULT_CLIENT_SSID },
 		{ .password = WIFI_DEFAULT_CLIENT_PASSWORD },
-		.delayBeforeAPFallbackMs = WIFI_DEFAULT_DELAY_AP_FALLBACK
+		.delayBeforeAPFallbackMs = WIFI_DEFAULT_DELAY_AP_FALLBACK,
+		.lastIp = IP_TO_U32(0, 0, 0, 0)
 	}
 };
 // clang-format on
@@ -246,6 +247,36 @@ static int32_t wifi_start_scan(void)
 	return 0;
 }
 
+/**
+ * @brief Check the current IP address of Client mode
+ * and save it to flash if this is a new one
+ * @return 0: OK, -1: error
+ */
+static int32_t wifi_save_current_ip(void)
+{
+	uint32_t  curIp;
+	IPAddress lastIp = IPAddress(wifiHandle->client.lastIp);
+
+	// Do nothing if not client
+	if (wifiHandle->mode != MODE_CLIENT) {
+		return -1;
+	}
+
+	// Get current ip adress and compare
+	curIp = (uint32_t) WiFi.localIP();
+	if (curIp == wifiHandle->client.lastIp) {
+		return 0;
+	}
+
+	log_info("Saving new IP Address: %s (Previous was %s)",
+			 WiFi.localIP().toString().c_str(),
+			 lastIp.toString().c_str());
+
+	// Save it in flash
+	wifiHandle->client.lastIp = curIp;
+	return flash_write();
+}
+
 // =====================
 // PUBLIC FUNCTIONS
 // =====================
@@ -402,9 +433,11 @@ void wifi_main(void)
 					wifi_fallback_as_ap();
 				}
 			} else {
+				// Did we just get connected ?
 				if (_isunset(STATUS_WIFI, STATUS_WIFI_IS_CO)) {
 					_set(STATUS_WIFI, STATUS_WIFI_IS_CO);
 					wifi_print();
+					wifi_save_current_ip();
 				}
 			}
 		}

lightkit/software/src/wifi/wifi.hpp

@@ -78,6 +78,7 @@ typedef struct {
 		char password[WIFI_PASSWORD_MAX_LEN];
 
 		uint32_t delayBeforeAPFallbackMs; // Number of ms when cannot connect as client after boot before rebooting in AP mode
+		uint32_t lastIp;                  // Last valid IP address used last time we got a successful connection as client
 	} client;
 } wifi_handle_t;