Record system settings when new data is received over AP config.

Previously, the user could hit buttons fast enough to cause data + a reset to hit at the same time.

Author: nseidle

Firmware/RTK_Surveyor/AP-Config/src/main.js

@@ -499,7 +499,7 @@ function resetToLoggingDefaults() {
 function exitConfig() {
     show("exitPage");
     hide("mainPage");
-    ws.send("exitToRoverMode,1,");
+    ws.send("exitAndReset,1,");
 }
 
 function firmwareUploadWait() {

Firmware/RTK_Surveyor/Form.ino

@@ -381,7 +381,10 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
   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, "measurementRateHz") == 0)
     settings.measurementRate = (int)(1000.0 / settingValue);
   else if (strcmp(settingName, "dynamicModel") == 0)
@@ -457,14 +460,18 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
   else if (strcmp(settingName, "firmwareFileName") == 0)
   {
     updateFromSD(settingValueStr);
+
+    //If update is successful, it will force system reset and not get here.
+
     requestChangeState(STATE_ROVER_NOT_STARTED); //If update failed, return to Rover mode.
   }
   else if (strcmp(settingName, "factoryDefaultReset") == 0)
     factoryReset();
-  else if (strcmp(settingName, "exitToRoverMode") == 0)
+  else if (strcmp(settingName, "exitAndReset") == 0)
   {
+    if(newAPSettings == true) recordSystemSettings(); //If we've recieved settings, record before restart
+
     ESP.restart();
-    //requestChangeState(STATE_ROVER_NOT_STARTED);
   }
 
   //Check for bulk settings (constellations and message rates)
@@ -590,7 +597,7 @@ bool parseIncomingSettings()
       headPtr = commaPtr + 1;
     }
 
-    Serial.printf("settingName: %s value: %s\n\r", settingName, valueStr);
+    //Serial.printf("settingName: %s value: %s\n\r", settingName, valueStr);
 
     //Ignore zero length values (measurementRateSec) received from browser
     if (strlen(valueStr) > 0)

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -395,6 +395,8 @@ char ggaSentence[128] = {0};
 byte ggaSentenceSpot = 0;
 int ggaSentenceEndSpot = 0;
 
+bool newAPSettings = false; //Goes true when new setting is received via AP config. Allows us to record settings when combined with a reset.
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 void setup()

Firmware/RTK_Surveyor/form.h

@@ -522,7 +522,7 @@ function resetToLoggingDefaults() {
 function exitConfig() {
     show("exitPage");
     hide("mainPage");
-    ws.send("exitToRoverMode,1,");
+    ws.send("exitAndReset,1,");
 }
 
 function firmwareUploadWait() {

Firmware/RTK_Surveyor/settings.h

@@ -83,6 +83,8 @@ typedef enum
   CUSTOM_NMEA_TYPE_RESET_REASON = 0,
   CUSTOM_NMEA_TYPE_WAYPOINT,
   CUSTOM_NMEA_TYPE_EVENT,
+  CUSTOM_NMEA_TYPE_SYSTEM_VERSION,
+  CUSTOM_NMEA_TYPE_ZED_VERSION,
 } customNmeaType_e;
 
 //Freeze and blink LEDs if we hit a bad error