Move wifi settings check to WiFi.ino

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -49,7 +49,6 @@ const uint8_t * networkGetMacAddress()
 }
 NetPriority_t networkGetPriority() {return 0;}
 bool networkHasInternet() {return false;}
-bool networkHasInternet(NetIndex_t index) {return false;}
 bool networkInterfaceHasInternet(NetIndex_t index) {return false;}
 bool networkIsInterfaceStarted(NetIndex_t index) {return false;}
 void networkMarkOffline(NetIndex_t index) {}

Firmware/RTK_Everywhere/States.ino

@@ -457,7 +457,7 @@ void stateUpdate()
 
                     //Create temporary copy of Settings, so that we can check if they change while parsing
                     //Useful for detecting when we need to change WiFi station settings
-                    webServerSettingsClone();
+                    wifiSettingsClone();
 
                     parseIncomingSettings();
 

Firmware/RTK_Everywhere/WebServer.ino

@@ -52,7 +52,6 @@ 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,35 +1124,6 @@ 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
 //----------------------------------------
@@ -1173,7 +1143,7 @@ void webServerStart()
             systemPrintln("Web Server: Starting");
 
         // Start the network
-        if ((settings.wifiConfigOverAP == false) || networkHasInternet())
+        if ((settings.wifiConfigOverAP == false) || networkInterfaceHasInternet(NETWORK_WIFI_STATION))
             networkConsumerAdd(NETCONSUMER_WEB_CONFIG, NETWORK_ANY, __FILE__, __LINE__);
         if (settings.wifiConfigOverAP)
             networkSoftApConsumerAdd(NETCONSUMER_WEB_CONFIG, __FILE__, __LINE__);

Firmware/RTK_Everywhere/WiFi.ino

@@ -341,11 +341,15 @@ bool wifiSoftApSsidSet;  // Set when the WiFi soft AP SSID string exists
 bool wifiStationRestart; // Restart Wifi station
 bool wifiStationSsidSet; // Set when one or more SSID strings exist
 
+static struct Settings *wifiPreviousSettings;
+
 //*********************************************************************
 // Set WiFi credentials
 // Enable TCP connections
 void menuWiFi()
 {
+    wifiSettingsClone(); // Create a copy of settings to detect if WiFi settings change
+
     while (1)
     {
         networkDisplayInterface(NETWORK_WIFI_STATION);
@@ -418,9 +422,26 @@ void menuWiFi()
     clearBuffer(); // Empty buffer of any newline chars
 }
 
+//----------------------------------------
+// Check the settings and free the settings structure
+//----------------------------------------
+bool wifiSettingsChangedAndFree()
+{
+    bool changed;
+
+    changed = false;
+    if (wifiPreviousSettings)
+    {
+        changed = wifiSettingsChanged(wifiPreviousSettings);
+        rtkFree(wifiPreviousSettings, "WiFi previous settings");
+        wifiPreviousSettings = nullptr;
+    }
+    return changed;
+}
+
 //*********************************************************************
 // Check for setting differences
-bool wifiCheckSettings(struct Settings *newSettings)
+bool wifiSettingsChanged(struct Settings *newSettings)
 {
     bool changed;
 
@@ -434,14 +455,21 @@ bool wifiCheckSettings(struct Settings *newSettings)
         (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;
 }
 
+//----------------------------------------
+// Allocate the settings structure and clone the settings
+//----------------------------------------
+void wifiSettingsClone()
+{
+    wifiPreviousSettings = (struct Settings *)rtkMalloc(sizeof(settings), "WiFi previous settings");
+    if (wifiPreviousSettings == nullptr)
+        systemPrintln("ERROR: WiFi failed to allocate previous settings!\r\n");
+    else
+        memcpy(wifiPreviousSettings, &settings, sizeof(settings));
+}
+
 //*********************************************************************
 // Display the soft AP details
 void wifiDisplayNetworkData()
@@ -1070,9 +1098,21 @@ void wifiUpdateSettings()
     // Remember the change in SSID values
     wifiStationSsidSet = ssidSet;
 
-    // If there are consumers, and WiFi currently has connectivity, don't restart it
-    if ((networkConsumerCount(NETWORK_WIFI_STATION) > 0) && (networkHasInternet() == false))
+    // If there are consumers, and WiFi currently is not connected, then allow restart
+    if ((networkConsumerCount(NETWORK_WIFI_STATION) > 0) &&
+        (networkInterfaceHasInternet(NETWORK_WIFI_STATION) == false))
+    {
+        if (settings.debugWifiState)
+            systemPrintln("Restarting WiFi because settings have changed");
+        wifiStationRestart = ssidSet;
+    }
+
+    // If we are connected over WiFi, and settings change, restart connection
+    bool wifiChanged =
+        wifiSettingsChangedAndFree(); // Check to see if WiFi settings have been changed, then clear memory
+    if (wifiChanged == true && networkInterfaceHasInternet(NETWORK_WIFI_STATION) == true)
     {
+        // Restart network
         if (settings.debugWifiState)
             systemPrintln("Restarting WiFi because settings have changed");
         wifiStationRestart = ssidSet;

Firmware/RTK_Everywhere/menuCommands.ino

@@ -1305,9 +1305,6 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
 
         knownSetting = true;
 
-        // Check to see if WiFi settings have been changed
-        //bool changed = webServerSettingsCheckAndFree();
-
         // Inform the OTA state machine that it is needed
         otaRequestFirmwareVersionCheck = true;
     }