Correct WiFi TCP logic. Change NTRIP Client to 15s throttling.

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -42,7 +42,7 @@ static const int CREDENTIALS_BUFFER_SIZE = 512;
 
 //Give up connecting after this number of attempts
 //Connection attempts are throttled to increase the time between attempts
-//30 attempts with 5 minute increases will take over 38 hours
+//30 attempts with 15 second increases will take almost two hours
 static const int MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS = 30;
 
 //NTRIP caster response timeout
@@ -172,7 +172,7 @@ bool ntripClientConnectLimitReached()
 
   if (limitReached == false)
   {
-    ntripClientConnectionAttemptTimeout = ntripClientConnectionAttempts * 5 * 60 * 1000L; //Wait 5, 10, 15, etc minutes between attempts
+    ntripClientConnectionAttemptTimeout = ntripClientConnectionAttempts * 15 * 1000L; //Wait 15, 30, 45, etc seconds between attempts
 
     log_d("ntripClientConnectionAttemptTimeout increased to %d minutes", ntripClientConnectionAttemptTimeout / (60 * 1000L));
 

Firmware/RTK_Surveyor/WiFi.ino

@@ -153,13 +153,13 @@ void wifiStartAP()
 #define WIFI_SSID "TRex"
 #define WIFI_PASSWORD "parachutes"
 
+  WiFi.mode(WIFI_STA);
+
 #ifdef COMPILE_ESPNOW
   // Return protocol to default settings (no WIFI_PROTOCOL_LR for ESP NOW)
   esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Stops WiFi Station
 #endif
 
-  WiFi.mode(WIFI_STA);
-
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("WiFi connecting to");
   while (wifiGetStatus() != WL_CONNECTED)
@@ -382,11 +382,6 @@ void wifiStop()
 #ifdef COMPILE_WIFI
   stopWebServer();
 
-  if (wifiState == WIFI_OFF)
-  {
-    //Do nothing
-  }
-
   //Shutdown the NMEA client
   if (online.nmeaClient)
   {
@@ -407,6 +402,11 @@ void wifiStop()
       delay(5);
     Serial.println("NMEA Server offline");
   }
+  
+  if (wifiState == WIFI_OFF)
+  {
+    //Do nothing
+  }
 
 #ifdef COMPILE_ESPNOW
   //If WiFi is on but ESP NOW is off, then turn off radio entirely