From 348de7fe83858638f874ea7806cd3c47242a21a0 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Sat, 27 Mar 2021 18:19:31 +0100 Subject: [PATCH 1/5] readme.md: correction in section remote control --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb47ccfa..0cad64e9 100644 --- a/README.md +++ b/README.md @@ -373,9 +373,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 From 7e0d2b317859589aad92b32d78dc8690d0d09bdb Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Wed, 31 Mar 2021 09:04:13 +0200 Subject: [PATCH 2/5] fix issue #775 --- include/payload.h | 1 + 1 file changed, 1 insertion(+) 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 From ad528265d7b75b7dbcabe9f9bc15623128963af5 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Wed, 31 Mar 2021 09:05:37 +0200 Subject: [PATCH 3/5] upgrade arduino-esp32 to v1.0.6 --- platformio_orig.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_orig.ini b/platformio_orig.ini index 3c55b8bb..e3ae00ad 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 From 643d972da65324e09568a46813052bbc74dd904b Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Wed, 31 Mar 2021 09:06:52 +0200 Subject: [PATCH 4/5] remove user sensors settings from paxcounter.conf --- README.md | 2 +- src/paxcounter_orig.conf | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 0cad64e9..277c53a1 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,7 @@ Bluetooth low energy service UUID 0xFD6F, used by Google/Apple COVID-19 Exposure #define MACFILTER 0 // disable MAC filter #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 diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf index 3440d8fc..cbb68685 100644 --- a/src/paxcounter_orig.conf +++ b/src/paxcounter_orig.conf @@ -33,11 +33,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 > | From 36363ee3771c47a39185c14685fec5af8ce38474 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Wed, 31 Mar 2021 09:46:51 +0200 Subject: [PATCH 5/5] main.h: added include coexist.h --- include/main.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/main.h b/include/main.h index 2a5bd104..85be18c3 100644 --- a/include/main.h +++ b/include/main.h @@ -4,6 +4,7 @@ #include // needed for reading ESP32 chip attributes #include // needed for Wifi event handler #include // needed for timers +#include // needed for coex version display #include "globals.h" #include "reset.h"