Don't delete websocket unless webserver is ended.

Author: nseidle

Firmware/RTK_Surveyor/Form.ino

@@ -1,6 +1,8 @@
 //Once connected to the access point for WiFi Config, the ESP32 sends current setting values in one long string to websocket
 //After user clicks 'save', data is validated via main.js and a long string of values is returned.
 
+bool websocketConnected = false;
+
 //Start webserver in AP mode
 void startWebServer()
 {
@@ -9,15 +11,17 @@ void startWebServer()
 
   ntripClientStop(true); //Do not allocate new wifiClient
   ntripServerStop(true); //Do not allocate new wifiClient
-  
+
   if (wifiStartAP() == false) //Exits calling wifiConnect()
     return;
 
   incomingSettings = (char*)malloc(AP_CONFIG_SETTING_SIZE);
-
-  //Clear any garbage from settings array
   memset(incomingSettings, 0, AP_CONFIG_SETTING_SIZE);
 
+  //Pre-load settings CSV
+  settingsCSV = (char*)malloc(AP_CONFIG_SETTING_SIZE);
+  createSettingsString(settingsCSV);
+
   webserver = new AsyncWebServer(80);
   websocket = new AsyncWebSocket("/ws");
 
@@ -141,10 +145,6 @@ void startWebServer()
 
   webserver->begin();
 
-  //Pre-load settings CSV
-  settingsCSV = (char*)malloc(AP_CONFIG_SETTING_SIZE);
-  createSettingsString(settingsCSV);
-
   log_d("Web Server Started");
   reportHeapNow();
 
@@ -157,22 +157,32 @@ void stopWebServer()
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP
 
-  if (websocket != NULL)
-  {
-    delete websocket;
-    websocket = NULL;
-  }
-
-  if (webserver != nullptr)
+  if (webserver != NULL)
   {
     webserver->end();
+    free(webserver);
     webserver = NULL;
-  }
 
-  if (settingsCSV != NULL)
-  {
-    free(settingsCSV);
-    settingsCSV = NULL;
+    if (websocket != NULL)
+    {
+      Serial.println("Free websocket");
+      delete websocket;
+      websocket = NULL;
+    }
+
+    if (settingsCSV != NULL)
+    {
+      Serial.println("Freeing settingsCSV");
+      free(settingsCSV);
+      settingsCSV = NULL;
+    }
+
+    if (incomingSettings != NULL)
+    {
+      Serial.println("Freeing incomingSettings");
+      free(incomingSettings);
+      incomingSettings = NULL;
+    }
   }
 
   log_d("Web Server Stopped");
@@ -383,12 +393,14 @@ void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventT
     log_d("Websocket client connected");
     client->text(settingsCSV);
     lastCoordinateUpdate = millis();
+    websocketConnected = true;
   }
   else if (type == WS_EVT_DISCONNECT) {
     log_d("Websocket client disconnected");
 
     //User has either refreshed the page or disconnected. Recompile the current settings.
     createSettingsString(settingsCSV);
+    websocketConnected = false;
   }
   else if (type == WS_EVT_DATA) {
     for (int i = 0; i < len; i++) {

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -371,15 +371,15 @@ unsigned long lastRockerSwitchChange = 0; //If quick toggle is detected (less th
 AsyncWebServer *webserver = NULL;
 AsyncWebSocket *websocket = NULL;
 
-char *settingsCSV; //Push large array onto heap
+char *settingsCSV = NULL; //Push large array onto heap
 
 #endif
 #endif
 
 //Because the incoming string is longer than max len, there are multiple callbacks so we
 //use a global to combine the incoming
 #define AP_CONFIG_SETTING_SIZE 5000
-char *incomingSettings;
+char *incomingSettings = NULL;
 int incomingSettingsSpot = 0;
 unsigned long timeSinceLastIncomingSetting = 0;
 unsigned long lastCoordinateUpdate = 0;

Firmware/RTK_Surveyor/States.ino

@@ -629,7 +629,7 @@ void updateSystemState()
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP
           //Dynamically update the coordinates on the AP page
-          if (wifiState == WIFI_CONNECTED)
+          if (websocketConnected == true)
           {
             if (millis() - lastCoordinateUpdate > 1000)
             {