Move WiFi connect timeout to Debug Software menu

Author: PaulZC

Firmware/RTK_Everywhere/WiFi.ino

@@ -92,8 +92,6 @@ void menuWiFi()
         systemPrint("m) MDNS: ");
         systemPrintf("%s\r\n", settings.mdnsEnable ? "Enabled" : "Disabled");
 
-        systemPrintf("t) Connect Timeout (ms): %d\r\n", settings.wifiConnectTimeoutMs);
-
         systemPrintln("x) Exit");
 
         byte incoming = getUserInputCharacterNumber();
@@ -130,18 +128,6 @@ void menuWiFi()
         {
             settings.mdnsEnable ^= 1;
         }
-        else if (incoming == 't')
-        {
-            systemPrint("Enter connect timeout in ms (1000 - 120000): ");
-            long newTimeout = getUserInputNumber(); // Returns EXIT, TIMEOUT, or long
-            if ((newTimeout != INPUT_RESPONSE_GETNUMBER_EXIT) && (newTimeout != INPUT_RESPONSE_GETNUMBER_TIMEOUT))
-            {
-                if ((newTimeout >= 1000) && (newTimeout <= 120000))
-                {
-                    settings.wifiConnectTimeoutMs = newTimeout;
-                }
-            }
-        }
         else if (incoming == 'x')
             break;
         else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)

Firmware/RTK_Everywhere/menuSystem.ino

@@ -736,6 +736,8 @@ void menuDebugSoftware()
 
         systemPrintf("2) Set level to use PSRAM (bytes): %d\r\n", settings.psramMallocLevel);
 
+        systemPrintf("3) WiFi Connect Timeout (ms): %d\r\n", settings.wifiConnectTimeoutMs);
+
         // Ring buffer - ZED Tx
         systemPrint("10) Print ring buffer offsets: ");
         systemPrintf("%s\r\n", settings.enablePrintRingBufferOffsets ? "Enabled" : "Disabled");
@@ -810,6 +812,10 @@ void menuDebugSoftware()
         {
             getNewSetting("Enter level to use PSRAM in bytes", 0, 65535, &settings.psramMallocLevel);
         }
+        else if (incoming == 3)
+        {
+            getNewSetting("Enter WiFi connect timeout in ms", 1000, 120000, &settings.wifiConnectTimeoutMs);
+        }
         else if (incoming == 10)
             settings.enablePrintRingBufferOffsets ^= 1;
         else if (incoming == 11)

Firmware/RTK_Everywhere/settings.h

@@ -1353,7 +1353,7 @@ struct Settings
         {"", ""},
         {"", ""},
     };
-    uint32_t wifiConnectTimeoutMs = 10000; // Wait this long for a WiFiMulti connection
+    uint32_t wifiConnectTimeoutMs = 20000; // Wait this long for a WiFiMulti connection
 
     // Add new settings to appropriate group above or create new group
     // Then also add to the same group in rtkSettingsEntries below