Merge branch 'release_candidate' of https://github.com/sparkfun/SparkFun_RTK_Everywhere_Firmware into release_candidate

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -806,7 +806,7 @@
                             <button class="btn btn-md btn-outline-primary mt-3 toggle-btn"
                                 type="button" data-toggle="collapse" data-target="#ntripServerConfig0"
                                 aria-expanded="false" aria-controls="ntripServerConfig0">
-                                NTRIP Server 0 <i class="caret-icon bi icon-caret-down"></i>
+                                NTRIP Server 1 <i class="caret-icon bi icon-caret-down"></i>
                             </button>
                         </div>
 
@@ -879,7 +879,7 @@
                             <button class="btn btn-md btn-outline-primary mt-3 toggle-btn"
                                 type="button" data-toggle="collapse" data-target="#ntripServerConfig1"
                                 aria-expanded="false" aria-controls="ntripServerConfig1">
-                                NTRIP Server 1 <i class="caret-icon bi icon-caret-down"></i>
+                                NTRIP Server 2 <i class="caret-icon bi icon-caret-down"></i>
                             </button>
                         </div>
 
@@ -952,7 +952,7 @@
                             <button class="btn btn-md btn-outline-primary mt-3 toggle-btn"
                                 type="button" data-toggle="collapse" data-target="#ntripServerConfig2"
                                 aria-expanded="false" aria-controls="ntripServerConfig2">
-                                NTRIP Server 2 <i class="caret-icon bi icon-caret-down"></i>
+                                NTRIP Server 3 <i class="caret-icon bi icon-caret-down"></i>
                             </button>
                         </div>
 
@@ -1025,7 +1025,7 @@
                             <button class="btn btn-md btn-outline-primary mt-3 toggle-btn"
                                 type="button" data-toggle="collapse" data-target="#ntripServerConfig3"
                                 aria-expanded="false" aria-controls="ntripServerConfig3">
-                                NTRIP Server 3 <i class="caret-icon bi icon-caret-down"></i>
+                                NTRIP Server 4 <i class="caret-icon bi icon-caret-down"></i>
                             </button>
                         </div>
 

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

@@ -481,7 +481,6 @@ function sendData() {
     //Check boxes, radio buttons
     //Remove file manager files
     clsElements = document.querySelectorAll(".form-check-input:not(.fileManagerCheck), .form-radio");
-
     for (let x = 0; x < clsElements.length; x++) {
         settingCSV += clsElements[x].id + "," + clsElements[x].checked + ",";
     }

Firmware/RTK_Everywhere/Display.ino

@@ -2060,6 +2060,10 @@ void displayWiFiConfig()
         else if (WiFi.getMode() == WIFI_AP)
             snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config");
 
+        // If we are in AP+STA mode, still display RTK Config
+        else if (WiFi.getMode() == WIFI_AP_STA)
+            snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config");
+
         else
             snprintf(mySSID, sizeof(mySSID), "%s", "Error");
     }
@@ -2093,7 +2097,7 @@ void displayWiFiConfig()
 
 #ifdef COMPILE_AP
     IPAddress myIpAddress;
-    if (WiFi.getMode() == WIFI_AP)
+    if ((WiFi.getMode() == WIFI_AP) || (WiFi.getMode() == WIFI_AP_STA))
         myIpAddress = WiFi.softAPIP();
     else
         myIpAddress = WiFi.localIP();

Firmware/RTK_Everywhere/WiFi.ino

@@ -388,8 +388,8 @@ void wifiUpdate()
         break;
     }
 
-    // Process DNS when we are in AP mode for captive portal
-    if (WiFi.getMode() == WIFI_AP && settings.enableCaptivePortal)
+    // Process DNS when we are in AP mode or AP+STA mode for captive portal
+    if (((WiFi.getMode() == WIFI_AP) || (WiFi.getMode() == WIFI_AP_STA)) && settings.enableCaptivePortal)
     {
         dnsServer.processNextRequest();
     }
@@ -435,7 +435,7 @@ void wifiStop()
         MDNS.end();
 
     // Stop the DNS server if we were using the captive portal
-    if (WiFi.getMode() == WIFI_AP && settings.enableCaptivePortal)
+    if (((WiFi.getMode() == WIFI_AP) || (WiFi.getMode() == WIFI_AP_STA)) && settings.enableCaptivePortal)
         dnsServer.stop();
 
     // Stop the other network clients and then WiFi
@@ -486,16 +486,40 @@ bool wifiIsConnected()
 // Attempts a connection to all provided SSIDs
 // Returns true if successful
 // Gives up if no SSID detected or connection times out
+// If useAPSTAMode is true, do an extra check and go from WIFI_AP mode to WIFI_AP_STA mode
 bool wifiConnect(unsigned long timeout)
+{
+    return wifiConnect(timeout, false, nullptr);
+}
+bool wifiConnect(unsigned long timeout, bool useAPSTAMode, bool *wasInAPmode)
 {
     if (wifiIsConnected())
         return (true); // Nothing to do
 
     displayWiFiConnect();
 
-    // Before we can issue esp_wifi_() commands WiFi must be started
-    if (WiFi.getMode() != WIFI_STA)
-        WiFi.mode(WIFI_STA);
+    // If otaUpdate or otaCheckVersion wants to use WIFI_AP_STA mode
+    if (useAPSTAMode && (wasInAPmode != nullptr))
+    {
+        *wasInAPmode = (WiFi.getMode() == WIFI_AP);
+
+        if (*wasInAPmode)
+        {
+            systemPrintln("wifiConnect: changing from WIFI_AP to WIFI_AP_STA");
+            WiFi.mode(WIFI_AP_STA); // Change mode from WIFI_AP to WIFI_AP_STA
+        }
+        else
+        {
+            systemPrintln("wifiConnect: was not in WIFI_AP mode. Going to WIFI_STA");
+            WiFi.mode(WIFI_STA); // Must have been off - or already in STA mode?
+        }
+    }
+    else
+    {
+        // Before we can issue esp_wifi_() commands WiFi must be started
+        if (WiFi.getMode() != WIFI_STA)
+            WiFi.mode(WIFI_STA);
+    }
 
     // Verify that the necessary protocols are set
     uint8_t protocols = 0;