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

libpax integration 1 (work in progress)

Browse Source
This commit is contained in:
cyberman54 2021-03-23 23:08:35 +01:00
parent 5836e713b5
commit 049048dd6e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cyclic.cpp
View File

@ -29,9 +29,11 @@ void doHousekeeping() {
ESP_LOGD(TAG, "IRQhandler %d bytes left | Taskstate = %d", ESP_LOGD(TAG, "IRQhandler %d bytes left | Taskstate = %d",
uxTaskGetStackHighWaterMark(irqHandlerTask), uxTaskGetStackHighWaterMark(irqHandlerTask),
eTaskGetState(irqHandlerTask)); eTaskGetState(irqHandlerTask));
#if !(LIBPAX)
ESP_LOGD(TAG, "MACprocessor %d bytes left | Taskstate = %d", ESP_LOGD(TAG, "MACprocessor %d bytes left | Taskstate = %d",
uxTaskGetStackHighWaterMark(macProcessTask), uxTaskGetStackHighWaterMark(macProcessTask),
eTaskGetState(macProcessTask)); eTaskGetState(macProcessTask));
#endif
ESP_LOGD(TAG, "Rcommand interpreter %d bytes left | Taskstate = %d", ESP_LOGD(TAG, "Rcommand interpreter %d bytes left | Taskstate = %d",
uxTaskGetStackHighWaterMark(rcmdTask), eTaskGetState(rcmdTask)); uxTaskGetStackHighWaterMark(rcmdTask), eTaskGetState(rcmdTask));
#if (HAS_LORA) #if (HAS_LORA)
@ -136,11 +138,11 @@ uint32_t getFreeRAM() {
void reset_counters() { void reset_counters() {
#if ((WIFICOUNTER) || (BLECOUNTER)) #if ((WIFICOUNTER) || (BLECOUNTER))
#if !(LIBPAX) #if !(LIBPAX)
macs.clear(); // clear all macs container macs.clear(); // clear all macs container
macs_wifi = 0; macs_wifi = 0;
macs_ble = 0; macs_ble = 0;
renew_salt(); // get new salt renew_salt(); // get new salt
#endif #endif
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
dp_plotCurve(0, true); dp_plotCurve(0, true);

4
src/reset.cpp
View File

@ -107,7 +107,7 @@ void enter_deepsleep(const uint64_t wakeup_sec, gpio_num_t wakeup_gpio) {
sendTimer.detach(); sendTimer.detach();
// switch off radio and other power consuming hardware // switch off radio and other power consuming hardware
#if !(LIBPAX) #if !(LIBPAX)
#if (WIFICOUNTER) #if (WIFICOUNTER)
switch_wifi_sniffer(0); switch_wifi_sniffer(0);
#endif #endif
@ -120,8 +120,10 @@ void enter_deepsleep(const uint64_t wakeup_sec, gpio_num_t wakeup_gpio) {
sds011_sleep(void); sds011_sleep(void);
#endif #endif
#if !(LIBPAX)
// stop MAC processing // stop MAC processing
vTaskDelete(macProcessTask); vTaskDelete(macProcessTask);
#endif
// halt interrupts accessing i2c bus // halt interrupts accessing i2c bus
mask_user_IRQ(); mask_user_IRQ();

2
src/wifiscan.cpp
View File

@ -104,4 +104,4 @@ void switch_wifi_sniffer(uint8_t state) {
esp_wifi_stop(); esp_wifi_stop();
} }
} }
#endif #endif // !(LIBPAX)