From 98302a95302a2ca4bf80d5536c65b950e967029b Mon Sep 17 00:00:00 2001 From: August Quint <49277349+AugustQu@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:01:00 +0200 Subject: [PATCH] Update display.cpp added: CWA-handling --- src/display.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/display.cpp b/src/display.cpp index 162fa6b3..579956b9 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -265,7 +265,12 @@ void dp_drawPage(time_t t, bool nextpage) { else dp_printf("WIFI:off"); if (cfg.blescan) - dp_printf(" BLTH:%-5d", macs_ble); +#if !(COUNT_CWA) + dp_printf("BLTH:%-5d", macs_ble); +#else + dp_printf("BLTH:%-5d", macs_ble); + dp_printf("(CWA:%d)", cwa_report()); +#endif else dp_printf(" BLTH:off"); #elif ((WIFICOUNTER) && (!BLECOUNTER)) @@ -274,9 +279,12 @@ void dp_drawPage(time_t t, bool nextpage) { else dp_printf("WIFI:off"); #elif ((!WIFICOUNTER) && (BLECOUNTER)) - if (cfg.blescan) + if (cfg.blescan) { dp_printf("BLTH:%-5d", macs_ble); - else +#if (COUNT_CWA) + dp_printf("(CWA:%d)", cwa_report()); +#endif + } else dp_printf("BLTH:off"); #else dp_printf("Sniffer disabled"); @@ -736,4 +744,4 @@ void dp_plotCurve(uint16_t count, bool reset) { dp_drawPixel(plotbuf, col, row, 1); } -#endif // HAS_DISPLAY \ No newline at end of file +#endif // HAS_DISPLAY