Reset wifi timeout if ethernet connection is lost

Author: nseidle

Firmware/RTK_Everywhere/Ethernet.ino

@@ -188,6 +188,9 @@ void ethernetEvent(arduino_event_id_t event, arduino_event_info_t info)
     case ARDUINO_EVENT_ETH_DISCONNECTED:
         if (settings.enablePrintEthernetDiag && (!inMainMenu))
             systemPrintln("ETH Disconnected");
+
+        wifiResetTimeout(); // If we loose ethernet, allow WiFi to immediately try to start
+
         break;
 
     case ARDUINO_EVENT_ETH_STOP:

Firmware/RTK_Everywhere/WiFi.ino

@@ -485,7 +485,7 @@ bool wifiForceStart()
         // Start WiFi
         if (wifiConnect(settings.wifiConnectTimeoutMs))
         {
-            wifiStartTimeout = 0;
+            wifiResetTimeout();
             if (settings.debugWifiState == true)
                 systemPrintln("WiFi: Start timeout reset to zero");
         }
@@ -494,6 +494,15 @@ bool wifiForceStart()
     return (wifiStatus == WL_CONNECTED);
 }
 
+//----------------------------------------
+// Set WiFi timeout back to zero
+// Useful if other things (such as a successful ethernet connection) need to reset wifi timeout
+//----------------------------------------
+void wifiResetTimeout()
+{
+    wifiStartTimeout = 0;
+}
+
 //----------------------------------------
 // Start WiFi with throttling
 //----------------------------------------