Increase all menu timeouts to 10minutes

Fix #305

Author: nseidle

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -27,8 +27,8 @@ const int FIRMWARE_VERSION_MINOR = 5;
 
 #define COMPILE_WIFI //Comment out to remove WiFi functionality
 #define COMPILE_AP //Requires WiFi. Comment out to remove Access Point functionality
-//#define COMPILE_ESPNOW //Requires WiFi. Comment out to remove ESP-Now functionality.
-//#define COMPILE_BT //Comment out to remove Bluetooth functionality
+#define COMPILE_ESPNOW //Requires WiFi. Comment out to remove ESP-Now functionality.
+#define COMPILE_BT //Comment out to remove Bluetooth functionality
 #define COMPILE_L_BAND //Comment out to remove L-Band functionality
 #define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
 
@@ -377,7 +377,7 @@ const uint8_t ESPNOW_MAX_PEERS = 5; //Maximum of 5 rovers
 uint8_t wifiMACAddress[6]; //Display this address in the system menu
 uint8_t btMACAddress[6];   //Display this address when Bluetooth is enabled, otherwise display wifiMACAddress
 char deviceName[70]; //The serial string that is broadcast. Ex: 'Surveyor Base-BC61'
-const byte menuTimeout = 15; //Menus will exit/timeout after this number of seconds
+const uint16_t menuTimeout = 60 * 10; //Menus will exit/timeout after this number of seconds
 int systemTime_minutes = 0; //Used to test if logging is less than max minutes
 uint32_t powerPressedStartTime = 0; //Times how long user has been holding power button, used for power down
 bool inMainMenu = false; //Set true when in the serial config menu system.

Firmware/RTK_Surveyor/menuBase.ino

@@ -2,8 +2,6 @@
 //Set the ECEF coordinates for a known location
 void menuBase()
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, ECEF coords, etc).
-
   while (1)
   {
     Serial.println();
@@ -91,7 +89,7 @@ void menuBase()
 
     Serial.println("x) Exit");
 
-    int incoming = getNumber(menuTimeoutExtended); //Timeout after x seconds
+    int incoming = getNumber(menuTimeout); //Timeout after x seconds
 
     if (incoming == 1)
     {
@@ -110,21 +108,21 @@ void menuBase()
         Serial.println("Enter the fixed ECEF coordinates that will be used in Base mode:");
 
         Serial.print("ECEF X in meters (ex: -1280182.920): ");
-        double fixedEcefX = getDouble(menuTimeoutExtended); //Timeout after x seconds
+        double fixedEcefX = getDouble(menuTimeout); //Timeout after x seconds
 
         //Progress with additional prompts only if the user enters valid data
         if (fixedEcefX != STATUS_GETNUMBER_TIMEOUT && fixedEcefX != STATUS_PRESSED_X)
         {
           settings.fixedEcefX = fixedEcefX;
 
           Serial.print("\nECEF Y in meters (ex: -4716808.5807): ");
-          double fixedEcefY = getDouble(menuTimeoutExtended);
+          double fixedEcefY = getDouble(menuTimeout);
           if (fixedEcefY != STATUS_GETNUMBER_TIMEOUT && fixedEcefY != STATUS_PRESSED_X)
           {
             settings.fixedEcefY = fixedEcefY;
 
             Serial.print("\nECEF Z in meters (ex: 4086669.6393): ");
-            double fixedEcefZ = getDouble(menuTimeoutExtended);
+            double fixedEcefZ = getDouble(menuTimeout);
             if (fixedEcefZ != STATUS_GETNUMBER_TIMEOUT && fixedEcefZ != STATUS_PRESSED_X)
               settings.fixedEcefZ = fixedEcefZ;
           }
@@ -135,21 +133,21 @@ void menuBase()
         Serial.println("Enter the fixed Lat/Long/Altitude coordinates that will be used in Base mode:");
 
         Serial.print("Lat in degrees (ex: 40.090335429): ");
-        double fixedLat = getDouble(menuTimeoutExtended); //Timeout after x seconds
+        double fixedLat = getDouble(menuTimeout); //Timeout after x seconds
 
         //Progress with additional prompts only if the user enters valid data
         if (fixedLat != STATUS_GETNUMBER_TIMEOUT && fixedLat != STATUS_PRESSED_X)
         {
           settings.fixedLat = fixedLat;
 
           Serial.print("\nLong in degrees (ex: -105.184774720): ");
-          double fixedLong = getDouble(menuTimeoutExtended);
+          double fixedLong = getDouble(menuTimeout);
           if (fixedLong != STATUS_GETNUMBER_TIMEOUT && fixedLong != STATUS_PRESSED_X)
           {
             settings.fixedLong = fixedLong;
 
             Serial.print("\nAltitude in meters (ex: 1560.2284): ");
-            double fixedAltitude = getDouble(menuTimeoutExtended);
+            double fixedAltitude = getDouble(menuTimeout);
             if (fixedAltitude != STATUS_GETNUMBER_TIMEOUT && fixedAltitude != STATUS_PRESSED_X)
               settings.fixedAltitude = fixedAltitude;
           }
@@ -227,26 +225,26 @@ void menuBase()
     else if (incoming == 7 && settings.enableNtripServer == true)
     {
       Serial.print("Enter local WiFi SSID: ");
-      readLine(settings.ntripServer_wifiSSID, sizeof(settings.ntripServer_wifiSSID), menuTimeoutExtended);
+      readLine(settings.ntripServer_wifiSSID, sizeof(settings.ntripServer_wifiSSID), menuTimeout);
       restartBase = true;
     }
     else if (incoming == 8 && settings.enableNtripServer == true)
     {
       Serial.printf("Enter password for WiFi network %s: ", settings.ntripServer_wifiSSID);
-      readLine(settings.ntripServer_wifiPW, sizeof(settings.ntripServer_wifiPW), menuTimeoutExtended);
+      readLine(settings.ntripServer_wifiPW, sizeof(settings.ntripServer_wifiPW), menuTimeout);
       restartBase = true;
     }
     else if (incoming == 9 && settings.enableNtripServer == true)
     {
       Serial.print("Enter new Caster Address: ");
-      readLine(settings.ntripServer_CasterHost, sizeof(settings.ntripServer_CasterHost), menuTimeoutExtended);
+      readLine(settings.ntripServer_CasterHost, sizeof(settings.ntripServer_CasterHost), menuTimeout);
       restartBase = true;
     }
     else if (incoming == 10 && settings.enableNtripServer == true)
     {
       Serial.print("Enter new Caster Port: ");
 
-      int ntripServer_CasterPort = getNumber(menuTimeoutExtended); //Timeout after x seconds
+      int ntripServer_CasterPort = getNumber(menuTimeout); //Timeout after x seconds
       if (ntripServer_CasterPort < 1 || ntripServer_CasterPort > 99999) //Arbitrary 99k max port #
         Serial.println("Error: Caster Port out of range");
       else
@@ -256,13 +254,13 @@ void menuBase()
     else if (incoming == 11 && settings.enableNtripServer == true)
     {
       Serial.print("Enter new Mount Point: ");
-      readLine(settings.ntripServer_MountPoint, sizeof(settings.ntripServer_MountPoint), menuTimeoutExtended);
+      readLine(settings.ntripServer_MountPoint, sizeof(settings.ntripServer_MountPoint), menuTimeout);
       restartBase = true;
     }
     else if (incoming == 12 && settings.enableNtripServer == true)
     {
       Serial.printf("Enter password for Mount Point %s: ", settings.ntripServer_MountPoint);
-      readLine(settings.ntripServer_MountPointPW, sizeof(settings.ntripServer_MountPointPW), menuTimeoutExtended);
+      readLine(settings.ntripServer_MountPointPW, sizeof(settings.ntripServer_MountPointPW), menuTimeout);
       restartBase = true;
     }
     else if ((!settings.fixedBase) && (incoming == 13))

Firmware/RTK_Surveyor/menuGNSS.ino

@@ -2,8 +2,6 @@
 //Update rate, constellations, etc
 void menuGNSS()
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, caster credentials, etc).
-
   restartRover = false; //If user modifies any NTRIP settings, we need to restart the rover
 
   while (1)
@@ -165,26 +163,26 @@ void menuGNSS()
     else if (incoming == 6 && settings.enableNtripClient == true)
     {
       Serial.print("Enter local WiFi SSID: ");
-      readLine(settings.ntripClient_wifiSSID, sizeof(settings.ntripClient_wifiSSID), menuTimeoutExtended);
+      readLine(settings.ntripClient_wifiSSID, sizeof(settings.ntripClient_wifiSSID), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 7 && settings.enableNtripClient == true)
     {
       Serial.printf("Enter password for WiFi network %s: ", settings.ntripClient_wifiSSID);
-      readLine(settings.ntripClient_wifiPW, sizeof(settings.ntripClient_wifiPW), menuTimeoutExtended);
+      readLine(settings.ntripClient_wifiPW, sizeof(settings.ntripClient_wifiPW), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 8 && settings.enableNtripClient == true)
     {
       Serial.print("Enter new Caster Address: ");
-      readLine(settings.ntripClient_CasterHost, sizeof(settings.ntripClient_CasterHost), menuTimeoutExtended);
+      readLine(settings.ntripClient_CasterHost, sizeof(settings.ntripClient_CasterHost), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 9 && settings.enableNtripClient == true)
     {
       Serial.print("Enter new Caster Port: ");
 
-      int ntripClient_CasterPort = getNumber(menuTimeoutExtended); //Timeout after x seconds
+      int ntripClient_CasterPort = getNumber(menuTimeout); //Timeout after x seconds
       if (ntripClient_CasterPort < 1 || ntripClient_CasterPort > 99999) //Arbitrary 99k max port #
         Serial.println("Error: Caster Port out of range");
       else
@@ -194,25 +192,25 @@ void menuGNSS()
     else if (incoming == 10 && settings.enableNtripClient == true)
     {
       Serial.printf("Enter user name for %s: ", settings.ntripClient_CasterHost);
-      readLine(settings.ntripClient_CasterUser, sizeof(settings.ntripClient_CasterUser), menuTimeoutExtended);
+      readLine(settings.ntripClient_CasterUser, sizeof(settings.ntripClient_CasterUser), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 11 && settings.enableNtripClient == true)
     {
       Serial.printf("Enter user password for %s: ", settings.ntripClient_CasterHost);
-      readLine(settings.ntripClient_CasterUserPW, sizeof(settings.ntripClient_CasterUserPW), menuTimeoutExtended);
+      readLine(settings.ntripClient_CasterUserPW, sizeof(settings.ntripClient_CasterUserPW), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 12 && settings.enableNtripClient == true)
     {
       Serial.print("Enter new Mount Point: ");
-      readLine(settings.ntripClient_MountPoint, sizeof(settings.ntripClient_MountPoint), menuTimeoutExtended);
+      readLine(settings.ntripClient_MountPoint, sizeof(settings.ntripClient_MountPoint), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 13 && settings.enableNtripClient == true)
     {
       Serial.printf("Enter password for Mount Point %s: ", settings.ntripClient_MountPoint);
-      readLine(settings.ntripClient_MountPointPW, sizeof(settings.ntripClient_MountPointPW), menuTimeoutExtended);
+      readLine(settings.ntripClient_MountPointPW, sizeof(settings.ntripClient_MountPointPW), menuTimeout);
       restartRover = true;
     }
     else if (incoming == 14 && settings.enableNtripClient == true)

Firmware/RTK_Surveyor/menuMain.ino

@@ -137,7 +137,6 @@ void menuMain()
 //Factory reset - updatesZEDSettings = true by default
 void menuUserProfiles()
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, ECEF coords, etc).
   uint8_t originalProfileNumber = profileNumber;
 
   bool forceReset = false; //If we reset a profile to default, the profile number has not changed, but we still need to reset
@@ -177,7 +176,7 @@ void menuUserProfiles()
     else if (incoming == MAX_PROFILE_COUNT + 1)
     {
       Serial.print("Enter new profile name: ");
-      readLine(settings.profileName, sizeof(settings.profileName), menuTimeoutExtended);
+      readLine(settings.profileName, sizeof(settings.profileName), menuTimeout);
       recordSystemSettings(); //We need to update this immediately in case user lists the available profiles again
       setProfileName(profileNumber);
     }

Firmware/RTK_Surveyor/menuPP.ino

@@ -30,8 +30,6 @@ void checkRXMCOR(UBX_RXM_COR_data_t *ubxDataStruct);
 
 void menuPointPerfectKeys()
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, caster credentials, etc).
-
   while (1)
   {
     Serial.println();
@@ -100,12 +98,12 @@ void menuPointPerfectKeys()
     if (incoming == 1)
     {
       Serial.print("Enter Device Profile Token: ");
-      readLine(settings.pointPerfectDeviceProfileToken, sizeof(settings.pointPerfectDeviceProfileToken), menuTimeoutExtended);
+      readLine(settings.pointPerfectDeviceProfileToken, sizeof(settings.pointPerfectDeviceProfileToken), menuTimeout);
     }
     else if (incoming == 2)
     {
       Serial.print("Enter Current Key: ");
-      readLine(settings.pointPerfectCurrentKey, sizeof(settings.pointPerfectCurrentKey), menuTimeoutExtended);
+      readLine(settings.pointPerfectCurrentKey, sizeof(settings.pointPerfectCurrentKey), menuTimeout);
     }
     else if (incoming == 3)
     {
@@ -135,7 +133,7 @@ void menuPointPerfectKeys()
     else if (incoming == 4)
     {
       Serial.print("Enter Next Key: ");
-      readLine(settings.pointPerfectNextKey, sizeof(settings.pointPerfectNextKey), menuTimeoutExtended);
+      readLine(settings.pointPerfectNextKey, sizeof(settings.pointPerfectNextKey), menuTimeout);
     }
     else if (incoming == 5)
     {
@@ -517,20 +515,18 @@ void mqttCallback(char* topic, byte* message, unsigned int length)
 //https://www.includehelp.com/c-programs/validate-date.aspx
 bool getDate(uint8_t &dd, uint8_t &mm, uint16_t &yy)
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, caster credentials, etc).
-
   char temp[10];
 
   Serial.print("Enter Day: ");
-  readLine(temp, sizeof(temp), menuTimeoutExtended);
+  readLine(temp, sizeof(temp), menuTimeout);
   dd = atoi(temp);
 
   Serial.print("Enter Month: ");
-  readLine(temp, sizeof(temp), menuTimeoutExtended);
+  readLine(temp, sizeof(temp), menuTimeout);
   mm = atoi(temp);
 
   Serial.print("Enter Year (YYYY): ");
-  readLine(temp, sizeof(temp), menuTimeoutExtended);
+  readLine(temp, sizeof(temp), menuTimeout);
   yy = atoi(temp);
 
   //check year
@@ -935,8 +931,6 @@ void beginLBand()
 void menuPointPerfect()
 {
 #ifdef COMPILE_L_BAND
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, caster credentials, etc).
-
   while (1)
   {
     Serial.println();
@@ -987,12 +981,12 @@ void menuPointPerfect()
     else if (incoming == '2')
     {
       Serial.print("Enter Home WiFi SSID: ");
-      readLine(settings.home_wifiSSID, sizeof(settings.home_wifiSSID), menuTimeoutExtended);
+      readLine(settings.home_wifiSSID, sizeof(settings.home_wifiSSID), menuTimeout);
     }
     else if (incoming == '3')
     {
       Serial.printf("Enter password for Home WiFi network %s: ", settings.home_wifiSSID);
-      readLine(settings.home_wifiPW, sizeof(settings.home_wifiPW), menuTimeoutExtended);
+      readLine(settings.home_wifiPW, sizeof(settings.home_wifiPW), menuTimeout);
     }
     else if (incoming == '4')
     {

Firmware/RTK_Surveyor/menuPorts.ino

@@ -182,8 +182,6 @@ void menuPortsMultiplexed()
 //Most often used for logging events (inputs) and when external triggers (outputs) occur
 void menuPortHardwareTriggers()
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, ECEF coords, etc).
-
   while (1)
   {
     Serial.println();
@@ -223,7 +221,7 @@ void menuPortHardwareTriggers()
     else if (incoming == '2' && settings.enableExternalPulse == true)
     {
       Serial.print("Time between pulses in milliseconds: ");
-      double pulseTime = getDouble(menuTimeoutExtended); //Timeout after x seconds
+      double pulseTime = getDouble(menuTimeout); //Timeout after x seconds
 
       if (pulseTime != STATUS_GETNUMBER_TIMEOUT && pulseTime != STATUS_PRESSED_X)
       {
@@ -233,7 +231,7 @@ void menuPortHardwareTriggers()
     else if (incoming == '3' && settings.enableExternalPulse == true)
     {
       Serial.print("Pulse length in milliseconds: ");
-      double pulseLength = getDouble(menuTimeoutExtended); //Timeout after x seconds
+      double pulseLength = getDouble(menuTimeout); //Timeout after x seconds
 
       if (pulseLength != STATUS_GETNUMBER_TIMEOUT && pulseLength != STATUS_PRESSED_X)
       {

Firmware/RTK_Surveyor/menuSystem.ino

@@ -386,8 +386,6 @@ void menuSystem()
 //Toggle control of heap reports and I2C GNSS debug
 void menuDebug()
 {
-  int menuTimeoutExtended = 30; //Increase time needed as it's a large menu
-
   while (1)
   {
     Serial.println();
@@ -498,7 +496,7 @@ void menuDebug()
     Serial.println("x) Exit");
 
     int incoming;
-    int digits = getMenuChoice(&incoming, menuTimeoutExtended); //Timeout after x seconds
+    int digits = getMenuChoice(&incoming, menuTimeout); //Timeout after x seconds
 
     //Handle input timeout
     if (digits == GMCS_TIMEOUT)