Merge pull request #385 from LeeLeahy2/mqtt-periodic

nseidle · web-flow · commit 7aa783691c04 · 2024-06-25T16:21:29.000-06:00
Periodic display of MQTT client data
diff --git a/Firmware/RTK_Everywhere/System.ino b/Firmware/RTK_Everywhere/System.ino
@@ -356,9 +356,11 @@ void printReports()
         lastPrintPosition = millis();
     }
 
-    if (settings.enablePrintRoverAccuracy && (millis() - lastPrintRoverAccuracy > 2000))
+    if ((settings.enablePrintRoverAccuracy && (millis() - lastPrintRoverAccuracy > 2000))
+        || (PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)))
     {
         lastPrintRoverAccuracy = millis();
+        PERIODIC_CLEAR(PD_MQTT_CLIENT_DATA);
 
         if (online.gnss == true)
         {
@@ -840,4 +842,4 @@ void trim(char *str)
         ++p, --l;
 
     memmove(str, p, l + 1);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -356,9 +356,11 @@ void printReports()`
`356`	`356`	`lastPrintPosition = millis();`
`357`	`357`	`}`
`358`	`358`
`359`		`- if (settings.enablePrintRoverAccuracy && (millis() - lastPrintRoverAccuracy > 2000))`
	`359`	`+ if ((settings.enablePrintRoverAccuracy && (millis() - lastPrintRoverAccuracy > 2000))`
	`360`	`+ \|\| (PERIODIC_DISPLAY(PD_MQTT_CLIENT_DATA)))`
`360`	`361`	`{`
`361`	`362`	`lastPrintRoverAccuracy = millis();`
	`363`	`+ PERIODIC_CLEAR(PD_MQTT_CLIENT_DATA);`
`362`	`364`
`363`	`365`	`if (online.gnss == true)`
`364`	`366`	`{`
`@@ -840,4 +842,4 @@ void trim(char *str)`
`840`	`842`	`++p, --l;`
`841`	`843`
`842`	`844`	`memmove(str, p, l + 1);`
`843`		`-}`
	`845`	`+}`