Move NTRIP variables for System Status printing

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -64,15 +64,6 @@ static const int NTRIPCLIENT_MS_BETWEEN_GGA = 5000; //5s between transmission of
 //The WiFi connection to the NTRIP caster to obtain RTCM data.
 static WiFiClient * ntripClient;
 
-//Count the number of connection attempts
-static int ntripClientConnectionAttempts;
-
-//NTRIP client timer usage:
-//  * Measure the connection response time
-//  * Receive NTRIP data timeout
-static uint32_t ntripClientTimer;
-static uint32_t ntripClientStartTime; //For calculating uptime
-
 //Last time the NTRIP client state was displayed
 static uint32_t lastNtripClientState = 0;
 

Firmware/RTK_Surveyor/NtripServer.ino

@@ -67,9 +67,6 @@ static WiFiClient * ntripServer;
 //Count of bytes sent by the NTRIP server to the NTRIP caster
 uint32_t ntripServerBytesSent = 0;
 
-//Count the number of connection attempts
-static int ntripServerConnectionAttempts;
-
 //Throttle the time between connection attempts
 static int ntripServerConnectionAttemptTimeout = 0;
 static uint32_t ntripServerLastConnectionAttempt = 0;
@@ -78,14 +75,6 @@ static uint32_t ntripServerTimeoutPrint = 0;
 //Last time the NTRIP server state was displayed
 static uint32_t ntripServerStateLastDisplayed = 0;
 
-//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;
-
 //----------------------------------------
 // NTRIP Server Routines - compiled out
 //----------------------------------------

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -162,6 +162,22 @@ LoggingType loggingType = LOGGING_UNKNOWN;
 #endif
 
 volatile uint8_t wifiNmeaConnected;
+
+//NTRIP client timer usage:
+//  * Measure the connection response time
+//  * Receive NTRIP data timeout
+static uint32_t ntripClientTimer;
+static uint32_t ntripClientStartTime; //For calculating uptime
+static int ntripClientConnectionAttempts; //Count the number of connection attempts
+
+//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
+
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 //GNSS configuration