From 93d606fe0b60be88fac8e5e1e7cdfdbf08ba1991 Mon Sep 17 00:00:00 2001 From: dahuafschmied <3955019+dahuafschmied@users.noreply.github.com> Date: Thu, 30 Jun 2022 23:34:22 +0200 Subject: [PATCH 1/2] colon as time separator, more space between date and time for better readability --- src/LoRa_APRS_Tracker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index 74bade2..e725a7b 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -314,8 +314,8 @@ void loop() { } if (gps_time_update) { - - show_display(BeaconMan.getCurrentBeaconConfig()->callsign, createDateString(now()) + " " + createTimeString(now()), String("Sats: ") + gps.satellites.value() + " HDOP: " + gps.hdop.hdop(), String("Nxt Bcn: ") + (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active ? "~" : "") + createTimeString(nextBeaconTimeStamp), BatteryIsConnected ? (String("Bat: ") + batteryVoltage + "V, " + batteryChargeCurrent + "mA") : "Powered via USB", String("Smart Beacon: " + getSmartBeaconState())); + + show_display(BeaconMan.getCurrentBeaconConfig()->callsign, createDateString(now()) + " " + createTimeString(now()), String("Sats: ") + gps.satellites.value() + " HDOP: " + gps.hdop.hdop(), String("Next Bcn: ") + (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active ? "~" : "") + createTimeString(nextBeaconTimeStamp), BatteryIsConnected ? (String("Bat: ") + batteryVoltage + "V, " + batteryChargeCurrent + "mA") : "Powered via USB", String("Smart Beacon: " + getSmartBeaconState())); if (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) { // Change the Tx internal based on the current speed @@ -492,7 +492,7 @@ String createDateString(time_t t) { } String createTimeString(time_t t) { - return String(padding(hour(t), 2) + "." + padding(minute(t), 2) + "." + padding(second(t), 2)); + return String(padding(hour(t), 2) + ":" + padding(minute(t), 2) + ":" + padding(second(t), 2)); } String getSmartBeaconState() { From 906b3d7c5c9e097e64ea1c2bd278f51ae0d68e60 Mon Sep 17 00:00:00 2001 From: dahuafschmied <3955019+dahuafschmied@users.noreply.github.com> Date: Sun, 3 Jul 2022 15:22:14 +0200 Subject: [PATCH 2/2] Update LoRa_APRS_Tracker.cpp --- src/LoRa_APRS_Tracker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index e725a7b..0f9b093 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -314,7 +314,7 @@ void loop() { } if (gps_time_update) { - + show_display(BeaconMan.getCurrentBeaconConfig()->callsign, createDateString(now()) + " " + createTimeString(now()), String("Sats: ") + gps.satellites.value() + " HDOP: " + gps.hdop.hdop(), String("Next Bcn: ") + (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active ? "~" : "") + createTimeString(nextBeaconTimeStamp), BatteryIsConnected ? (String("Bat: ") + batteryVoltage + "V, " + batteryChargeCurrent + "mA") : "Powered via USB", String("Smart Beacon: " + getSmartBeaconState())); if (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) {