Add enableCaptivePortal setting. Set to on as default.

Author: nseidle

Firmware/RTK_Surveyor/Form.ino

@@ -104,8 +104,10 @@ bool startWebServer(bool startWiFi = true, int httpPort = 80)
             break;
         }
 
+        if(settings.enableCaptivePortal == true)
+            webserver->addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER); // only when requested from AP
+
         websocket->onEvent(onWsEvent);
-        webserver->addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER); // only when requested from AP
         webserver->addHandler(websocket);
 
         // * index.html (not gz'd)

Firmware/RTK_Surveyor/NVM.ino

@@ -445,6 +445,7 @@ void recordSystemSettingsToFile(File *settingsFile)
     settingsFile->printf("%s=%d\r\n", "enableAutoFirmwareUpdate", settings.enableAutoFirmwareUpdate);
 
     settingsFile->printf("%s=%d\r\n", "debugLBand", settings.debugLBand);
+    settingsFile->printf("%s=%d\r\n", "enableCaptivePortal", settings.enableCaptivePortal);
 
     //Add new settings above <------------------------------------------------------------>
 }
@@ -1369,6 +1370,10 @@ bool parseLine(char *str, Settings *settings)
 
     else if (strcmp(settingName, "debugLBand") == 0)
         settings->debugLBand = d;
+    else if (strcmp(settingName, "enableCaptivePortal") == 0)
+        settings->enableCaptivePortal = d;
+
+
 
     //Add new settings above
     //<------------------------------------------------------------>

Firmware/RTK_Surveyor/WiFi.ino

@@ -86,6 +86,9 @@ void menuWiFi()
         systemPrint("a) Configure device via WiFi Access Point or connect to WiFi: ");
         systemPrintf("%s\r\n", settings.wifiConfigOverAP ? "AP" : "WiFi");
 
+        systemPrint("m) Captive Portal: ");
+        systemPrintf("%s\r\n", settings.enableCaptivePortal ? "Enabled" : "Disabled");
+
         systemPrint("m) MDNS: ");
         systemPrintf("%s\r\n", settings.mdnsEnable ? "Enabled" : "Disabled");
 
@@ -115,7 +118,10 @@ void menuWiFi()
             settings.wifiConfigOverAP ^= 1;
             restartWiFi = true;
         }
-
+        else if (incoming == 'c')
+        {
+            settings.enableCaptivePortal ^= 1;
+        }
         else if (incoming == 'm')
         {
             settings.mdnsEnable ^= 1;
@@ -371,7 +377,7 @@ void wifiUpdate()
     }
 
     // Process DNS when we are in AP mode for captive portal
-    if (WiFi.getMode() == WIFI_AP)
+    if (WiFi.getMode() == WIFI_AP && settings.enableCaptivePortal)
     {
         dnsServer.processNextRequest();
     }
@@ -416,7 +422,7 @@ void wifiStop()
         MDNS.end();
 
     // Stop the DNS server if we were using the captive portal
-    if (WiFi.getMode() == WIFI_AP)
+    if (WiFi.getMode() == WIFI_AP && settings.enableCaptivePortal)
         dnsServer.stop();
 
     // Stop the other network clients and then WiFi

Firmware/RTK_Surveyor/settings.h

@@ -1070,6 +1070,7 @@ typedef struct
     uint32_t autoFirmwareCheckMinutes = 24 * 60;
 
     bool debugLBand = false;
+    bool enableCaptivePortal = true;
 
     //Add new settings above <------------------------------------------------------------>