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

fix issue#642

Browse Source
This commit is contained in:
Klaus K Wilting 2020-09-27 18:03:12 +02:00
parent 5073c00f17
commit 01f990d17f
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -282,8 +282,8 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering.
**Port #1:** Paxcount data **Port #1:** Paxcount data
byte 1-2: Number of unique devices, seen on Wifi byte 1-2: Number of unique devices, seen on Wifi [00 00 if Wifi scan disabled]
byte 3-4: Number of unique devices, seen on Bluetooth [ommited if BT disabled] byte 3-4: Number of unique devices, seen on Bluetooth [ommited if BT scan disabled]
**Port #2:** Device status query result **Port #2:** Device status query result

15
src/senddata.cpp
View File

@ -56,12 +56,13 @@ void SendPayload(uint8_t port, sendprio_t prio) {
// write data to sdcard, if present // write data to sdcard, if present
#if (HAS_SDCARD) #if (HAS_SDCARD)
if ( port == COUNTERPORT ) { if (port == COUNTERPORT) {
sdcardWriteData(macs_wifi, macs_ble sdcardWriteData(macs_wifi, macs_ble
#if (COUNT_ENS) #if (COUNT_ENS)
, cwa_report() ,
cwa_report()
#endif #endif
); );
} }
#endif #endif
@ -86,8 +87,7 @@ void sendData() {
case COUNT_DATA: case COUNT_DATA:
payload.reset(); payload.reset();
#if !(PAYLOAD_OPENSENSEBOX) #if !(PAYLOAD_OPENSENSEBOX)
if (cfg.wifiscan) payload.addCount(macs_wifi, MAC_SNIFF_WIFI);
payload.addCount(macs_wifi, MAC_SNIFF_WIFI);
if (cfg.blescan) if (cfg.blescan)
payload.addCount(macs_ble, MAC_SNIFF_BLE); payload.addCount(macs_ble, MAC_SNIFF_BLE);
#endif #endif
@ -102,8 +102,7 @@ void sendData() {
} }
#endif #endif
#if (PAYLOAD_OPENSENSEBOX) #if (PAYLOAD_OPENSENSEBOX)
if (cfg.wifiscan) payload.addCount(macs_wifi, MAC_SNIFF_WIFI);
payload.addCount(macs_wifi, MAC_SNIFF_WIFI);
if (cfg.blescan) if (cfg.blescan)
payload.addCount(macs_ble, MAC_SNIFF_BLE); payload.addCount(macs_ble, MAC_SNIFF_BLE);
#endif #endif