Skip to content

Commit 2b3fc31

Browse files
nseidlenseidle
committed
Suppress MQTT subscribed printing to debug
1 parent 4808daf commit 2b3fc31

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

‎Firmware/RTK_Everywhere/MQTT_Client.ino

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ bool mqttClientConnectLimitReached()
213213
//----------------------------------------
214214
// Determine if the MQTT client may be enabled
215215
//----------------------------------------
216-
bool mqttClientEnabled(const char ** line)
216+
bool mqttClientEnabled(const char **line)
217217
{
218218
bool enabled;
219219

@@ -357,7 +357,7 @@ void mqttClientPrintSubscribedTopics()
357357
//----------------------------------------
358358
// Process the localizedDistributionDictTopic message
359359
//----------------------------------------
360-
void mqttClientProcessLocalizedDistributionDictTopic(uint8_t * mqttData)
360+
void mqttClientProcessLocalizedDistributionDictTopic(uint8_t *mqttData)
361361
{
362362
// We should be using a JSON library to read the nodes. But JSON is
363363
// heavy on RAM and the dict could be 25KB for Level 3.
@@ -425,7 +425,7 @@ void mqttClientProcessLocalizedDistributionDictTopic(uint8_t * mqttData)
425425
//----------------------------------------
426426
// Process the point perfect keys distribution message
427427
//----------------------------------------
428-
void mqttClientProcessPointPerfectKeyDistributionTopic(uint8_t * mqttData)
428+
void mqttClientProcessPointPerfectKeyDistributionTopic(uint8_t *mqttData)
429429
{
430430
// Separate the UBX message into its constituent Key/ToW/Week parts
431431
uint8_t *payLoad = &mqttData[6];
@@ -462,8 +462,7 @@ void mqttClientProcessPointPerfectKeyDistributionTopic(uint8_t * mqttData)
462462
WeekToWToUnixEpoch(&settings.pointPerfectCurrentKeyStart, currentWeek, currentToW);
463463
WeekToWToUnixEpoch(&settings.pointPerfectNextKeyStart, nextWeek, nextToW);
464464

465-
settings.pointPerfectCurrentKeyStart -=
466-
gnss->getLeapSeconds(); // Remove GPS leap seconds to align with u-blox
465+
settings.pointPerfectCurrentKeyStart -= gnss->getLeapSeconds(); // Remove GPS leap seconds to align with u-blox
467466
settings.pointPerfectNextKeyStart -= gnss->getLeapSeconds();
468467

469468
settings.pointPerfectCurrentKeyStart *= 1000; // Convert to ms
@@ -475,8 +474,7 @@ void mqttClientProcessPointPerfectKeyDistributionTopic(uint8_t * mqttData)
475474
// settings.pointPerfectCurrentKeyDuration; // We assume next key duration is the same as current
476475
// key duration because we have to
477476

478-
settings.pointPerfectNextKeyDuration =
479-
(1000LL * 60 * 60 * 24 * 28) - 1; // Assume next key duration is 28 days
477+
settings.pointPerfectNextKeyDuration = (1000LL * 60 * 60 * 24 * 28) - 1; // Assume next key duration is 28 days
480478

481479
if (online.rtc)
482480
settings.lastKeyAttempt = rtc.getEpoch(); // Mark it - but only if RTC is online
@@ -490,7 +488,7 @@ void mqttClientProcessPointPerfectKeyDistributionTopic(uint8_t * mqttData)
490488
//----------------------------------------
491489
// Send the message to the ZED
492490
//----------------------------------------
493-
int mqttClientProcessZedMessage(uint8_t * mqttData, uint16_t mqttCount, int bytesPushed, char * topic)
491+
int mqttClientProcessZedMessage(uint8_t *mqttData, uint16_t mqttCount, int bytesPushed, char *topic)
494492
{
495493
#ifdef COMPILE_ZED
496494
// Only push SPARTN if the priority says we can
@@ -499,14 +497,14 @@ int mqttClientProcessZedMessage(uint8_t * mqttData, uint16_t mqttCount, int byte
499497
((strlen(settings.regionalCorrectionTopics[settings.geographicRegion]) > 0) &&
500498
(strcmp(topic, settings.regionalCorrectionTopics[settings.geographicRegion]) == 0)) ||
501499
// Or from the localized distribution tile topic
502-
((localizedDistributionTileTopic.length() > 0) &&
503-
(strcmp(topic, localizedDistributionTileTopic.c_str()) == 0)))
500+
((localizedDistributionTileTopic.length() > 0) && (strcmp(topic, localizedDistributionTileTopic.c_str()) == 0)))
504501
{
505502
// Determine if MQTT (SPARTN data) is the correction source
506503
if (correctionLastSeen(CORR_IP))
507504
{
508-
if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true)
509-
|| PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)) && !inMainMenu)
505+
if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true) ||
506+
PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)) &&
507+
!inMainMenu)
510508
{
511509
PERIODIC_CLEAR(PD_MQTT_CLIENT_DATA);
512510
systemPrintf("Pushing %d bytes from %s topic to GNSS\r\n", mqttCount, topic);
@@ -522,21 +520,22 @@ int mqttClientProcessZedMessage(uint8_t * mqttData, uint16_t mqttCount, int byte
522520
}
523521
else
524522
{
525-
if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true)
526-
|| PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)) && !inMainMenu)
523+
if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true) ||
524+
PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)) &&
525+
!inMainMenu)
527526
{
528527
PERIODIC_CLEAR(PD_MQTT_CLIENT_DATA);
529-
systemPrintf("NOT pushing %d bytes from %s topic to GNSS due to priority\r\n", mqttCount,
530-
topic);
528+
systemPrintf("NOT pushing %d bytes from %s topic to GNSS due to priority\r\n", mqttCount, topic);
531529
}
532530
}
533531
}
534532
// Always push KEYS and MGA to the ZED
535533
else
536534
{
537535
// KEYS or MGA
538-
if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true)
539-
|| PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)) && !inMainMenu)
536+
if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true) ||
537+
PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)) &&
538+
!inMainMenu)
540539
{
541540
PERIODIC_CLEAR(PD_MQTT_CLIENT_DATA);
542541
systemPrintf("Pushing %d bytes from %s topic to GNSS\r\n", mqttCount, topic);
@@ -552,11 +551,10 @@ int mqttClientProcessZedMessage(uint8_t * mqttData, uint16_t mqttCount, int byte
552551
//----------------------------------------
553552
// Process the subscribed messages
554553
//----------------------------------------
555-
int mqttClientProcessMessage(uint8_t * mqttData, uint16_t mqttCount, int bytesPushed, char * topic)
554+
int mqttClientProcessMessage(uint8_t *mqttData, uint16_t mqttCount, int bytesPushed, char *topic)
556555
{
557556
// Check for localizedDistributionDictTopic
558-
if ((localizedDistributionDictTopic.length() > 0) &&
559-
(strcmp(topic, localizedDistributionDictTopic.c_str()) == 0))
557+
if ((localizedDistributionDictTopic.length() > 0) && (strcmp(topic, localizedDistributionDictTopic.c_str()) == 0))
560558
{
561559
mqttClientProcessLocalizedDistributionDictTopic(mqttData);
562560
mqttClientLastDataReceived = millis();
@@ -583,10 +581,7 @@ int mqttClientProcessMessage(uint8_t * mqttData, uint16_t mqttCount, int bytesPu
583581

584582
// Correction data from PP can go direct to GNSS
585583
if (present.gnss_zedf9p)
586-
bytesPushed = mqttClientProcessZedMessage(mqttData,
587-
mqttCount,
588-
bytesPushed,
589-
topic);
584+
bytesPushed = mqttClientProcessZedMessage(mqttData, mqttCount, bytesPushed, topic);
590585

591586
// For the UM980 or LG290P, we have to pass the data through the PPL first
592587
else if (present.gnss_um980 || present.gnss_lg290p || present.gnss_mosaicX5)
@@ -653,10 +648,7 @@ void mqttClientReceiveMessage(int messageSize)
653648
if (mqttCount > 0)
654649
{
655650
// Process the MQTT message
656-
bytesPushed = mqttClientProcessMessage(mqttData,
657-
mqttCount,
658-
bytesPushed,
659-
topic);
651+
bytesPushed = mqttClientProcessMessage(mqttData, mqttCount, bytesPushed, topic);
660652

661653
// Record the arrival of data over MQTT
662654
mqttClientLastDataReceived = millis();
@@ -797,7 +789,8 @@ void mqttClientStop(bool shutdown)
797789
else
798790
{
799791
mqttClientSetState(MQTT_CLIENT_WAIT_FOR_NETWORK);
800-
mqttClientPrintSubscribedTopics();
792+
if (settings.debugMqttClientState)
793+
mqttClientPrintSubscribedTopics();
801794
}
802795
}
803796

@@ -861,7 +854,9 @@ void mqttClientUpdate()
861854
mqttClientConnectionAttemptTimeout = 0;
862855
networkUserAdd(NETCONSUMER_POINTPERFECT_MQTT_CLIENT, __FILE__, __LINE__);
863856
mqttClientSetState(MQTT_CLIENT_CONNECTION_DELAY);
864-
mqttClientPrintSubscribedTopics();
857+
858+
if (settings.debugMqttClientState)
859+
mqttClientPrintSubscribedTopics();
865860
}
866861
break;
867862
}
@@ -871,7 +866,9 @@ void mqttClientUpdate()
871866
if ((millis() - mqttClientTimer) > mqttClientConnectionAttemptTimeout)
872867
{
873868
mqttClientSetState(MQTT_CLIENT_CONNECTING_2_BROKER);
874-
mqttClientPrintSubscribedTopics();
869+
870+
if (settings.debugMqttClientState)
871+
mqttClientPrintSubscribedTopics();
875872
}
876873
break;
877874
}
@@ -889,9 +886,11 @@ void mqttClientUpdate()
889886

890887
// Allocate the buffers, freed by mqttClientStop
891888
if (!mqttClientCertificateBuffer)
892-
mqttClientCertificateBuffer = (char *)rtkMalloc(MQTT_CERT_SIZE, "Certificate buffer (mqttClientCertificateBuffer)");
889+
mqttClientCertificateBuffer =
890+
(char *)rtkMalloc(MQTT_CERT_SIZE, "Certificate buffer (mqttClientCertificateBuffer)");
893891
if (!mqttClientPrivateKeyBuffer)
894-
mqttClientPrivateKeyBuffer = (char *)rtkMalloc(MQTT_CERT_SIZE, "Certificate buffer (mqttClientPrivateKeyBuffer)");
892+
mqttClientPrivateKeyBuffer =
893+
(char *)rtkMalloc(MQTT_CERT_SIZE, "Certificate buffer (mqttClientPrivateKeyBuffer)");
895894

896895
// Determine if the buffers were allocated
897896
if ((!mqttClientCertificateBuffer) || (!mqttClientPrivateKeyBuffer))
@@ -995,7 +994,9 @@ void mqttClientUpdate()
995994
online.mqttClient = true;
996995

997996
mqttClientSetState(MQTT_CLIENT_SERVICES_CONNECTED);
998-
mqttClientPrintSubscribedTopics();
997+
998+
if (settings.debugMqttClientState)
999+
mqttClientPrintSubscribedTopics();
9991000
break;
10001001
} // /case MQTT_CLIENT_CONNECTING_2_BROKER
10011002

@@ -1157,10 +1158,9 @@ void mqttClientUpdate()
11571158
// Periodically display the MQTT client state
11581159
if (PERIODIC_DISPLAY(PD_MQTT_CLIENT_STATE))
11591160
{
1160-
const char * line = "";
1161+
const char *line = "";
11611162
mqttClientEnabled(&line);
1162-
systemPrintf("MQTT Client state: %s%s\r\n",
1163-
mqttClientStateName[mqttClientState], line);
1163+
systemPrintf("MQTT Client state: %s%s\r\n", mqttClientStateName[mqttClientState], line);
11641164
mqttClientPrintSubscribedTopics();
11651165
PERIODIC_CLEAR(PD_MQTT_CLIENT_STATE);
11661166
}

0 commit comments

Comments
 (0)