Cleanup RTCM log_ds

Author: nseidle

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -63,7 +63,7 @@ void espnowOnDataRecieved(const uint8_t *mac, const uint8_t *incomingData, int l
 
     //Pass RTCM bytes (presumably) from ESP NOW out ESP32-UART2 to ZED-UART1
     serialGNSS.write(incomingData, len);
-    log_d("ESPNOW: Received %d bytes, RSSI: %d", len, espnowRSSI);
+    log_d("ESPNOW received %d RTCM bytes, pushed to ZED, RSSI: %d", len, espnowRSSI);
 
     espnowIncomingRTCM = true;
     lastEspnowRssiUpdate = millis();
@@ -348,7 +348,8 @@ void espnowProcessRTCM(byte incoming)
       espnowOutgoingSpot = 0; //Wrap
       esp_now_send(0, (uint8_t *) &espnowOutgoing, sizeof(espnowOutgoing)); //Send packet to all peers
       delay(10); //We need a small delay between sending multiple packets
-      log_d("ESPNOW pushed %d RTCM bytes", sizeof(espnowOutgoing));
+      
+      espnowBytesSent += sizeof(espnowOutgoing);
 
       espnowOutgoingRTCM = true;
     }

Firmware/RTK_Surveyor/NtripClient.ino

@@ -460,7 +460,7 @@ void ntripClientUpdate()
           i2cGNSS.pushRawData(rtcmData, rtcmCount);
           wifiIncomingRTCM = true;
 
-          log_d("NTRIP Client pushed %d RTCM bytes to ZED", rtcmCount);
+          log_d("NTRIP Client received %d RTCM bytes, pushed to ZED", rtcmCount);
         }
       }
 

Firmware/RTK_Surveyor/NtripServer.ino

@@ -368,7 +368,7 @@ void ntripServerProcessRTCM(uint8_t incoming)
       //If we have not gotten new RTCM bytes for a period of time, assume end of frame
       if (millis() - ntripServerTimer > 100 && ntripServerBytesSent > 0)
       {
-        log_d("NTRIP Server pushed %d RTCM bytes to Caster", ntripServerBytesSent);
+        log_d("NTRIP Server transmitted %d RTCM bytes to Caster", ntripServerBytesSent);
         ntripServerBytesSent = 0;
         rtcmPacketsSent++; //If not checking RTCM CRC, count based on timeout
       }

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -354,7 +354,8 @@ float lBandEBNO = 0.0; //Used on system status menu
 
 uint8_t espnowOutgoing[250]; //ESP NOW has max of 250 characters
 unsigned long espnowLastAdd; //Tracks how long since last byte was added to the outgoing buffer
-uint8_t espnowOutgoingSpot = 0;
+uint8_t espnowOutgoingSpot = 0; //ESP Now has max of 250 characters
+uint16_t espnowBytesSent = 0; //May be more than 255
 uint8_t receivedMAC[6]; //Holds the broadcast MAC during pairing
 
 int espnowRSSI = 0;
@@ -848,8 +849,12 @@ void updateRadio()
       //then we've reached the end of the RTCM stream. Send partial buffer.
       if (espnowOutgoingSpot > 0 && (millis() - espnowLastAdd) > 50)
       {
+        rtcmPacketsSent++; //Assume this is the end of the RTCM frame
+
         esp_now_send(0, (uint8_t *) &espnowOutgoing, espnowOutgoingSpot); //Send partial packet to all peers
-        //log_d("ESPNOW: Sending %d bytes", espnowOutgoingSpot);
+        
+        log_d("ESPNOW transmitted %d RTCM bytes", espnowBytesSent + espnowOutgoingSpot);
+        espnowBytesSent = 0;
         espnowOutgoingSpot = 0; //Reset
       }
 

Firmware/RTK_Surveyor/Tasks.ino

@@ -18,6 +18,7 @@ void F9PSerialWriteTask(void *e)
         //TODO - control if this RTCM source should be listened to or not
         serialGNSS.write(wBuffer, s);
         bluetoothIncomingRTCM = true;
+        log_d("Bluetooth received %d RTCM bytes, sent to ZED", s);
 
         if (settings.enableTaskReports == true)
           Serial.printf("SerialWriteTask High watermark: %d\n\r",  uxTaskGetStackHighWaterMark(NULL));
@@ -671,4 +672,3 @@ void idleTask(void *e)
   }
 }
 #endif  //COMPILE_IDLE_TASKS
-