v3.0.0

README.md

@@ -214,7 +214,7 @@ Paxcounter can be used to sync a wall clock which has a DCF77 or IF482 time tele
 
 This describes how to set up a mobile PaxCounter:<br> Follow all steps so far for preparing the device, selecting the packed payload format. In `paxcounter.conf` set PAYLOAD_OPENSENSEBOX to 1. Register a new sensebox on https://opensensemap.org/. In the sensor configuration select "TheThingsNetwork" and set decoding profile to "LoRa serialization". Enter your TTN Application and Device ID. Setup decoding option using `[{"decoder":"latLng"},{"decoder":"uint16",sensor_id":"yoursensorid"}]` 
 
-# Covid-19 Exposure Notification System beacon detection
+# Covid-19 Exposure Notification System beacon detection (currently NOT working with v3.0.x, use v2.4.x for this feature)
 
 Bluetooth low energy service UUID 0xFD6F, used by Google/Apple COVID-19 Exposure Notification System, can be monitored and counted. By comparing with the total number of observed devices this <A HREF="https://linux-fuer-wi.blogspot.com/2020/10/suche-die-zahl-64879.html">gives an indication</A> how many people staying in proximity are using Apps for tracing COVID-19 exposures, e.g. in Germany the "Corona Warn App". To achive best results with this funcion, use following settings in `paxcounter.conf`:
 

platformio_orig.ini

@@ -1,5 +1,4 @@
 ; PlatformIO Project Configuration File
-; NOTE: PlatformIO v5 is needed!
 ;
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
@@ -41,7 +40,7 @@ halfile = ttgobeam10.h
 [platformio]
 ; upload firmware to board with usb cable
 default_envs = usb
-; upload firmware to pax.express repository
+; upload firmware to a paxexpress repository
 ;default_envs = ota
 ; use latest versions of libraries
 ;default_envs = dev
@@ -49,7 +48,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 2.6.0
+release_version = 3.0.0
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3
@@ -62,12 +61,13 @@ 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
 lib_deps_lora =
-    mcci-catena/MCCI LoRaWAN LMIC library @ ^3.3.0
+    ;mcci-catena/MCCI LoRaWAN LMIC library @ ^3.3.0
+    https://github.com/mcci-catena/arduino-lmic.git
 lib_deps_display =
     bitbank2/OneBitDisplay @ ^1.10.0
     bitbank2/BitBang_I2C @ ^2.1.3
     ricmoo/QRCode @ ^0.0.1
-    bodmer/TFT_eSPI @ ^2.3.51
+    bodmer/TFT_eSPI @ ^2.3.58
 lib_deps_ledmatrix =
     seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0
 lib_deps_rgbled =
@@ -77,18 +77,18 @@ lib_deps_gps =
 lib_deps_sensors =
     adafruit/Adafruit Unified Sensor @ ^1.1.4
     adafruit/Adafruit BME280 Library @ ^2.1.1
-    adafruit/Adafruit BMP085 Library @ ^1.1.0
+    adafruit/Adafruit BMP085 Library @ ^1.2.0
     boschsensortec/BSEC Software Library @ 1.6.1480
     https://github.com/ricki-z/SDS011.git
 lib_deps_basic =
     https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
     bblanchon/ArduinoJson @ ^6
-    m5ez/ezTime @ ^0.8.3
+    ropg/ezTime @ ^0.8.3
     makuna/RTC @ ^2.3.5
     spacehuhn/SimpleButton 
     lewisxhe/AXP202X_Library @ ^1.1.3
     geeksville/esp32-micro-sdcard @ ^0.1.1
-    256dpi/MQTT @ ^2.4.7
+    256dpi/MQTT @ ^2.4.8
     https://github.com/cyberman54/libpax.git
 lib_deps_all =
     ${common.lib_deps_basic}
@@ -119,7 +119,7 @@ framework = arduino
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 upload_speed = ${common.upload_speed}
-;upload_port = COM3
+;upload_port = COM12
 platform = ${common.platform_espressif32}
 lib_deps = ${common.lib_deps_all}
 build_flags = ${common.build_flags_all}
@@ -138,3 +138,6 @@ upload_protocol = esptool
 upload_protocol = esptool
 build_type = debug
 platform = https://github.com/platformio/platform-espressif32.git#develop
+platform_packages =
+  ; use upstream Git version
+  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git

src/paxcounter_orig.conf

@@ -28,7 +28,7 @@
 #define BLESCANINTERVAL                 80      // [illiseconds] scan interval, see below, 3 .. 10240, default 80ms = 100% duty cycle
 
 // Corona Exposure Notification Service(ENS) counter
-#define COUNT_ENS                       1       // count found number of devices which advertise Exposure Notification Service
+#define COUNT_ENS                       0       // count found number of devices which advertise Exposure Notification Service
                                                 // set to 1 if you want to enable this function [default=0]
 
 /* Note: guide for setting bluetooth parameters