Merge pull request #670 from sparkfun/pr/662

Merging PR 662 with changes

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/src/main.js

@@ -2424,6 +2424,7 @@ function newFirmwareVersion(firmwareVersion) {
         return;
     }
 
+    showMsg('firmwareCheckNewMsg', "New firmware available!");
     ge("btnGetNewFirmware").innerHTML = "Update to v" + firmwareVersion;
     ge("btnGetNewFirmware").disabled = false;
     ge("firmwareUpdateProgressBar").value = 0;

Firmware/RTK_Everywhere/Network.ino

@@ -1298,7 +1298,6 @@ void networkInterfaceInternetConnectionLost(NetIndex_t index)
         return;
     }
 
-    // Mark this network as offline
     bitMask = 1 << index;
 
     // If we are currently running a start sequence, do nothing
@@ -1310,6 +1309,7 @@ void networkInterfaceInternetConnectionLost(NetIndex_t index)
         return;
     }
 
+    // Mark this network as offline
     networkHasInternet_bm &= ~bitMask;
     if (settings.debugNetworkLayer)
         systemPrintf("%s does NOT have internet access\r\n", networkInterfaceTable[index].name);
@@ -2399,14 +2399,11 @@ void networkUpdate()
 
         // Display the IP address of the highest priority network
         index = networkPriorityTable[networkPriority];
-        if ((index < NETWORK_OFFLINE)
-            && networkInterfaceHasInternet(index)
-            && networkInterfaceTable[index].netif->hasIP())
+        if ((index < NETWORK_OFFLINE) && networkInterfaceHasInternet(index) &&
+            networkInterfaceTable[index].netif->hasIP())
         {
             ipAddress = networkInterfaceTable[index].netif->localIP();
-            systemPrintf("%s: %s%s\r\n",
-                         networkInterfaceTable[index].name,
-                         ipAddress.toString().c_str(),
+            systemPrintf("%s: %s%s\r\n", networkInterfaceTable[index].name, ipAddress.toString().c_str(),
                          networkInterfaceTable[index].netif->isDefault() ? " (default)" : "");
         }
         else

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,7 +455,12 @@ void stateUpdate()
                         systemWrite(incomingSettings[x]);
                     systemPrintln();
 
+                    //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();
+                    
                     parseIncomingSettings();
+                    
                     settings.gnssConfiguredOnce = false; // On the next boot, reapply all settings
                     settings.gnssConfiguredBase = false;
                     settings.gnssConfiguredRover = false;

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