From 63660ae4fe8eb5d3fee5cf78e6df844c33466d74 Mon Sep 17 00:00:00 2001 From: Thomas Osterried Date: Sun, 10 Oct 2021 23:31:23 +0200 Subject: [PATCH] Modification for code readers. if ? ... : ... syntax is efficient and nerdy, but not everyone likes it, and I admit, it's better readable ;) --- src/LoRa_APRS_Tracker.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index 0e4e91f..a42a9c6 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -394,10 +394,19 @@ char *s_min_nn(uint32_t min_nnnnn, int high_precision) static char buf[6]; min_nnnnn = min_nnnnn * 0.006; - if ( ((min_nnnnn / (high_precision ? 1 : 100)) % 10) >= 5 && min_nnnnn < (6000000 - ((high_precision ? 1 : 100)*5)) ) { - // round up. Avoid overflow (59.999999 should never become 60.0 or more) - min_nnnnn = min_nnnnn + (high_precision ? 1 : 100)*5; + + if (high_precision) { + if ((min_nnnnn % 10) >= 5 && min_nnnnn < 6000000 - 5) { + // round up. Avoid overflow (59.999999 should never become 60.0 or more) + min_nnnnn = min_nnnnn + 5; + } + } else { + if ((min_nnnnn % 1000) >= 500 && min_nnnnn < (6000000 - 500)) { + // round up. Avoid overflow (59.9999 should never become 60.0 or more) + min_nnnnn = min_nnnnn + 500; + } } + if (high_precision < 2) sprintf(buf, "%02u.%02u", (unsigned int ) ((min_nnnnn / 100000) % 100), (unsigned int ) ((min_nnnnn / 1000) % 100)); else