Extra getMode checks for AP+STA

Author: PaulZC

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