From 8fba63a53f461730380046b3c66253dbc4822df0 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Fri, 20 Sep 2019 20:00:31 +0200 Subject: [PATCH] display fine tuning --- src/display.cpp | 7 ++++--- src/lorawan.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/display.cpp b/src/display.cpp index d4786d19..4826b2a2 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -10,15 +10,16 @@ Display-Mask (128 x 64 pixel): 0|PAX:aabbccddee 1|PAX:aabbccddee 2|B:a.bcV Sats:ab -3|BLTH:abcde SF:ab +3|BLTH:abcde SFab 4|WIFI:abcde ch:ab 5|RLIM:abcd abcdKB 6|20:27:00* 27.Feb 7|yyyyyyyyyyyyyyab -line 6: * = time source indicator: L|G|R|?, +line 6: * = char {L|G|R|?} indicates time source, inverse = clock controller is active, pulsed = pps input signal is active + line 7: y = LMIC event message; ab = payload queue length */ @@ -206,7 +207,7 @@ void draw_page(time_t t, uint8_t page) { u8x8.setCursor(11, 3); if (!cfg.adrmode) // if ADR=off then display SF value inverse u8x8.setInverseFont(1); - u8x8.printf("%5s", getSfName(updr2rps(LMIC.datarate))); + u8x8.printf("%4s", getSfName(updr2rps(LMIC.datarate))); if (!cfg.adrmode) // switch off inverse if it was turned on u8x8.setInverseFont(0); #endif // HAS_LORA diff --git a/src/lorawan.cpp b/src/lorawan.cpp index 573e8aa5..d541dec3 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -646,12 +646,12 @@ uint8_t getBattLevel() { const char *getSfName(rps_t rps) { const char *const t[] = {"FSK", "SF7", "SF8", "SF9", - "SF10", "SF11", "SF12", "SFrfu"}; + "SF10", "SF11", "SF12", "SF?"}; return t[getSf(rps)]; } const char *getBwName(rps_t rps) { - const char *const t[] = {"BW125", "BW250", "BW500", "BWrfu"}; + const char *const t[] = {"BW125", "BW250", "BW500", "BW?"}; return t[getBw(rps)]; }