Rename start/stopWebServer. Add stopWebServer.

Author: nseidle

Firmware/RTK_Surveyor/Form.ino

@@ -2,11 +2,8 @@
 //After user clicks 'save', data is validated via main.js and a long string of values is returned.
 
 //Start webserver in AP mode
-void startConfigAP()
+void startWebServer()
 {
-  stopBluetooth();
-  stopUART2Tasks(); //Delete F9 serial tasks if running
-
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP
 
@@ -37,6 +34,7 @@ void startConfigAP()
   //#define LOCAL_WIFI_TESTING 1
 
 #ifndef LOCAL_WIFI_TESTING
+
   //Start in AP mode
   WiFi.mode(WIFI_AP);
 
@@ -173,12 +171,31 @@ void startConfigAP()
   }, handleFirmwareFileUpload);
 
   server.begin();
+
+  log_d("Web Server Started");
+  reportHeapNow();
+
 #endif
 #endif
 
   wifiState = WIFI_NOTCONNECTED;
 }
 
+void stopWebServer()
+{
+#ifdef COMPILE_WIFI
+#ifdef COMPILE_AP
+
+  //server.reset();
+  server.end();
+
+  log_d("Web Server Stopped");
+  reportHeapNow();
+
+#endif
+#endif
+}
+
 //Handler for firmware file upload
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP

Firmware/RTK_Surveyor/States.ino

@@ -139,6 +139,7 @@ void updateSystemState()
 
           i2cGNSS.enableRTCMmessage(UBX_RTCM_1230, COM_PORT_UART2, 0); //Disable RTCM sentences
 
+          stopWebServer();
           stopWiFi(); //Turn off WiFi and release all resources
           startBluetooth(); //Turn on Bluetooth with 'Rover' name
           startUART2Tasks(); //Start monitoring the UART1 from ZED for NMEA and UBX data (enables logging)
@@ -152,7 +153,7 @@ void updateSystemState()
           if (settings.enableNtripClient == true && ntripClientAttempted == false)
           {
             //Turn off Bluetooth and turn on WiFi
-            //stopBluetooth();
+            stopBluetooth();
             startWiFi(settings.ntripClient_wifiSSID, settings.ntripClient_wifiPW);
             wifiStartTime = millis();
 
@@ -489,6 +490,7 @@ void updateSystemState()
           displayBaseStart(0); //Show 'Base'
 
           //Stop all WiFi and BT. Re-enable in each specific base start state.
+          stopWebServer();
           stopWiFi();
           stopBluetooth();
           startUART2Tasks(); //Start monitoring the UART1 from ZED for NMEA and UBX data (enables logging)
@@ -1051,8 +1053,9 @@ void updateSystemState()
 
           displayWiFiConfigNotStarted(); //Display immediately during SD cluster pause
 
-          //Start in AP mode and show config html page
-          startConfigAP();
+          stopBluetooth();
+          stopUART2Tasks(); //Delete F9 serial tasks if running
+          startWebServer(); //Start in AP mode and show config html page
 
           changeState(STATE_WIFI_CONFIG);
         }

Firmware/RTK_Surveyor/menuFirmware.ino

@@ -102,6 +102,7 @@ void scanForFirmware()
 void updateFromSD(const char *firmwareFileName)
 {
   //Turn off any tasks so that we are not disrupted
+  stopWebServer();
   stopWiFi();
   stopBluetooth();