From 7ccfb427c0f7b1176d2c56181ccbc0d22e2f25a0 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 10 Nov 2020 11:07:41 +0100 Subject: [PATCH] rekindle channel display --- include/globals.h | 9 +++++---- src/display.cpp | 5 +++-- src/main.cpp | 1 + src/wifiscan.cpp | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/globals.h b/include/globals.h index 33f27694..39a42f79 100644 --- a/include/globals.h +++ b/include/globals.h @@ -147,10 +147,11 @@ extern std::array beacons; extern configData_t cfg; // current device configuration extern char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer -extern uint8_t volatile rf_load; // RF traffic indicator -extern uint8_t batt_level; // display value -extern uint16_t volatile macs_wifi, macs_ble; // display values -extern bool volatile TimePulseTick; // 1sec pps flag set by GPS or RTC +extern uint8_t volatile channel; // wifi channel rotation counter +extern uint8_t volatile rf_load; // RF traffic indicator +extern uint8_t batt_level; // display value +extern uint16_t volatile macs_wifi, macs_ble; // display values +extern bool volatile TimePulseTick; // 1sec pps flag set by GPS or RTC extern timesource_t timeSource; extern hw_timer_t *displayIRQ, *matrixDisplayIRQ, *ppsIRQ; extern SemaphoreHandle_t I2Caccess; diff --git a/src/display.cpp b/src/display.cpp index ae3c0c13..7e7e5b38 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -292,7 +292,7 @@ void dp_drawPage(time_t t, bool nextpage) { #endif dp_println(); - // line 4: Battery + GPS status + RF traffic + // line 4: Battery + GPS status + Wifi channel // B:a.bcV Sats:ab ch:ab #if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306) if (batt_level == 0) @@ -310,7 +310,8 @@ void dp_drawPage(time_t t, bool nextpage) { #else dp_printf(" "); #endif - dp_printf(" due:%02d", rf_load); + dp_printf(" ch:%02d", channel); + // dp_printf(" due:%02d", rf_load); dp_println(); // line 5: RSSI limiter + free memory diff --git a/src/main.cpp b/src/main.cpp index b4cc1c77..687a926d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -88,6 +88,7 @@ triggers pps 1 sec impulse configData_t cfg; // struct holds current device configuration char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message uint8_t batt_level = 0; // display value +uint8_t volatile channel = 0; // channel rotation counter uint8_t volatile rf_load = 0; // RF traffic indicator uint16_t volatile macs_wifi = 0, macs_ble = 0; // globals for display diff --git a/src/wifiscan.cpp b/src/wifiscan.cpp index 4ca6f54f..d6325fcd 100644 --- a/src/wifiscan.cpp +++ b/src/wifiscan.cpp @@ -41,7 +41,7 @@ IRAM_ATTR void wifi_sniffer_packet_handler(void *buff, // Software-timer driven Wifi channel rotation callback function void switchWifiChannel(TimerHandle_t xTimer) { - static uint8_t channel = 0; // channel rotation counter + // static uint8_t channel = 0; // channel rotation counter _ASSERT(xTimer != NULL); channel = (channel % WIFI_CHANNEL_MAX) + 1; // rotate channel 1..WIFI_CHANNEL_MAX