Merge branch 'release_candidate' into Resolve_#267

PaulZC · PaulZC · commit 1b4e51534dee · 2024-04-30T17:11:53.000-06:00
diff --git a/Firmware/RTK_Everywhere/AP-Config/index.html b/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>
     
diff --git a/Firmware/RTK_Everywhere/AP-Config/src/main.js b/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 + ",";
     }
@@ -688,10 +687,10 @@ function validateFields() {
     }
 
     if (ge("enableNtripServer").checked == true) {
-        checkElementString("ntripServerCasterHost_0", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfigNTRIP");
+        checkElementString("ntripServerCasterHost_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfigNTRIP");
         checkElementValue("ntripServerCasterPort_0", 1, 99999, "Must be 1 to 99999", "collapseBaseConfigNTRIP");
-        checkElementString("ntripServerMountPoint_0", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfigNTRIP");
-        checkElementString("ntripServerMountPointPW_0", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfigNTRIP");
+        checkElementString("ntripServerMountPoint_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfigNTRIP");
+        checkElementString("ntripServerMountPointPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfigNTRIP");
     }
     else {
         clearElement("ntripServerCasterHost_0", "rtk2go.com");
@@ -732,14 +731,14 @@ function validateFields() {
     }
 
     //WiFi Config
-    checkElementString("wifiNetwork_0SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_0Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_1SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_1Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_2SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_2Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_3SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    checkElementString("wifiNetwork_3Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_0SSID", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_0Password", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_1SSID", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_1Password", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_2SSID", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_2Password", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_3SSID", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
+    checkElementString("wifiNetwork_3Password", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
     if (ge("enableTcpClient").checked  == true) {
         checkElementString("tcpClientPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
     }
@@ -1009,7 +1008,7 @@ function checkElementIPAddress(id, errorText, collapseID) {
 
 function checkElementCasterUser(id, badUserName, errorText, collapseID) {
     if (ge("ntripClientCasterHost").value.toLowerCase() == "rtk2go.com") {
-        checkElementString(id, 1, 50, errorText, collapseID);
+        checkElementString(id, 1, 49, errorText, collapseID);
     }
     else
         clearError(id);
diff --git a/Firmware/RTK_Everywhere/Display.ino b/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();
diff --git a/Firmware/RTK_Everywhere/WiFi.ino b/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;
diff --git a/Firmware/RTK_Everywhere/menuCommands.ino b/Firmware/RTK_Everywhere/menuCommands.ino
@@ -719,6 +719,7 @@ bool updateSettingWithValue(const char *settingName, const char *settingValueStr
             char newVersionCSV[100];
 
             // Get firmware version from server
+            // otaCheckVersion will call wifiConnect if needed
             if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
             {
                 // We got a version number, now determine if it's newer or not
@@ -756,7 +757,7 @@ bool updateSettingWithValue(const char *settingName, const char *settingValueStr
             sendStringToWebsocket((char *)"gettingNewFirmware,1,");
 
             apConfigFirmwareUpdateInProcess = true;
-            otaUpdate();
+            otaUpdate(); // otaUpdate will call wifiConnect if needed. Also does previouslyConnected check
 
             // We get here if WiFi failed to connect
             sendStringToWebsocket((char *)"gettingNewFirmware,ERROR,");
diff --git a/Firmware/RTK_Everywhere/menuFirmware.ino b/Firmware/RTK_Everywhere/menuFirmware.ino
@@ -103,34 +103,29 @@ void menuFirmware()
 
                 bool previouslyConnected = wifiIsConnected();
 
-                // Attempt to connect to local WiFi
-                if (wifiConnect(10000) == true)
+                // Get firmware version from server
+                // otaCheckVersion will call wifiConnect if needed
+                if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
                 {
-                    // Get firmware version from server
-                    if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
+                    // We got a version number, now determine if it's newer or not
+                    char currentVersion[21];
+                    getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
+                    if (isReportedVersionNewer(reportedVersion, &currentVersion[1]) == true ||
+                        FIRMWARE_VERSION_MAJOR == 99 || settings.debugFirmwareUpdate == true)
                     {
-                        // We got a version number, now determine if it's newer or not
-                        char currentVersion[21];
-                        getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
-                        if (isReportedVersionNewer(reportedVersion, &currentVersion[1]) == true ||
-                            FIRMWARE_VERSION_MAJOR == 99 || settings.debugFirmwareUpdate == true)
-                        {
-                            systemPrintln("New version detected");
-                            newOTAFirmwareAvailable = true;
-                        }
-                        else
-                        {
-                            systemPrintln("No new firmware available");
-                        }
+                        systemPrintln("New version detected");
+                        newOTAFirmwareAvailable = true;
                     }
                     else
                     {
-                        // Failed to get version number
-                        systemPrintln("Failed to get version number from server.");
+                        systemPrintln("No new firmware available");
                     }
                 }
                 else
-                    systemPrintln("Firmware update failed to connect to WiFi.");
+                {
+                    // Failed to get version number
+                    systemPrintln("Failed to get version number from server.");
+                }
 
                 if (previouslyConnected == false)
                     WIFI_STOP();
@@ -165,14 +160,9 @@ void menuFirmware()
 
         else if ((incoming == 'u') && newOTAFirmwareAvailable)
         {
-            bool previouslyConnected = wifiIsConnected();
-
-            otaUpdate();
+            otaUpdate(); // otaUpdate will call wifiConnect if needed. Also does previouslyConnected check
 
             // We get here if WiFi failed or the server was not available
-
-            if (previouslyConnected == false)
-                WIFI_STOP();
         }
 
         else if (incoming == 'x')
@@ -481,7 +471,9 @@ bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength)
 #ifdef COMPILE_WIFI
     bool previouslyConnected = wifiIsConnected();
 
-    if (wifiConnect(10000) == true)
+    bool wasInAPmode;
+
+    if (wifiConnect(10000, true, &wasInAPmode) == true) // Use WIFI_AP_STA if already in WIFI_AP mode
     {
         char versionString[21];
         getFirmwareVersion(versionString, sizeof(versionString), enableRCFirmware);
@@ -517,6 +509,11 @@ bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength)
         systemPrintln("WiFi not available.");
     }
 
+    // If we were in WIFI_AP mode, return to WIFI_AP mode
+    // There may be some overlap with systemState STATE_WIFI_CONFIG ? Not sure...
+    if (wasInAPmode)
+        WiFi.mode(WIFI_AP);
+
     if (systemState != STATE_WIFI_CONFIG)
     {
         // WIFI_STOP() turns off the entire radio including the webserver. We need to turn off Station mode only.
@@ -578,9 +575,15 @@ void otaUpdate()
 #ifdef COMPILE_WIFI
     bool previouslyConnected = wifiIsConnected();
 
-    if (wifiConnect(10000) == true)
+    bool wasInAPmode;
+
+    if (wifiConnect(10000, true, &wasInAPmode) == true) // Use WIFI_AP_STA if already in WIFI_AP mode
         overTheAirUpdate();
 
+    // Update failed. If we were in WIFI_AP mode, return to WIFI_AP mode
+    if (wasInAPmode)
+        WiFi.mode(WIFI_AP);
+
     // Update failed. If WiFi was originally off, turn it off again
     if (previouslyConnected == false)
         WIFI_STOP();
