diff --git a/README.md b/README.md index 51062b41..85e67dca 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,7 @@ Bluetooth low energy service UUID 0xFD6F, used by Google/Apple COVID-19 Exposure #define COUNT_ENS 1 // enable ENS monitoring function #define BLECOUNTER 1 // enable bluetooth sniffing #define WIFICOUNTER 0 // disable wifi sniffing (improves BLE scan speed) - #define HAS_SENSOR_1 1 // optional: transmit ENS counter data to server + #define HAS_SENSOR_1 1 // optional, in board's hal file: transmit ENS counter data to server # SD-card @@ -372,9 +372,9 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering. The device listenes for remote control commands on LoRaWAN Port 2. Multiple commands per downlink are possible by concatenating them, but must not exceed a maximum of 10 bytes per downlink. -Note: settings can be stored in NVRAM to make them persistant (reloaded during device startup / restart). To store settings, use command 0x20. +Note: settings can be stored in NVRAM to make them persistant (reloaded during device startup / restart). To store settings, use command 0x21. -Send for example `8386` as Downlink on Port 2 to get battery status and time/date from the device. +Send for example `83` `86` as Downlink on Port 2 to get battery status and time/date from the device. 0x01 set scan RSSI limit diff --git a/include/payload.h b/include/payload.h index 7ddbe1af..bf6a4577 100644 --- a/include/payload.h +++ b/include/payload.h @@ -1,6 +1,7 @@ #ifndef _PAYLOAD_H_ #define _PAYLOAD_H_ +#include "sensor.h" #include "sds011read.h" // MyDevices CayenneLPP 1.0 channels for Synamic sensor payload format diff --git a/platformio_orig.ini b/platformio_orig.ini index 980261c4..48d42c5c 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -57,7 +57,7 @@ extra_scripts = pre:build.py otakeyfile = ota.conf lorakeyfile = loraconf.h lmicconfigfile = lmic_config.h -platform_espressif32 = espressif32@3.1.1 +platform_espressif32 = espressif32@3.2.0 monitor_speed = 115200 upload_speed = 115200 ; set by build.py and taken from hal file display_library = ; set by build.py and taken from hal file diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf index 3ce74821..a21ace1f 100644 --- a/src/paxcounter_orig.conf +++ b/src/paxcounter_orig.conf @@ -31,11 +31,6 @@ #define COUNT_ENS 1 // count found number of devices which advertise Exposure Notification Service // set to 1 if you want to enable this function [default=0] -// for additional sensors (added by some user) -#define HAS_SENSOR_1 1 // set to 1 to enable data transfer of user sensor #1 (also used as ENS counter) [default=0] -#define HAS_SENSOR_2 0 // set to 1 to enable data transfer of user sensor #2 [default=0] -#define HAS_SENSOR_3 0 // set to 1 to enable data transfer of user sensor #3 [default=0] - /* Note: guide for setting bluetooth parameters * * |< Scan Window > |< Scan Window > | ... |< Scan Window > |