Skip to content

Commit 0196142

Browse files
nseidlenseidle
authored
Merge pull request #255 from LeeLeahy2/battery-status
Enable/disable printing of battery status messages
2 parents b7f129f + ee35cfb commit 0196142

File tree

4 files changed

+135
-34
lines changed

4 files changed

+135
-34
lines changed

‎Firmware/RTK_Surveyor/NVM.ino‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,18 @@ void recordSystemSettingsToFile(File * settingsFile)
238238
settingsFile->printf("%s=%d\n\r", "enablePrintWifiState", settings.enablePrintWifiState);
239239
settingsFile->printf("%s=%d\n\r", "enablePrintNtripClientState", settings.enablePrintNtripClientState);
240240
settingsFile->printf("%s=%d\n\r", "enablePrintNtripServerState", settings.enablePrintNtripServerState);
241-
settingsFile->printf("%s=%d\n\r", "enablePrintNtripServerRtcm", settings.enablePrintNtripServerRtcm);
242241
settingsFile->printf("%s=%d\n\r", "enablePrintPosition", settings.enablePrintPosition);
243242
settingsFile->printf("%s=%d\n\r", "enableMarksFile", settings.enableMarksFile);
243+
settingsFile->printf("%s=%d\n\r", "enablePrintBatteryMessages", settings.enablePrintBatteryMessages);
244+
settingsFile->printf("%s=%d\n\r", "enablePrintRoverAccuracy", settings.enablePrintRoverAccuracy);
245+
settingsFile->printf("%s=%d\n\r", "enablePrintBadMessages", settings.enablePrintBadMessages);
246+
settingsFile->printf("%s=%d\n\r", "enablePrintLogFileMessages", settings.enablePrintLogFileMessages);
247+
settingsFile->printf("%s=%d\n\r", "enablePrintLogFileStatus", settings.enablePrintLogFileStatus);
248+
settingsFile->printf("%s=%d\n\r", "enablePrintRingBufferOffsets", settings.enablePrintRingBufferOffsets);
249+
settingsFile->printf("%s=%d\n\r", "enablePrintNtripServerRtcm", settings.enablePrintNtripServerRtcm);
250+
settingsFile->printf("%s=%d\n\r", "enablePrintNtripClientRtcm", settings.enablePrintNtripClientRtcm);
251+
settingsFile->printf("%s=%d\n\r", "enablePrintStates", settings.enablePrintStates);
252+
settingsFile->printf("%s=%d\n\r", "enablePrintDuplicateStates", settings.enablePrintDuplicateStates);
244253

245254
//Record constellation settings
246255
for (int x = 0 ; x < MAX_CONSTELLATIONS ; x++)
@@ -809,11 +818,28 @@ bool parseLine(char* str, Settings *settings)
809818
settings->enablePrintNtripClientState = d;
810819
else if (strcmp(settingName, "enablePrintNtripServerState") == 0)
811820
settings->enablePrintNtripServerState = d;
812-
else if (strcmp(settingName, "enablePrintNtripServerRtcm") == 0)
813-
settings->enablePrintNtripServerRtcm = d;
814821
else if (strcmp(settingName, "enablePrintPosition") == 0)
815822
settings->enablePrintPosition = d;
816-
823+
else if (strcmp(settingName, "enablePrintBatteryMessages") == 0)
824+
settings->enablePrintBatteryMessages = d;
825+
else if (strcmp(settingName, "enablePrintRoverAccuracy") == 0)
826+
settings->enablePrintRoverAccuracy = d;
827+
else if (strcmp(settingName, "enablePrintBadMessages") == 0)
828+
settings->enablePrintBadMessages = d;
829+
else if (strcmp(settingName, "enablePrintLogFileMessages") == 0)
830+
settings->enablePrintLogFileMessages = d;
831+
else if (strcmp(settingName, "enablePrintLogFileStatus") == 0)
832+
settings->enablePrintLogFileStatus = d;
833+
else if (strcmp(settingName, "enablePrintRingBufferOffsets") == 0)
834+
settings->enablePrintRingBufferOffsets = d;
835+
else if (strcmp(settingName, "enablePrintNtripServerRtcm") == 0)
836+
settings->enablePrintNtripServerRtcm = d;
837+
else if (strcmp(settingName, "enablePrintNtripClientRtcm") == 0)
838+
settings->enablePrintNtripClientRtcm = d;
839+
else if (strcmp(settingName, "enablePrintStates") == 0)
840+
settings->enablePrintStates = d;
841+
else if (strcmp(settingName, "enablePrintDuplicateStates") == 0)
842+
settings->enablePrintDuplicateStates = d;
817843
//Check for bulk settings (constellations and message rates)
818844
//Must be last on else list
819845
else

‎Firmware/RTK_Surveyor/System.ino‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -356,25 +356,28 @@ void checkBatteryLevels()
356356
battChangeRate = 0;
357357
}
358358

359-
Serial.printf("Batt (%d%%): Voltage: %0.02fV", battLevel, battVoltage);
359+
if (settings.enablePrintBatteryMessages)
360+
{
361+
Serial.printf("Batt (%d%%): Voltage: %0.02fV", battLevel, battVoltage);
360362

361-
char tempStr[25];
362-
if (battChangeRate > 0)
363-
sprintf(tempStr, "C");
364-
else
365-
sprintf(tempStr, "Disc");
366-
Serial.printf(" %sharging: %0.02f%%/hr ", tempStr, battChangeRate);
367-
368-
if (battLevel < 10)
369-
sprintf(tempStr, "Red");
370-
else if (battLevel < 50)
371-
sprintf(tempStr, "Yellow");
372-
else if (battLevel >= 50)
373-
sprintf(tempStr, "Green");
374-
else
375-
sprintf(tempStr, "No batt");
363+
char tempStr[25];
364+
if (battChangeRate > 0)
365+
sprintf(tempStr, "C");
366+
else
367+
sprintf(tempStr, "Disc");
368+
Serial.printf(" %sharging: %0.02f%%/hr ", tempStr, battChangeRate);
369+
370+
if (battLevel < 10)
371+
sprintf(tempStr, "Red");
372+
else if (battLevel < 50)
373+
sprintf(tempStr, "Yellow");
374+
else if (battLevel >= 50)
375+
sprintf(tempStr, "Green");
376+
else
377+
sprintf(tempStr, "No batt");
376378

377-
Serial.printf("%s\n\r", tempStr);
379+
Serial.printf("%s\n\r", tempStr);
380+
}
378381

379382
if (productVariant == RTK_SURVEYOR)
380383
{

‎Firmware/RTK_Surveyor/menuSystem.ino‎

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -328,16 +328,43 @@ void menuDebug()
328328
Serial.print("14) Periodically print NTRIP server state: ");
329329
Serial.printf("%s\r\n", settings.enablePrintNtripServerState ? "Enabled" : "Disabled");
330330

331-
Serial.print("15) Print GNSS --> NTRIP caster messages: ");
332-
Serial.printf("%s\r\n", settings.enablePrintNtripServerRtcm ? "Enabled" : "Disabled");
333-
334-
Serial.print("16) Periodically print position: ");
331+
Serial.print("15) Periodically print position: ");
335332
Serial.printf("%s\r\n", settings.enablePrintPosition ? "Enabled" : "Disabled");
336333

337-
Serial.print("17) Periodically print CPU idle time: ");
334+
Serial.print("16) Periodically print CPU idle time: ");
338335
Serial.printf("%s\r\n", settings.enablePrintIdleTime ? "Enabled" : "Disabled");
339336

340-
Serial.println("18) Mirror ZED-F9x's UART1 settings to USB");
337+
Serial.println("17) Mirror ZED-F9x's UART1 settings to USB");
338+
339+
Serial.print("18) Print battery status messages: ");
340+
Serial.printf("%s\r\n", settings.enablePrintBatteryMessages ? "Enabled" : "Disabled");
341+
342+
Serial.print("19) Print Rover accuracy messages: ");
343+
Serial.printf("%s\r\n", settings.enablePrintRoverAccuracy ? "Enabled" : "Disabled");
344+
345+
Serial.print("20) Print messages with bad checksums or CRCs: ");
346+
Serial.printf("%s\r\n", settings.enablePrintBadMessages ? "Enabled" : "Disabled");
347+
348+
Serial.print("21) Print log file messages: ");
349+
Serial.printf("%s\r\n", settings.enablePrintLogFileMessages ? "Enabled" : "Disabled");
350+
351+
Serial.print("22) Print log file status: ");
352+
Serial.printf("%s\r\n", settings.enablePrintLogFileStatus ? "Enabled" : "Disabled");
353+
354+
Serial.print("23) Print ring buffer offsets: ");
355+
Serial.printf("%s\r\n", settings.enablePrintRingBufferOffsets ? "Enabled" : "Disabled");
356+
357+
Serial.print("24) Print GNSS --> NTRIP caster messages: ");
358+
Serial.printf("%s\r\n", settings.enablePrintNtripServerRtcm ? "Enabled" : "Disabled");
359+
360+
Serial.print("25) Print NTRIP caster --> GNSS messages: ");
361+
Serial.printf("%s\r\n", settings.enablePrintNtripClientRtcm ? "Enabled" : "Disabled");
362+
363+
Serial.print("26) Print states: ");
364+
Serial.printf("%s\r\n", settings.enablePrintStates ? "Enabled" : "Disabled");
365+
366+
Serial.print("27) Print duplicate states: ");
367+
Serial.printf("%s\r\n", settings.enablePrintDuplicateStates ? "Enabled" : "Disabled");
341368

342369
Serial.println("t) Enter Test Screen");
343370

@@ -460,18 +487,14 @@ void menuDebug()
460487
settings.enablePrintNtripServerState ^= 1;
461488
}
462489
else if (incoming == 15)
463-
{
464-
settings.enablePrintNtripServerRtcm ^= 1;
465-
}
466-
else if (incoming == 16)
467490
{
468491
settings.enablePrintPosition ^= 1;
469492
}
470-
else if (incoming == 17)
493+
else if (incoming == 16)
471494
{
472495
settings.enablePrintIdleTime ^= 1;
473496
}
474-
else if (incoming == 18)
497+
else if (incoming == 17)
475498
{
476499
bool response = configureGNSSMessageRates(COM_PORT_USB, settings.ubxMessages); //Make sure the appropriate messages are enabled
477500
response &= i2cGNSS.setPortOutput(COM_PORT_USB, COM_TYPE_NMEA | COM_TYPE_UBX | COM_TYPE_RTCM3); //Duplicate UART1
@@ -481,6 +504,46 @@ void menuDebug()
481504
else
482505
Serial.println(F("USB messages successfully enabled"));
483506
}
507+
else if (incoming == 18)
508+
{
509+
settings.enablePrintBatteryMessages ^= 1;
510+
}
511+
else if (incoming == 19)
512+
{
513+
settings.enablePrintRoverAccuracy ^= 1;
514+
}
515+
else if (incoming == 20)
516+
{
517+
settings.enablePrintBadMessages ^= 1;
518+
}
519+
else if (incoming == 21)
520+
{
521+
settings.enablePrintLogFileMessages ^= 1;
522+
}
523+
else if (incoming == 22)
524+
{
525+
settings.enablePrintLogFileStatus ^= 1;
526+
}
527+
else if (incoming == 23)
528+
{
529+
settings.enablePrintRingBufferOffsets ^= 1;
530+
}
531+
else if (incoming == 24)
532+
{
533+
settings.enablePrintNtripServerRtcm ^= 1;
534+
}
535+
else if (incoming == 25)
536+
{
537+
settings.enablePrintNtripClientRtcm ^= 1;
538+
}
539+
else if (incoming == 26)
540+
{
541+
settings.enablePrintStates ^= 1;
542+
}
543+
else if (incoming == 27)
544+
{
545+
settings.enablePrintDuplicateStates ^= 1;
546+
}
484547
else
485548
printUnknown(incoming);
486549
}

‎Firmware/RTK_Surveyor/settings.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,18 @@ typedef struct {
429429
bool enablePrintWifiState = false;
430430
bool enablePrintNtripClientState = false;
431431
bool enablePrintNtripServerState = false;
432-
bool enablePrintNtripServerRtcm = false;
433432
bool enablePrintPosition = false;
434433
bool enablePrintIdleTime = false;
434+
bool enablePrintBatteryMessages = true;
435+
bool enablePrintRoverAccuracy = true;
436+
bool enablePrintBadMessages = false;
437+
bool enablePrintLogFileMessages = false;
438+
bool enablePrintLogFileStatus = true;
439+
bool enablePrintRingBufferOffsets = false;
440+
bool enablePrintNtripServerRtcm = false;
441+
bool enablePrintNtripClientRtcm = false;
442+
bool enablePrintStates = true;
443+
bool enablePrintDuplicateStates = false;
435444
} Settings;
436445
Settings settings;
437446

0 commit comments

Comments
 (0)