new display RF load & remove ch display
This commit is contained in:
1 parent
2e368a6d8d
commit
86a6341101
5 files changed
+16
-14
No files matched your search
+2
-2
@@ -292,7 +292,7 @@ void dp_drawPage(time_t t, bool nextpage) {
|
||||
#endif
|
||||
dp_println();
|
||||
|
||||
// line 4: Battery + GPS status + Wifi channel
|
||||
// line 4: Battery + GPS status + RF traffic
|
||||
// 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,7 @@ void dp_drawPage(time_t t, bool nextpage) {
|
||||
#else
|
||||
dp_printf(" ");
|
||||
#endif
|
||||
dp_printf(" ch:%02d", channel);
|
||||
dp_printf(" due:%02d", rf_load);
|
||||
dp_println();
|
||||
|
||||
// line 5: RSSI limiter + free memory
|
||||
|
||||
+6
-2
@@ -79,8 +79,12 @@ void mac_process(void *pvParameters) {
|
||||
if (xQueueReceive(MacQueue, &MacBuffer, portMAX_DELAY) != pdTRUE) {
|
||||
ESP_LOGE(TAG, "Premature return from xQueueReceive() with no data!");
|
||||
continue;
|
||||
} else
|
||||
mac_analyze(MacBuffer);
|
||||
}
|
||||
|
||||
// update traffic indicator
|
||||
rf_load = uxQueueMessagesWaiting(MacQueue);
|
||||
// process fetched mac
|
||||
mac_analyze(MacBuffer);
|
||||
}
|
||||
delay(2); // yield to CPU
|
||||
}
|
||||
|
||||
+1
-1
@@ -87,8 +87,8 @@ 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 volatile channel = 0; // channel rotation counter
|
||||
uint8_t batt_level = 0; // display value
|
||||
uint8_t volatile rf_load = 0; // RF traffic indicator
|
||||
uint16_t volatile macs_wifi = 0, macs_ble = 0; // globals for display
|
||||
|
||||
hw_timer_t *ppsIRQ = NULL, *displayIRQ = NULL, *matrixDisplayIRQ = NULL;
|
||||
|
||||
@@ -41,6 +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
|
||||
_ASSERT(xTimer != NULL);
|
||||
channel =
|
||||
(channel % WIFI_CHANNEL_MAX) + 1; // rotate channel 1..WIFI_CHANNEL_MAX
|
||||
|
||||
Reference in new issue
Block a user