Add wifiConnect useAPSTAMode and wasInAPmode

Author: PaulZC

Firmware/RTK_Everywhere/WiFi.ino

@@ -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;

Firmware/RTK_Everywhere/menuCommands.ino

@@ -757,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,");

Firmware/RTK_Everywhere/menuFirmware.ino

@@ -160,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')
@@ -476,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);
@@ -512,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.
@@ -573,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();