DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rekindle channel display

Browse Source
This commit is contained in:
Klaus K Wilting 2020-11-10 11:07:41 +01:00
parent bdd515af55
commit 7ccfb427c0
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/globals.h
View File

@ -147,10 +147,11 @@ extern std::array<uint64_t, 0xff> beacons;
extern configData_t cfg; // current device configuration extern configData_t cfg; // current device configuration
extern char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer extern char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer
extern uint8_t volatile rf_load; // RF traffic indicator extern uint8_t volatile channel; // wifi channel rotation counter
extern uint8_t batt_level; // display value extern uint8_t volatile rf_load; // RF traffic indicator
extern uint16_t volatile macs_wifi, macs_ble; // display values extern uint8_t batt_level; // display value
extern bool volatile TimePulseTick; // 1sec pps flag set by GPS or RTC 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 timesource_t timeSource;
extern hw_timer_t *displayIRQ, *matrixDisplayIRQ, *ppsIRQ; extern hw_timer_t *displayIRQ, *matrixDisplayIRQ, *ppsIRQ;
extern SemaphoreHandle_t I2Caccess; extern SemaphoreHandle_t I2Caccess;

5
src/display.cpp
View File

@ -292,7 +292,7 @@ void dp_drawPage(time_t t, bool nextpage) {
#endif #endif
dp_println(); dp_println();
// line 4: Battery + GPS status + RF traffic // line 4: Battery + GPS status + Wifi channel
// B:a.bcV Sats:ab ch:ab // B:a.bcV Sats:ab ch:ab
#if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306) #if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306)
if (batt_level == 0) if (batt_level == 0)
@ -310,7 +310,8 @@ void dp_drawPage(time_t t, bool nextpage) {
#else #else
dp_printf(" "); dp_printf(" ");
#endif #endif
dp_printf(" due:%02d", rf_load); dp_printf(" ch:%02d", channel);
// dp_printf(" due:%02d", rf_load);
dp_println(); dp_println();
// line 5: RSSI limiter + free memory // line 5: RSSI limiter + free memory

1
src/main.cpp
View File

@ -88,6 +88,7 @@ triggers pps 1 sec impulse
configData_t cfg; // struct holds current device configuration configData_t cfg; // struct holds current device configuration
char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message
uint8_t batt_level = 0; // display value uint8_t batt_level = 0; // display value
uint8_t volatile channel = 0; // channel rotation counter
uint8_t volatile rf_load = 0; // RF traffic indicator uint8_t volatile rf_load = 0; // RF traffic indicator
uint16_t volatile macs_wifi = 0, macs_ble = 0; // globals for display uint16_t volatile macs_wifi = 0, macs_ble = 0; // globals for display

2
src/wifiscan.cpp
View File

@ -41,7 +41,7 @@ IRAM_ATTR void wifi_sniffer_packet_handler(void *buff,
// Software-timer driven Wifi channel rotation callback function // Software-timer driven Wifi channel rotation callback function
void switchWifiChannel(TimerHandle_t xTimer) { void switchWifiChannel(TimerHandle_t xTimer) {
static uint8_t channel = 0; // channel rotation counter // static uint8_t channel = 0; // channel rotation counter
_ASSERT(xTimer != NULL); _ASSERT(xTimer != NULL);
channel = channel =
(channel % WIFI_CHANNEL_MAX) + 1; // rotate channel 1..WIFI_CHANNEL_MAX (channel % WIFI_CHANNEL_MAX) + 1; // rotate channel 1..WIFI_CHANNEL_MAX