From cc248419aeac1758400478942e25223566bd8f91 Mon Sep 17 00:00:00 2001
From: Verkehrsrot <cyberman@obh.snafu.de>
Date: Fri, 20 Sep 2019 09:51:33 +0200
Subject: [PATCH] optimize SF display

---
 include/lorawan.h |  1 +
 src/display.cpp   | 17 +----------------
 src/lorawan.cpp   |  8 +++++++-
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/include/lorawan.h b/include/lorawan.h
index 5c5c67cb..1bf0898e 100644
--- a/include/lorawan.h
+++ b/include/lorawan.h
@@ -50,6 +50,7 @@ void myTxCallback(void *pUserData, int fSuccess);
 void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, const mac_t table[],
                 const uint8_t tablesize);
 uint8_t getBattLevel(void);
+const char *getSfName(rps_t rps);
 
 #if (TIME_SYNC_LORAWAN)
 void user_request_network_time_callback(void *pVoidUserUTCTime,
diff --git a/src/display.cpp b/src/display.cpp
index e6d17301..2f6dc132 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -30,19 +30,6 @@ line 7: y = Text for LMIC status; ab = payload queue
 
 HAS_DISPLAY u8x8(MY_OLED_RST, MY_OLED_SCL, MY_OLED_SDA);
 
-// helper string for converting LoRa spread factor values
-#if defined(CFG_eu868)
-const char lora_datarate[] = {"1211100908077BFSNA"};
-#elif defined(CFG_us915)
-const char lora_datarate[] = {"100908078CNA121110090807"};
-#elif defined(CFG_as923)
-const char lora_datarate[] = {"1211100908077BFSNA"};
-#elif defined(CFG_au921)
-const char lora_datarate[] = {"1211100908078CNA1211109C8C7C"};
-#elif defined(CFG_in866)
-const char lora_datarate[] = {"121110090807FSNA"};
-#endif
-
 // helper arry for converting month values to text
 const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
                             "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
@@ -216,11 +203,9 @@ void draw_page(time_t t, uint8_t page) {
 
 #if (HAS_LORA)
     u8x8.setCursor(11, 3);
-    u8x8.printf("SF:");
     if (cfg.adrmode) // if ADR=on then display SF value inverse
       u8x8.setInverseFont(1);
-    u8x8.printf("%c%c", lora_datarate[LMIC.datarate * 2],
-                lora_datarate[LMIC.datarate * 2 + 1]);
+    u8x8.printf("%5s", getSfName(LMIC.rps));
     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 bd5284f8..50dab818 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -690,6 +690,12 @@ uint8_t getBattLevel() {
 #endif
 } // getBattLevel()
 
-//u1_t os_getBattLevel(void) { return getBattLevel(); };
+// u1_t os_getBattLevel(void) { return getBattLevel(); };
+
+const char *getSfName(rps_t rps) {
+  const char *const t[] = {"FSK",  "SF7",  "SF8",  "SF9",
+                           "SF10", "SF11", "SF12", "SFrfu"};
+  return t[getSf(rps)];
+}
 
 #endif // HAS_LORA
\ No newline at end of file