Merge pull request #710 from LeeLeahy2/wifi-timeout

Network: Delay reconnection attempts only when connection is successful

Author: nseidle

Firmware/RTK_Surveyor/Network.ino

@@ -1080,7 +1080,6 @@ void networkTypeUpdate(uint8_t networkType)
             {
                 if (settings.debugNetworkLayer)
                     systemPrintf("Network connected to %s\r\n", networkName[network->type]);
-                network->connectionAttempt = 0;
                 network->timerStart = millis();
                 network->timeout = NETWORK_MAX_IDLE_TIME;
                 network->activeUsers = network->userOpens;
@@ -1095,14 +1094,6 @@ void networkTypeUpdate(uint8_t networkType)
             if (network->shutdown)
                 networkStop(network->type);
 
-            // Without users there is no need for the network.
-            else if ((!network->activeUsers) && ((millis() - network->timerStart) >= network->timeout))
-            {
-                if (settings.debugNetworkLayer)
-                    systemPrintf("Network shutting down %s, no users\r\n", networkName[network->type]);
-                networkStop(network->type);
-            }
-
             // Verify that the RTK device is still connected to the network
             else if (!networkIsMediaConnected(network))
             {
@@ -1112,6 +1103,29 @@ void networkTypeUpdate(uint8_t networkType)
                 networkRestartNetwork(network);
                 networkStop(network->type);
             }
+
+            // Check for the idle timeout
+            else if ((millis() - network->timerStart) >= network->timeout)
+            {
+                // Determine if the network is in use
+                network->timerStart = millis();
+                if (network->activeUsers)
+                {
+                    // Network in use, reduce future connection delays
+                    network->connectionAttempt = 0;
+
+                    // Set the next time that network idle should be checked
+                    network->timeout = NETWORK_MAX_IDLE_TIME;
+                }
+
+                // Without users there is no need for the network.
+                else
+                {
+                    if (settings.debugNetworkLayer)
+                        systemPrintf("Network shutting down %s, no users\r\n", networkName[network->type]);
+                    networkStop(network->type);
+                }
+            }
             break;
 
         case NETWORK_STATE_WAIT_NO_USERS: