Add STATE_NOT_SET. Add default states for platforms.

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -905,49 +905,58 @@ void beginAccelerometer()
 //Depending on platform and previous power down state, set system state
 void beginSystemState()
 {
+  if (systemState > STATE_NOT_SET)
+  {
+    systemPrintln("Unknown state - factory reset");
+    factoryReset();
+  }
+
   if (productVariant == RTK_SURVEYOR)
   {
+    if (settings.lastState == STATE_NOT_SET) //Default
+    {
+      systemState = STATE_ROVER_NOT_STARTED;
+      settings.lastState = systemState;
+    }
+
     //If the rocker switch was moved while off, force module settings
     //When switch is set to '1' = BASE, pin will be shorted to ground
     if (settings.lastState == STATE_ROVER_NOT_STARTED && digitalRead(pin_setupButton) == LOW) settings.updateZEDSettings = true;
     else if (settings.lastState == STATE_BASE_NOT_STARTED && digitalRead(pin_setupButton) == HIGH) settings.updateZEDSettings = true;
 
-    if (online.lband == false)
-      systemState = STATE_ROVER_NOT_STARTED; //Assume Rover. ButtonCheckTask() will correct as needed.
-    else
-      systemState = STATE_KEYS_STARTED; //Begin process for getting new keys
+    systemState = STATE_ROVER_NOT_STARTED; //Assume Rover. ButtonCheckTask() will correct as needed.
 
     setupBtn = new Button(pin_setupButton); //Create the button in memory
   }
   else if (productVariant == RTK_EXPRESS || productVariant == RTK_EXPRESS_PLUS)
   {
+    if (settings.lastState == STATE_NOT_SET) //Default
+    {
+      systemState = STATE_ROVER_NOT_STARTED;
+      settings.lastState = systemState;
+    }
+
     if (online.lband == false)
       systemState = settings.lastState; //Return to either Rover or Base Not Started. The last state previous to power down.
     else
       systemState = STATE_KEYS_STARTED; //Begin process for getting new keys
 
-    if (systemState > STATE_SHUTDOWN)
-    {
-      systemPrintln("Unknown state - factory reset");
-      factoryReset();
-    }
-
     setupBtn = new Button(pin_setupButton); //Create the button in memory
     powerBtn = new Button(pin_powerSenseAndControl); //Create the button in memory
   }
   else if (productVariant == RTK_FACET || productVariant == RTK_FACET_LBAND)
   {
+    if (settings.lastState == STATE_NOT_SET) //Default
+    {
+      systemState = STATE_ROVER_NOT_STARTED;
+      settings.lastState = systemState;
+    }
+
     if (online.lband == false)
       systemState = settings.lastState; //Return to either Rover or Base Not Started. The last state previous to power down.
     else
       systemState = STATE_KEYS_STARTED; //Begin process for getting new keys
 
-    if (systemState > STATE_SHUTDOWN)
-    {
-      systemPrintln("Unknown state - factory reset");
-      factoryReset();
-    }
-
     firstRoverStart = true; //Allow user to enter test screen during first rover start
     if (systemState == STATE_BASE_NOT_STARTED)
       firstRoverStart = false;
@@ -956,14 +965,14 @@ void beginSystemState()
   }
   else if (productVariant == REFERENCE_STATION)
   {
-    systemState = settings.lastState; //Return to either NTP, Base or Rover Not Started. The last state previous to power down.
-
-    if (systemState > STATE_SHUTDOWN)
+    if (settings.lastState == STATE_NOT_SET) //Default
     {
-      systemPrintln("Unknown state - factory reset");
-      factoryReset();
+      systemState = STATE_BASE_NOT_STARTED;
+      settings.lastState = systemState;
     }
 
+    systemState = settings.lastState; //Return to either NTP, Base or Rover Not Started. The last state previous to power down.
+
     setupBtn = new Button(pin_setupButton); //Create the button in memory
   }
 

Firmware/RTK_Surveyor/States.ino

@@ -1301,6 +1301,9 @@ void changeState(SystemState newState)
       case (STATE_SHUTDOWN):
         systemPrint("State: Shut Down");
         break;
+      case (STATE_NOT_SET):
+        systemPrint("State: Not Set");
+        break;
       default:
         systemPrintf("Change State Unknown: %d", systemState);
         break;

Firmware/RTK_Surveyor/settings.h

@@ -43,10 +43,11 @@ typedef enum
   STATE_CONFIG_VIA_ETH,
   STATE_CONFIG_VIA_ETH_RESTART_BASE,
   STATE_SHUTDOWN,
+  STATE_NOT_SET, //Must be last on list
 } SystemState;
-volatile SystemState systemState = STATE_ROVER_NOT_STARTED;
-SystemState lastSystemState = STATE_ROVER_NOT_STARTED;
-SystemState requestedSystemState = STATE_ROVER_NOT_STARTED;
+volatile SystemState systemState = STATE_NOT_SET;
+SystemState lastSystemState = STATE_NOT_SET;
+SystemState requestedSystemState = STATE_NOT_SET;
 bool newSystemStateRequested = false;
 
 //The setup display can show a limited set of states
@@ -671,7 +672,7 @@ typedef struct {
   uint16_t sppRxQueueSize = 2048;
   uint16_t sppTxQueueSize = 512;
   uint8_t dynamicModel = DYN_MODEL_PORTABLE;
-  SystemState lastState = STATE_ROVER_NOT_STARTED; //For Express, start unit in last known state
+  SystemState lastState = STATE_NOT_SET; //Start unit in last known state
   bool enableSensorFusion = false; //If IMU is available, avoid using it unless user specifically selects automotive
   bool autoIMUmountAlignment = true; //Allows unit to automatically establish device orientation in vehicle
   bool enableResetDisplay = false;