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

Merge remote-tracking branch 'remotes/origin/master' into GpsDrivenTimeSynch

Browse Source
This commit is contained in:
Oliver Seiler 2020-09-28 11:45:29 +13:00
commit cbaf705c15
5 changed files with 15 additions and 15 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

2
src/hal/ttgobeam.h
View File

@ -33,7 +33,7 @@
//#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !! //#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
// display (if connected) // display (if connected)
#define HAS_DISPLAY 1 //#define HAS_DISPLAY 1
#define MY_DISPLAY_SDA SDA #define MY_DISPLAY_SDA SDA
#define MY_DISPLAY_SCL SCL #define MY_DISPLAY_SCL SCL
#define MY_DISPLAY_RST NOT_A_PIN #define MY_DISPLAY_RST NOT_A_PIN

2
src/macsniff.cpp
View File

@ -116,7 +116,7 @@ uint16_t mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
} // added } // added
// Log scan result // Log scan result
ESP_LOGD(TAG, ESP_LOGV(TAG,
"%s %s RSSI %ddBi -> salted MAC %s -> Hash %04X -> WiFi:%d " "%s %s RSSI %ddBi -> salted MAC %s -> Hash %04X -> WiFi:%d "
"BLTH:%d " "BLTH:%d "
#if (COUNT_ENS) #if (COUNT_ENS)

17
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() ,
#endif cwa_report()
); #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

5
src/sensor.cpp
View File

@ -54,9 +54,10 @@ uint8_t *sensor_read(uint8_t sensor) {
case 1: case 1:
// insert user specific sensor data frames here */ // insert user specific sensor data frames here
// note: Sensor1 fields are used for ENS count, if ENS detection enabled
#if (COUNT_ENS) #if (COUNT_ENS)
payload.addCount( cwa_report(), MAC_SNIFF_BLE_CWA); payload.addCount(cwa_report(), MAC_SNIFF_BLE_CWA);
#else #else
buf[0] = length; buf[0] = length;
buf[1] = 0x01; buf[1] = 0x01;