Move profile changes to heap.

Remove old unused code. Webpage never reports "profileNumber".

Author: nseidle

Firmware/RTK_Surveyor/Form.ino

@@ -255,7 +255,6 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest *request, String file
 //Events triggered by web sockets
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP
-char *settingsCSV; //Push large array onto heap
 
 void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)
 {
@@ -492,18 +491,13 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
 {
 #ifdef COMPILE_AP
   char* ptr;
-  int newProfileNumber;
   double settingValue = strtod(settingValueStr, &ptr);
 
   bool settingValueBool = false;
   if (strcmp(settingValueStr, "true") == 0) settingValueBool = true;
 
   if (strcmp(settingName, "maxLogTime_minutes") == 0)
-  {
-    newAPSettings = true; //Mark settings as new to force record before reset
     settings.maxLogTime_minutes = settingValue;
-  }
-
   else if (strcmp(settingName, "maxLogLength_minutes") == 0)
     settings.maxLogLength_minutes = settingValue;
   else if (strcmp(settingName, "measurementRateHz") == 0)
@@ -560,19 +554,6 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
     strcpy(settings.profileName, settingValueStr);
     setProfileName(profileNumber);
   }
-  else if (strcmp(settingName, "profileNumber") == 0)
-  {
-    if ((sscanf(settingValueStr, "%d", &newProfileNumber) == 1)
-        && (newProfileNumber >= 1) && (newProfileNumber <= MAX_PROFILE_COUNT)
-        && (profileNumber != newProfileNumber))
-    {
-      profileNumber = newProfileNumber - 1;
-
-      //Switch to a new profile
-      setSettingsFileName();
-      recordProfileNumber(profileNumber);
-    }
-  }
   else if (strcmp(settingName, "enableNtripServer") == 0)
     settings.enableNtripServer = settingValueBool;
   else if (strcmp(settingName, "ntripServer_CasterHost") == 0)
@@ -657,11 +638,12 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
     factoryReset();
   else if (strcmp(settingName, "exitAndReset") == 0)
   {
-    if (newAPSettings == true) recordSystemSettings(); //If we've received settings, record before restart
+    Serial.println("Reset after AP Config");
 
-    //Reboot the machine
     ESP.restart();
   }
+
+
   else if (strcmp(settingName, "setProfile") == 0)
   {
     //Change to new profile
@@ -670,12 +652,13 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
     //Load new profile into system
     loadSettings();
 
-    //Send settings to browser
-    char settingsCSV[AP_CONFIG_SETTING_SIZE];
-    memset(settingsCSV, 0, sizeof(settingsCSV));
+    //Send new settings to browser. Re-use settingsCSV to avoid stack.
+    settingsCSV = (char*)malloc(AP_CONFIG_SETTING_SIZE);
+    memset(settingsCSV, 0, AP_CONFIG_SETTING_SIZE); //Clear any garbage from settings array
     createSettingsString(settingsCSV);
     log_d("Sending command: %s\n\r", settingsCSV);
     ws.textAll(String(settingsCSV));
+    free(settingsCSV);
   }
   else if (strcmp(settingName, "resetProfile") == 0)
   {
@@ -686,12 +669,13 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
     //Get bitmask of active profiles
     activeProfiles = loadProfileNames();
 
-    //Send settings to browser
-    char settingsCSV[AP_CONFIG_SETTING_SIZE];
-    memset(settingsCSV, 0, sizeof(settingsCSV));
+    //Send new settings to browser. Re-use settingsCSV to avoid stack.
+    settingsCSV = (char*)malloc(AP_CONFIG_SETTING_SIZE);
+    memset(settingsCSV, 0, AP_CONFIG_SETTING_SIZE); //Clear any garbage from settings array
     createSettingsString(settingsCSV);
     log_d("Sending command: %s\n\r", settingsCSV);
     ws.textAll(String(settingsCSV));
+    free(settingsCSV);
   }
   else if (strcmp(settingName, "forgetEspNowPeers") == 0)
   {

Firmware/RTK_Surveyor/NVM.ino

@@ -20,7 +20,7 @@ void loadSettings()
 {
   //If we have a profile in both LFS and SD, the SD settings will overwrite LFS
   loadSystemSettingsFromFileLFS(settingsFileName, &settings);
-  
+
   //Temp store any variables from LFS that should override SD
   int resetCount = settings.resetCount;
 
@@ -261,6 +261,7 @@ void recordSystemSettingsToFile(File * settingsFile)
   settingsFile->printf("%s=%d\n\r", "enablePrintStates", settings.enablePrintStates);
   settingsFile->printf("%s=%d\n\r", "enablePrintDuplicateStates", settings.enablePrintDuplicateStates);
   settingsFile->printf("%s=%d\n\r", "radioType", settings.radioType);
+
   //Record peer MAC addresses
   for (int x = 0 ; x < settings.espnowPeerCount ; x++)
   {

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -349,6 +349,9 @@ unsigned long lastRockerSwitchChange = 0; //If quick toggle is detected (less th
 
 AsyncWebServer server(80);
 AsyncWebSocket ws("/ws");
+
+char *settingsCSV; //Push large array onto heap
+
 #endif
 #endif
 
@@ -446,8 +449,6 @@ uint32_t triggerCount = 0; //Global copy - TM2 event counter
 uint32_t towMsR = 0; //Global copy - Time Of Week of rising edge (ms)
 uint32_t towSubMsR = 0; //Global copy - Millisecond fraction of Time Of Week of rising edge in nanoseconds
 
-bool newAPSettings = false; //Goes true when new setting is received via AP config. Allows us to record settings when combined with a reset.
-
 unsigned int binBytesSent = 0; //Tracks firmware bytes sent over WiFi OTA update via AP config.
 int binBytesLastUpdate = 0; //Allows websocket notification to be sent every 100k bytes
 bool firstPowerOn = true; //After boot, apply new settings to ZED if user switches between base or rover