Skip to content

Commit 2241906

Browse files
PaulZCPaulZC
committed
Add missing inMainMenu checks on periodic prints
1 parent abf486b commit 2241906

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎Firmware/RTK_Everywhere/HTTP_Client.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ void httpClientUpdate()
693693
}
694694

695695
// Periodically display the HTTP client state
696-
if (PERIODIC_DISPLAY(PD_HTTP_CLIENT_STATE))
696+
if (PERIODIC_DISPLAY(PD_HTTP_CLIENT_STATE) && !inMainMenu)
697697
{
698698
const char *line = "";
699699
httpClientEnabled(&line);

‎Firmware/RTK_Everywhere/MQTT_Client.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ void mqttClientUpdate()
11691169
}
11701170

11711171
// Periodically display the MQTT client state
1172-
if (PERIODIC_DISPLAY(PD_MQTT_CLIENT_STATE))
1172+
if (PERIODIC_DISPLAY(PD_MQTT_CLIENT_STATE) && !inMainMenu)
11731173
{
11741174
const char *line = "";
11751175
mqttClientEnabled(&line);

‎Firmware/RTK_Everywhere/NTP.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ void ntpServerUpdate()
963963
}
964964

965965
// Periodically display the NTP server state
966-
if (PERIODIC_DISPLAY(PD_NTP_SERVER_STATE))
966+
if (PERIODIC_DISPLAY(PD_NTP_SERVER_STATE) && !inMainMenu)
967967
{
968968
const char * line = "";
969969
if (NEQ_RTK_MODE(ntpServerMode))

‎Firmware/RTK_Everywhere/NtripClient.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ void ntripClientUpdate()
955955
}
956956

957957
// Periodically display the NTRIP client state
958-
if (PERIODIC_DISPLAY(PD_NTRIP_CLIENT_STATE))
958+
if (PERIODIC_DISPLAY(PD_NTRIP_CLIENT_STATE) && !inMainMenu)
959959
{
960960
systemPrintf("NTRIP Client state: %s%s\r\n", ntripClientStateName[ntripClientState], line);
961961
PERIODIC_CLEAR(PD_NTRIP_CLIENT_STATE);

‎Firmware/RTK_Everywhere/NtripServer.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ void ntripServerUpdate(int serverIndex)
845845
}
846846

847847
// Periodically display the state
848-
if (PERIODIC_DISPLAY(PD_NTRIP_SERVER_STATE))
848+
if (PERIODIC_DISPLAY(PD_NTRIP_SERVER_STATE) && !inMainMenu)
849849
{
850850
systemPrintf("NTRIP Server %d state: %s%s\r\n", serverIndex,
851851
ntripServerStateName[ntripServer->state], line);

‎Firmware/RTK_Everywhere/PointPerfectLibrary.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void updatePplTask(void *e)
1313
while (task.updatePplTaskStopRequest == false)
1414
{
1515
// Display an alive message
16-
if (PERIODIC_DISPLAY(PD_TASK_UPDATE_PPL))
16+
if (PERIODIC_DISPLAY(PD_TASK_UPDATE_PPL) && !inMainMenu)
1717
{
1818
PERIODIC_CLEAR(PD_TASK_UPDATE_PPL);
1919
systemPrintln("UpdatePplTask running");

‎Firmware/RTK_Everywhere/Tasks.ino‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void btReadTask(void *e)
166166
while (task.btReadTaskStopRequest == false)
167167
{
168168
// Display an alive message
169-
if (PERIODIC_DISPLAY(PD_TASK_BLUETOOTH_READ))
169+
if (PERIODIC_DISPLAY(PD_TASK_BLUETOOTH_READ) && !inMainMenu)
170170
{
171171
PERIODIC_CLEAR(PD_TASK_BLUETOOTH_READ);
172172
systemPrintln("btReadTask running");
@@ -236,7 +236,7 @@ void btReadTask(void *e)
236236

237237
} // End btPrintEcho == false && bluetoothRxDataAvailable()
238238

239-
if (PERIODIC_DISPLAY(PD_BLUETOOTH_DATA_RX))
239+
if (PERIODIC_DISPLAY(PD_BLUETOOTH_DATA_RX) && !inMainMenu)
240240
{
241241
PERIODIC_CLEAR(PD_BLUETOOTH_DATA_RX);
242242
systemPrintf("Bluetooth received %d bytes\r\n", rxBytes);
@@ -415,7 +415,7 @@ void gnssReadTask(void *e)
415415
while (task.gnssReadTaskStopRequest == false)
416416
{
417417
// Display an alive message
418-
if (PERIODIC_DISPLAY(PD_TASK_GNSS_READ))
418+
if (PERIODIC_DISPLAY(PD_TASK_GNSS_READ) && !inMainMenu)
419419
{
420420
PERIODIC_CLEAR(PD_TASK_GNSS_READ);
421421
systemPrintln("gnssReadTask running");
@@ -426,7 +426,7 @@ void gnssReadTask(void *e)
426426

427427
// Display the RX byte count
428428
static uint32_t totalRxByteCount = 0;
429-
if (PERIODIC_DISPLAY(PD_GNSS_DATA_RX_BYTE_COUNT))
429+
if (PERIODIC_DISPLAY(PD_GNSS_DATA_RX_BYTE_COUNT) && !inMainMenu)
430430
{
431431
PERIODIC_CLEAR(PD_GNSS_DATA_RX_BYTE_COUNT);
432432
systemPrintf("gnssReadTask total byte count: %d\r\n", totalRxByteCount);
@@ -1345,7 +1345,7 @@ void handleGnssDataTask(void *e)
13451345
while (task.handleGnssDataTaskStopRequest == false)
13461346
{
13471347
// Display an alive message
1348-
if (PERIODIC_DISPLAY(PD_TASK_HANDLE_GNSS_DATA))
1348+
if (PERIODIC_DISPLAY(PD_TASK_HANDLE_GNSS_DATA) && !inMainMenu)
13491349
{
13501350
PERIODIC_CLEAR(PD_TASK_HANDLE_GNSS_DATA);
13511351
systemPrintln("handleGnssDataTask running");
@@ -1414,7 +1414,7 @@ void handleGnssDataTask(void *e)
14141414
maxMillis[RBC_BLUETOOTH] = deltaMillis;
14151415

14161416
// Display the data movement
1417-
if (PERIODIC_DISPLAY(PD_BLUETOOTH_DATA_TX))
1417+
if (PERIODIC_DISPLAY(PD_BLUETOOTH_DATA_TX) && !inMainMenu)
14181418
{
14191419
PERIODIC_CLEAR(PD_BLUETOOTH_DATA_TX);
14201420
systemPrintf("Bluetooth: %d bytes written\r\n", bytesToSend);
@@ -1760,7 +1760,7 @@ void handleGnssDataTask(void *e)
17601760
// Display the millisecond values for the different ring buffer consumers
17611761
//----------------------------------------------------------------------
17621762

1763-
if (PERIODIC_DISPLAY(PD_RING_BUFFER_MILLIS))
1763+
if (PERIODIC_DISPLAY(PD_RING_BUFFER_MILLIS) && !inMainMenu)
17641764
{
17651765
int milliseconds;
17661766
int seconds;
@@ -1991,7 +1991,7 @@ void buttonCheckTask(void *e)
19911991
while (task.buttonCheckTaskStopRequest == false)
19921992
{
19931993
// Display an alive message
1994-
if (PERIODIC_DISPLAY(PD_TASK_BUTTON_CHECK))
1994+
if (PERIODIC_DISPLAY(PD_TASK_BUTTON_CHECK) && !inMainMenu)
19951995
{
19961996
PERIODIC_CLEAR(PD_TASK_BUTTON_CHECK);
19971997
systemPrintln("ButtonCheckTask running");
@@ -2486,7 +2486,7 @@ void sdSizeCheckTask(void *e)
24862486
while (task.sdSizeCheckTaskStopRequest == false)
24872487
{
24882488
// Display an alive message
2489-
if (PERIODIC_DISPLAY(PD_TASK_SD_SIZE_CHECK))
2489+
if (PERIODIC_DISPLAY(PD_TASK_SD_SIZE_CHECK) && !inMainMenu)
24902490
{
24912491
PERIODIC_CLEAR(PD_TASK_SD_SIZE_CHECK);
24922492
systemPrintln("sdSizeCheckTask running");
@@ -2567,7 +2567,7 @@ void bluetoothCommandTask(void *pvParameters)
25672567
while (task.bluetoothCommandTaskStopRequest == false)
25682568
{
25692569
// Display an alive message
2570-
if (PERIODIC_DISPLAY(PD_TASK_BLUETOOTH_READ))
2570+
if (PERIODIC_DISPLAY(PD_TASK_BLUETOOTH_READ) && !inMainMenu)
25712571
{
25722572
PERIODIC_CLEAR(PD_TASK_BLUETOOTH_READ);
25732573
systemPrintln("bluetoothCommandTask running");
@@ -2590,7 +2590,7 @@ void bluetoothCommandTask(void *pvParameters)
25902590
}
25912591
}
25922592

2593-
if (PERIODIC_DISPLAY(PD_BLUETOOTH_DATA_RX))
2593+
if (PERIODIC_DISPLAY(PD_BLUETOOTH_DATA_RX) && !inMainMenu)
25942594
{
25952595
PERIODIC_CLEAR(PD_BLUETOOTH_DATA_RX);
25962596
systemPrintf("Bluetooth received %d bytes\r\n", rxSpot);

‎Firmware/RTK_Everywhere/TcpClient.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ void tcpClientUpdate()
571571
}
572572

573573
// Periodically display the TCP client state
574-
if (PERIODIC_DISPLAY(PD_TCP_CLIENT_STATE))
574+
if (PERIODIC_DISPLAY(PD_TCP_CLIENT_STATE) && !inMainMenu)
575575
{
576576
systemPrintf("TCP Client state: %s%s\r\n",
577577
tcpClientStateName[tcpClientState], line);

‎Firmware/RTK_Everywhere/WiFi.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ void wifiStationUpdate()
11981198
}
11991199

12001200
// Periodically display the WiFi state
1201-
if (PERIODIC_DISPLAY(PD_WIFI_STATE))
1201+
if (PERIODIC_DISPLAY(PD_WIFI_STATE) && !inMainMenu)
12021202
{
12031203
systemPrintf("WiFi station state: %s%s\r\n", wifiStationStateName[wifiStationState], reason);
12041204
PERIODIC_CLEAR(PD_WIFI_STATE);

‎Firmware/RTK_Everywhere/menuPP.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,7 @@ void provisioningUpdate()
16261626
}
16271627

16281628
// Periodically display the provisioning state
1629-
if (PERIODIC_DISPLAY(PD_PROVISIONING_STATE))
1629+
if (PERIODIC_DISPLAY(PD_PROVISIONING_STATE) && !inMainMenu)
16301630
{
16311631
systemPrintf("Provisioning state: %s%s\r\n", provisioningStateName[provisioningState], line);
16321632
PERIODIC_CLEAR(PD_PROVISIONING_STATE);

0 commit comments

Comments
 (0)