Report NTRIP connection attempts total

Connection attempts is reset every time the NTRIP Server/Client is restarted. Add count to be displayed during system menu indicating the total re-connect attempts. This is better for uptime displays.

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -81,11 +81,6 @@ unsigned long lastGGAPush = 0;
 // NTRIP Client Routines - compiled out
 //----------------------------------------
 
-void ntripClientAllowMoreConnections()
-{
-  ntripClientConnectionAttempts = 0;
-}
-
 bool ntripClientConnect()
 {
   if (!ntripClient)
@@ -170,6 +165,8 @@ bool ntripClientConnectLimitReached()
   bool limitReached = false;
   if (ntripClientConnectionAttempts++ >= MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS) limitReached = true;
 
+  ntripClientConnectionAttemptsTotal++;
+
   if (limitReached == false)
   {
     ntripClientConnectionAttemptTimeout = ntripClientConnectionAttempts * 15 * 1000L; //Wait 15, 30, 45, etc seconds between attempts
@@ -270,9 +267,7 @@ void ntripClientStart()
       ntripClientSetState(NTRIP_CLIENT_ON);
   }
 
-  //Only fallback to Bluetooth once, then try WiFi again.  This enables changes
-  //to the WiFi SSID and password to properly restart the WiFi.
-  ntripClientAllowMoreConnections();
+  ntripClientConnectionAttempts = 0;
 #endif  //COMPILE_WIFI
 }
 
@@ -475,7 +470,7 @@ void ntripClientUpdate()
           //We don't use a task because we use I2C hardware (and don't have a semphore).
           online.ntripClient = true;
           ntripClientStartTime = millis();
-          ntripClientAllowMoreConnections();
+          ntripClientConnectionAttempts = 0;
           ntripClientSetState(NTRIP_CLIENT_CONNECTED);
         }
       }

Firmware/RTK_Surveyor/NtripServer.ino

@@ -133,6 +133,8 @@ bool ntripServerConnectLimitReached()
   bool limitReached = false;
   if (ntripServerConnectionAttempts++ >= MAX_NTRIP_SERVER_CONNECTION_ATTEMPTS) limitReached = true;
 
+  ntripServerConnectionAttemptsTotal++;
+
   if (limitReached == false)
   {
     ntripServerConnectionAttemptTimeout = ntripServerConnectionAttempts * 5 * 60 * 1000L; //Wait 5, 10, 15, etc minutes between attempts

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -168,15 +168,17 @@ volatile uint8_t wifiNmeaConnected;
 //  * Receive NTRIP data timeout
 static uint32_t ntripClientTimer;
 static uint32_t ntripClientStartTime; //For calculating uptime
-static int ntripClientConnectionAttempts; //Count the number of connection attempts
+static int ntripClientConnectionAttempts; //Count the number of connection attempts between restarts
+static int ntripClientConnectionAttemptsTotal; //Count the number of connection attempts absolutely
 
 //NTRIP server timer usage:
 //  * Measure the connection response time
 //  * Receive RTCM correction data timeout
 //  * Monitor last RTCM byte received for frame counting
 static uint32_t ntripServerTimer;
 static uint32_t ntripServerStartTime;
-static int ntripServerConnectionAttempts; //Count the number of connection attempts
+static int ntripServerConnectionAttempts; //Count the number of connection attempts between restarts
+static int ntripServerConnectionAttemptsTotal; //Count the number of connection attempts absolutely
 
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 

Firmware/RTK_Surveyor/menuSystem.ino

@@ -151,7 +151,7 @@ void menuSystem()
                     uptimeMinutes,
                     uptimeSeconds,
                     uptimeMilliseconds,
-                    ntripClientConnectionAttempts);
+                    ntripClientConnectionAttemptsTotal);
     }
 
     //Display NTRIP Server status and uptime
@@ -201,7 +201,7 @@ void menuSystem()
                     uptimeMinutes,
                     uptimeSeconds,
                     uptimeMilliseconds,
-                    ntripServerConnectionAttempts);
+                    ntripServerConnectionAttemptsTotal);
     }
 
     if (settings.enableSD == true)