NTRIP Server: Count all of the RTCM messages

Author: LeeLeahy2

Firmware/RTK_Surveyor/NtripServer.ino

@@ -244,6 +244,9 @@ bool ntripServerRtcmMessage(uint8_t data)
   {
     crcState = RTCM_TRANSPORT_STATE_WAIT_FOR_PREAMBLE_D3;
 
+    //Account for this message
+    rtcmPacketsSent++;
+
     //Display the RTCM message header
     if (settings.enablePrintNtripServerRtcm && (!inMainMenu))
       Serial.printf ("    Message %d, %2d bytes\r\n", message, 3 + 1 + length + 3);
@@ -315,15 +318,6 @@ void ntripServerProcessRTCM(uint8_t incoming)
   uint32_t currentMilliseconds;
   static uint32_t previousMilliseconds = 0;
 
-  //Count outgoing packets for display
-  //Assume 1Hz RTCM transmissions
-  currentMilliseconds = millis();
-  if (currentMilliseconds - lastRTCMPacketSent > 500)
-  {
-    lastRTCMPacketSent = millis();
-    rtcmPacketsSent++;
-  }
-
   //Check for too many digits
   if (settings.enableResetDisplay == true)
   {
@@ -342,6 +336,7 @@ void ntripServerProcessRTCM(uint8_t incoming)
   if (online.rtc)
   {
     //Timestamp the RTCM messages
+    currentMilliseconds = millis();
     if (settings.enablePrintNtripServerRtcm
         && (!inMainMenu)
         && ((currentMilliseconds - previousMilliseconds) > 1))

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -368,7 +368,6 @@ uint64_t lastLogSize = 0;
 bool logIncreasing = false; //Goes true when log file is greater than lastLogSize
 bool reuseLastLog = false; //Goes true if we have a reset due to software (rather than POR)
 
-uint32_t lastRTCMPacketSent = 0; //Used to count RTCM packets sent during base mode
 uint32_t rtcmPacketsSent = 0; //Used to count RTCM packets sent via processRTCM()
 
 uint32_t maxSurveyInWait_s = 60L * 15L; //Re-start survey-in after X seconds