Exit to previous state after pairing

Author: nseidle

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -230,7 +230,8 @@ bool espnowIsPaired()
 
     //Enable radio. User may have arrived here from the setup menu rather than serial menu.
     settings.radioType = RADIO_ESPNOW;
-    recordSystemSettings();
+    
+    recordSystemSettings(); //Record radioType and espnowPeerCount to NVM
 
     espnowSetState(ESPNOW_PAIRED);
     return (true);

Firmware/RTK_Surveyor/States.ino

@@ -920,7 +920,9 @@ void updateSystemState()
           if (espnowIsPaired() == true)
           {
             paintEspNowPaired();
-            changeState(STATE_ROVER_NOT_STARTED);
+            
+            // Return to the previous state
+            changeState(lastSystemState);
           }
           else
           {

Firmware/RTK_Surveyor/Tasks.ino

@@ -415,7 +415,7 @@ void ButtonCheckTask(void *e)
           case STATE_WIFI_CONFIG:
           case STATE_ESPNOW_PAIRING_NOT_STARTED:
           case STATE_ESPNOW_PAIRING:
-            lastSystemState = systemState; //Remember this state to return after we mark an event
+            lastSystemState = systemState; //Remember this state to return after we mark an event or ESP-Now pair
             requestChangeState(STATE_DISPLAY_SETUP);
             setupState = STATE_MARK_EVENT;
             lastSetupMenuChange = millis();
@@ -535,7 +535,7 @@ void ButtonCheckTask(void *e)
           case STATE_WIFI_CONFIG:
           case STATE_ESPNOW_PAIRING_NOT_STARTED:
           case STATE_ESPNOW_PAIRING:
-            lastSystemState = systemState; //Remember this state to return after we mark an event
+            lastSystemState = systemState; //Remember this state to return after we mark an event or ESP-Now pair
             requestChangeState(STATE_DISPLAY_SETUP);
             setupState = STATE_MARK_EVENT;
             lastSetupMenuChange = millis();