Update ntripClientUpdate to match ntripServerUpdate

Author: PaulZC

Firmware/RTK_Surveyor/NtripClient.ino

@@ -392,6 +392,7 @@ void ntripClientUpdate()
                 {
                     ntripClientLastConnectionAttempt = millis();
                     log_d("NTRIP Client starting on Ethernet");
+                    ntripClientTimer = millis();
                     ntripClientSetState(NTRIP_CLIENT_WIFI_ETHERNET_STARTED);
                 }
             }
@@ -416,6 +417,7 @@ void ntripClientUpdate()
                     ntripClientLastConnectionAttempt = millis();
                     log_d("NTRIP Client starting WiFi");
                     wifiStart();
+                    ntripClientTimer = millis();
                     ntripClientSetState(NTRIP_CLIENT_WIFI_ETHERNET_STARTED);
                 }
             }
@@ -424,32 +426,18 @@ void ntripClientUpdate()
     break;
 
     case NTRIP_CLIENT_WIFI_ETHERNET_STARTED:
-        if (HAS_ETHERNET) // && !settings.ntripClientUseWiFiNotEthernet) //For future expansion
+        if ((millis() - ntripClientTimer) > (1 * 60 * 1000))
+            // Failed to connect to to the network, attempt to restart the network
+            ntripClientStop(false);
+        else if (HAS_ETHERNET) // && !settings.ntripClientUseWiFiNotEthernet) //For future expansion
         {
             if (online.ethernetStatus == ETH_CONNECTED)
                 ntripClientSetState(NTRIP_CLIENT_WIFI_ETHERNET_CONNECTED);
-            else if (online.ethernetStatus == ETH_CAN_NOT_BEGIN) // Ethernet hardware failure or not available
-                ntripClientSetState(NTRIP_CLIENT_OFF);
-            else
-            {
-                // Wait for ethernet to connect
-                static unsigned long lastDebug = millis();
-                if (millis() > (lastDebug + 5000))
-                {
-                    lastDebug = millis();
-                    log_d("NTRIP Client: Ethernet not connected. Waiting to retry.");
-                }
-            }
         }
         else
         {
             if (wifiIsConnected())
                 ntripClientSetState(NTRIP_CLIENT_WIFI_ETHERNET_CONNECTED);
-            else if (wifiState == WIFI_OFF)
-            {
-                // WiFi failed to connect. Restart Client which will restart WiFi.
-                ntripClientSetState(NTRIP_CLIENT_ON);
-            }
         }
         break;
 
@@ -492,7 +480,12 @@ void ntripClientUpdate()
             {
                 // NTRIP web service did not respond
                 if (ntripClientConnectLimitReached()) // Updates ntripClientConnectionAttemptTimeout
+                {
                     systemPrintln("NTRIP Caster failed to respond. Do you have your caster address and port correct?");
+
+                    // Stop WiFi operations
+                    ntripClientStop(true); // Do not allocate new wifiClient
+                }
                 else
                 {
                     if (ntripClientConnectionAttemptTimeout / 1000 < 120)
@@ -501,6 +494,9 @@ void ntripClientUpdate()
                     else
                         systemPrintf("NTRIP Client failed to connect to caster. Trying again in %d minutes.\r\n",
                                      ntripClientConnectionAttemptTimeout / 1000 / 60);
+
+                    // Restart network operation after delay
+                    ntripClientStop(false);
                 }
             }
         }
@@ -510,10 +506,40 @@ void ntripClientUpdate()
             char response[512];
             ntripClientResponse(&response[0], sizeof(response));
 
-            log_d("Caster Response: %s", response);
+            //log_d("Caster Response: %s", response);
 
             // Look for various responses
-            if (strstr(response, "401") != nullptr)
+            if (strstr(response, "200") != nullptr)
+            {
+                log_d("NTRIP Client connected to caster");
+
+                // Connection is now open, start the NTRIP receive data timer
+                ntripClientTimer = millis();
+
+                if (settings.ntripClient_TransmitGGA == true)
+                {
+                    // Set the Main Talker ID to "GP". The NMEA GGA messages will be GPGGA instead of GNGGA
+                    theGNSS.setVal8(UBLOX_CFG_NMEA_MAINTALKERID, 1);
+                    theGNSS.setNMEAGPGGAcallbackPtr(&pushGPGGA); // Set up the callback for GPGGA
+
+                    float measurementFrequency = (1000.0 / settings.measurementRate) / settings.navigationRate;
+                    if (measurementFrequency < 0.2)
+                        measurementFrequency = 0.2; // 0.2Hz * 5 = 1 measurement every 5 seconds
+                    log_d("Adjusting GGA setting to %f", measurementFrequency);
+                    theGNSS.setVal8(
+                        UBLOX_CFG_MSGOUT_NMEA_ID_GGA_I2C,
+                        measurementFrequency); // Enable GGA over I2C. Tell the module to output GGA every second
+
+                    lastGGAPush = millis() - NTRIPCLIENT_MS_BETWEEN_GGA; // Force immediate transmission of GGA message
+                }
+
+                // We don't use a task because we use I2C hardware (and don't have a semphore).
+                online.ntripClient = true;
+                ntripClientStartTime = millis();
+                ntripClientConnectionAttempts = 0;
+                ntripClientSetState(NTRIP_CLIENT_CONNECTED);
+            }
+            else if (strstr(response, "401") != nullptr)
             {
                 // Look for '401 Unauthorized'
                 systemPrintf(
@@ -540,35 +566,33 @@ void ntripClientUpdate()
                 // Stop WiFi operations
                 ntripClientStop(true); // Do not allocate new wifiClient
             }
-            else if (strstr(response, "200") != nullptr)
+            // Other errors returned by the caster
+            else
             {
-                log_d("NTRIP Client connected to caster");
-
-                // Connection is now open, start the NTRIP receive data timer
-                ntripClientTimer = millis();
+                systemPrintf("NTRIP Client connected but caster responded with problem: %s\r\n", response);
 
-                if (settings.ntripClient_TransmitGGA == true)
+                // Check for connection limit
+                if (ntripClientConnectLimitReached())
                 {
-                    // Set the Main Talker ID to "GP". The NMEA GGA messages will be GPGGA instead of GNGGA
-                    theGNSS.setVal8(UBLOX_CFG_NMEA_MAINTALKERID, 1);
-                    theGNSS.setNMEAGPGGAcallbackPtr(&pushGPGGA); // Set up the callback for GPGGA
-
-                    float measurementFrequency = (1000.0 / settings.measurementRate) / settings.navigationRate;
-                    if (measurementFrequency < 0.2)
-                        measurementFrequency = 0.2; // 0.2Hz * 5 = 1 measurement every 5 seconds
-                    log_d("Adjusting GGA setting to %f", measurementFrequency);
-                    theGNSS.setVal8(
-                        UBLOX_CFG_MSGOUT_NMEA_ID_GGA_I2C,
-                        measurementFrequency); // Enable GGA over I2C. Tell the module to output GGA every second
+                    systemPrintln("NTRIP Client retry limit reached; do you have your caster address and port correct?");
 
-                    lastGGAPush = millis() - NTRIPCLIENT_MS_BETWEEN_GGA; // Force immediate transmission of GGA message
+                    // Give up - Shutdown NTRIP client, no further retries
+                    ntripClientStop(true);
                 }
 
-                // We don't use a task because we use I2C hardware (and don't have a semphore).
-                online.ntripClient = true;
-                ntripClientStartTime = millis();
-                ntripClientConnectionAttempts = 0;
-                ntripClientSetState(NTRIP_CLIENT_CONNECTED);
+                // Attempt to reconnect after throttle controlled timeout
+                else
+                {
+                    if (ntripClientConnectionAttemptTimeout / 1000 < 120)
+                        systemPrintf("NTRIP Client attempting connection in %d seconds.\r\n",
+                                     ntripClientConnectionAttemptTimeout / 1000);
+                    else
+                        systemPrintf("NTRIP Client attempting connection in %d minutes.\r\n",
+                                     ntripClientConnectionAttemptTimeout / 1000 / 60);
+
+                    // Restart network operation after delay
+                    ntripClientStop(false);
+                }
             }
         }
 #endif  // COMPILE_WIFI || COMPILE_ETHERNET