Skip to content

Commit a4ac2e8

Browse files
committed
Better debug printing by ntripServerProcessRTCM
1 parent fb5a536 commit a4ac2e8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Firmware/RTK_Everywhere/NtripServer.ino

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -359,18 +359,16 @@ void ntripServerPrintStatus(int serverIndex)
359359
void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
360360
{
361361
NTRIP_SERVER_DATA *ntripServer = &ntripServerArray[serverIndex];
362-
static uint32_t rtcmBytesSent;
363362

364363
if (ntripServer->state == NTRIP_SERVER_CASTING)
365364
{
366365
// Generate and print timestamp if needed
367366
uint32_t currentMilliseconds;
368-
static uint32_t previousMilliseconds = 0;
369367
if (online.rtc)
370368
{
371369
// Timestamp the RTCM messages
372370
currentMilliseconds = millis();
373-
if (((settings.debugNtripServerRtcm && ((currentMilliseconds - previousMilliseconds) > 5)) ||
371+
if (((settings.debugNtripServerRtcm && ((currentMilliseconds - ntripServer->previousMilliseconds) > 5)) ||
374372
PERIODIC_DISPLAY(PD_NTRIP_SERVER_DATA)) &&
375373
(!settings.enableRtcmMessageChecking) && (!inMainMenu) && ntripServer->bytesSent)
376374
{
@@ -383,10 +381,10 @@ void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
383381
char timestamp[30];
384382
strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S", &timeinfo);
385383
systemPrintf(" Tx%d RTCM: %s.%03ld, %d bytes sent\r\n", serverIndex, timestamp, rtc.getMillis(),
386-
rtcmBytesSent);
387-
rtcmBytesSent = 0;
384+
ntripServer->rtcmBytesSent);
385+
ntripServer->rtcmBytesSent = 0;
388386
}
389-
previousMilliseconds = currentMilliseconds;
387+
ntripServer->previousMilliseconds = currentMilliseconds;
390388
}
391389

392390
// If we have not gotten new RTCM bytes for a period of time, assume end of frame
@@ -403,7 +401,7 @@ void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
403401
{
404402
ntripServer->networkClient->write(incoming); // Send this byte to socket
405403
ntripServer->bytesSent++;
406-
rtcmBytesSent++;
404+
ntripServer->rtcmBytesSent++;
407405
ntripServer->timer = millis();
408406
netOutgoingRTCM = true;
409407
}

Firmware/RTK_Everywhere/settings.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,10 @@ typedef struct _NTRIP_SERVER_DATA
343343
uint32_t timer;
344344
uint32_t startTime;
345345
int connectionAttemptsTotal; // Count the number of connection attempts absolutely
346+
347+
// Better debug printing by ntripServerProcessRTCM
348+
uint32_t rtcmBytesSent;
349+
uint32_t previousMilliseconds;
346350
} NTRIP_SERVER_DATA;
347351

348352
typedef enum

0 commit comments

Comments
 (0)