WebServer: Restart the web server when the WiFi parameters change

Author: LeeLeahy2

Firmware/RTK_Everywhere/States.ino

@@ -445,6 +445,8 @@ void stateUpdate()
                 // Allow for 750ms before we parse buffer for all data to arrive
                 if (millis() - timeSinceLastIncomingSetting > 750)
                 {
+                    bool changed;
+
                     currentlyParsingData =
                         true; // Disallow new data to flow from websocket while we are parsing the current data
 
@@ -453,17 +455,25 @@ void stateUpdate()
                         systemWrite(incomingSettings[x]);
                     systemPrintln();
 
+                    webServerSettingsClone();
                     parseIncomingSettings();
                     settings.gnssConfiguredOnce = false; // On the next boot, reapply all settings
                     settings.gnssConfiguredBase = false;
                     settings.gnssConfiguredRover = false;
                     recordSystemSettings(); // Record these settings to unit
+                    changed = webServerSettingsCheckAndFree();
 
                     // Clear buffer
                     incomingSettingsSpot = 0;
                     memset(incomingSettings, 0, AP_CONFIG_SETTING_SIZE);
 
                     currentlyParsingData = false; // Allow new data from websocket
+                    if (changed)
+                    {
+                        // Restart the web server if the WiFi parameters changed
+                        webServerStop();
+                        changeState(STATE_WEB_CONFIG_NOT_STARTED); // Return to rover mode to avoid being in fixed base mode
+                    }
                 }
             }
 

Firmware/RTK_Everywhere/WebServer.ino

@@ -52,6 +52,7 @@ static const char *const webServerStateNames[] = {
 static const int webServerStateEntries = sizeof(webServerStateNames) / sizeof(webServerStateNames[0]);
 
 static uint8_t webServerState;
+static struct Settings * webServerPreviousSettings;
 
 // Once connected to the access point for WiFi Config, the ESP32 sends current setting values in one long string to
 // websocket After user clicks 'save', data is validated via main.js and a long string of values is returned.
@@ -1125,6 +1126,35 @@ void webServerSetState(uint8_t newState)
         reportFatalError("Web Server: Invalid web config state");
 }
 
+//----------------------------------------
+// Check the web server settings and free the settings structure
+//----------------------------------------
+bool webServerSettingsCheckAndFree()
+{
+    bool changed;
+
+    changed = false;
+    if (webServerPreviousSettings)
+    {
+        changed = wifiCheckSettings(webServerPreviousSettings);
+        rtkFree(webServerPreviousSettings, "WebServer previous settings");
+        webServerPreviousSettings = nullptr;
+    }
+    return changed;
+}
+
+//----------------------------------------
+// Allocate the settings structure and clone the settings
+//----------------------------------------
+void webServerSettingsClone()
+{
+    webServerPreviousSettings = (struct Settings *) rtkMalloc(sizeof(settings), "WebServer previous settings");
+    if (webServerPreviousSettings == nullptr)
+        systemPrintln("ERROR: Web Server failed to allocate previous settings!\r\n");
+    else
+        memcpy(webServerPreviousSettings, &settings, sizeof(settings));
+}
+
 //----------------------------------------
 // Start the Web Server state machine
 //----------------------------------------

Firmware/RTK_Everywhere/WiFi.ino

@@ -460,6 +460,29 @@ void menuWiFi()
     clearBuffer(); // Empty buffer of any newline chars
 }
 
+//*********************************************************************
+// Check for setting differences
+bool wifiCheckSettings(struct Settings * newSettings)
+{
+    bool changed;
+
+    // Determine if any of the WiFi station SSID or password changes
+    changed = (memcmp(newSettings->wifiNetworks[0].ssid, settings.wifiNetworks[0].ssid, SSID_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[0].password, settings.wifiNetworks[0].password, PASSWORD_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[1].ssid, settings.wifiNetworks[1].ssid, SSID_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[1].password, settings.wifiNetworks[1].password, PASSWORD_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[2].ssid, settings.wifiNetworks[2].ssid, SSID_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[2].password, settings.wifiNetworks[2].password, PASSWORD_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[3].ssid, settings.wifiNetworks[3].ssid, SSID_LENGTH) != 0)
+        || (memcmp(newSettings->wifiNetworks[3].password, settings.wifiNetworks[3].password, PASSWORD_LENGTH) != 0);
+    if (changed)
+    {
+        // Update the WiFi settings
+        wifiUpdateSettings();
+    }
+    return changed;
+}
+
 //*********************************************************************
 // Display the soft AP details
 void wifiDisplayNetworkData()