fix issue#642

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

View File

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

View File

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