Fix test menu exit.

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -81,7 +81,7 @@ void beginBoard()
 
     if (esp_reset_reason() == ESP_RST_POWERON)
     {
-      //powerOnCheck(); //Only do check if we POR start
+      powerOnCheck(); //Only do check if we POR start
     }
 
     pinMode(pin_peripheralPowerControl, OUTPUT);

Firmware/RTK_Surveyor/Buttons.ino

@@ -23,6 +23,17 @@ void checkButtons()
   }
   else if (productVariant == RTK_EXPRESS)
   {
+    //Check to see if user is pressing both buttons simultaneously - show test screen
+    if (digitalRead(pin_powerSenseAndControl) == LOW && digitalRead(pin_setupButton) == LOW)
+    {
+      delay(debounceDelay); //Debounce
+      if (digitalRead(pin_powerSenseAndControl) == LOW && digitalRead(pin_setupButton) == LOW)
+      {
+        displayTest();
+        setupButtonState = BUTTON_RELEASED;
+      }
+    }
+    
     //Check power button
     //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
     if (digitalRead(pin_powerSenseAndControl) == LOW && powerPressedStartTime == 0)
@@ -94,19 +105,6 @@ void checkButtons()
       //Return to unpressed state
       setupButtonState = BUTTON_RELEASED;
     }
-
-    //Check to see if user is pressing both buttons simultaneously - show test screen
-    if (digitalRead(pin_powerSenseAndControl) == LOW && digitalRead(pin_setupButton) == LOW)
-    {
-      delay(debounceDelay); //Debounce
-      if (digitalRead(pin_powerSenseAndControl) == LOW && digitalRead(pin_setupButton) == LOW)
-      {
-        displayTest();
-        setupButtonState = BUTTON_RELEASED;
-        buttonPreviousState = BUTTON_ROVER;
-        changeState(STATE_ROVER_NOT_STARTED);
-      }
-    }
     //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
   }//end productVariant = Express
 

Firmware/RTK_Surveyor/Display.ino

@@ -1380,7 +1380,7 @@ void displayTest()
         delay(10);
     }
 
-    delay(2000); //Big debounce
+    delay(500);
   }
 }