From 52142c9d05e05b8662c1f7bd4fc13264101f5cfe Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 16 Apr 2018 00:05:11 +0200
Subject: [PATCH] centralize display writes (part 4)

---
 src/configmanager.cpp |  4 ++--
 src/main.cpp          | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 650c3d93..49341163 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -287,8 +287,8 @@ void loadConfig() {
     nvs_close(my_handle);
     ESP_LOGI(TAG, "Done");
 
-    // put actions to be triggered on loaded config here
-    u8x8.setPowerSave(!cfg.screenon); // set display on/off
+    // put actions to be triggered after config loaded here
+    
     #ifdef HAS_ANTENNA_SWITCH // set antenna type, if device has one
       antenna_select(cfg.wifiant);
     #endif
diff --git a/src/main.cpp b/src/main.cpp
index 786e7264..ddaa23f6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -292,7 +292,7 @@ void sniffer_loop(void * pvParameters) {
                 salt_reset(); // get new salt for salting hashes
             }      
 
-            // wait until payload is sent, while wifi scanning and mac counting task continues
+            // check if payload is sent
             lorawait = 0;
             while(LMIC.opmode & OP_TXRXPEND) {
                 if(!lorawait) 
@@ -306,8 +306,7 @@ void sniffer_loop(void * pvParameters) {
                 vTaskDelay(1000/portTICK_PERIOD_MS);
                 yield();
             }
-
-            u8x8.clearLine(6);
+            sprintf(display_lora, " "); // clear LoRa wait message fromd display
 
             // TBD: need to check if long 2000ms pause causes stack problems while scanning continues
             if (cfg.screenon && cfg.screensaver) {
@@ -524,7 +523,10 @@ void loop() {
     
     #ifdef HAS_DISPLAY
 
-        // display counters (lines 0-4)
+        // set display on/off according to current device configuration
+        u8x8.setPowerSave(!cfg.screenon);
+
+        // write counters (lines 0-4)
         char buff[16];
         snprintf(buff, sizeof(buff), "PAX:%-4d", (int) macs.size()); // convert 16-bit MAC counter to decimal counter value
         u8x8.draw2x2String(0, 0, buff);          // display number on unique macs total Wifi + BLE
@@ -535,19 +537,19 @@ void loop() {
             u8x8.printf("BLTH: %-4d", (int) bles.size());
         #endif
 
-        // display actual wifi channel (line 4)
+        // write actual wifi channel (line 4)
         u8x8.setCursor(11,4);
         u8x8.printf("ch:%02i", channel);
 
-        // display RSSI status (line 5)
+        // write RSSI status (line 5)
         u8x8.setCursor(0,5);
         u8x8.printf(!cfg.rssilimit ? "RLIM: off" : "RLIM: %-3d", cfg.rssilimit);
 
-        // display LoRa status (line 6)
+        // write LoRa status (line 6)
         u8x8.setCursor(0,6);
         u8x8.printf("%-16s", display_lora);
 
-        // display LMiC event (line 7)
+        // write LMiC event (line 7)
         u8x8.setCursor(0,7);
         u8x8.printf("%-16s", display_lmic);