Better debug in ntripServerProcessRTCM - equal printing of servers 0 and 1

Author: PaulZC

Firmware/RTK_Surveyor/NtripServer.ino

@@ -367,18 +367,16 @@ void ntripServerPrintStatus (int serverIndex)
 void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
 {
     NTRIP_SERVER_DATA * ntripServer = &ntripServerArray[serverIndex];
-    static uint32_t zedBytesSent;
 
     if (ntripServer->state == NTRIP_SERVER_CASTING)
     {
         // Generate and print timestamp if needed
         uint32_t currentMilliseconds;
-        static uint32_t previousMilliseconds = 0;
         if (online.rtc)
         {
             // Timestamp the RTCM messages
             currentMilliseconds = millis();
-            if (((settings.debugNtripServerRtcm && ((currentMilliseconds - previousMilliseconds) > 5))
+            if (((settings.debugNtripServerRtcm && ((currentMilliseconds - ntripServer->previousMilliseconds) > 5))
                 || PERIODIC_DISPLAY(PD_NTRIP_SERVER_DATA)) && (!settings.enableRtcmMessageChecking)
                 && (!inMainMenu) && ntripServer->bytesSent)
             {
@@ -390,10 +388,10 @@ void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
                 struct tm timeinfo = rtc.getTimeStruct();
                 char timestamp[30];
                 strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S", &timeinfo);
-                systemPrintf("    Tx%d RTCM: %s.%03ld, %d bytes sent\r\n", serverIndex, timestamp, rtc.getMillis(), zedBytesSent);
-                zedBytesSent = 0;
+                systemPrintf("    Tx%d RTCM: %s.%03ld, %d bytes sent\r\n", serverIndex, timestamp, rtc.getMillis(), ntripServer->zedBytesSent);
+                ntripServer->zedBytesSent = 0;
             }
-            previousMilliseconds = currentMilliseconds;
+            ntripServer->previousMilliseconds = currentMilliseconds;
         }
 
         // If we have not gotten new RTCM bytes for a period of time, assume end of frame
@@ -409,7 +407,7 @@ void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
         {
             ntripServer->networkClient->write(incoming); // Send this byte to socket
             ntripServer->bytesSent++;
-            zedBytesSent++;
+            ntripServer->zedBytesSent++;
             ntripServer->timer = millis();
             netOutgoingRTCM = true;
         }

Firmware/RTK_Surveyor/settings.h

@@ -306,6 +306,10 @@ typedef struct _NTRIP_SERVER_DATA
     uint32_t timer;
     uint32_t startTime;
     int connectionAttemptsTotal; // Count the number of connection attempts absolutely
+
+    // Additional count / times for ntripServerProcessRTCM
+    uint32_t zedBytesSent ;
+    uint32_t previousMilliseconds;
 } NTRIP_SERVER_DATA;
 
 typedef enum