From 246fcbbbb3fa747cbb798261f60d1cd1f330de41 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Fri, 12 Nov 2021 17:00:21 +0100 Subject: [PATCH] update libs and bump to v3.0.3 --- platformio_orig.ini | 10 +++++----- src/paxcounter_orig.conf | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platformio_orig.ini b/platformio_orig.ini index 33fa10ec..1106b46f 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -48,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 = 3.0.2 +release_version = 3.0.3 ; 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 @@ -56,13 +56,13 @@ extra_scripts = pre:build.py otakeyfile = ota.conf lorakeyfile = loraconf.h lmicconfigfile = lmic_config.h -platform_espressif32 = espressif32@3.3.2 +platform_espressif32 = espressif32@3.4.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 +lib_ldf_mode = deep+ lib_deps_lora = - ;mcci-catena/MCCI LoRaWAN LMIC library @ ^4.1.0 - https://github.com/mcci-catena/arduino-lmic.git + mcci-catena/MCCI LoRaWAN LMIC library @ ^4.1.0 lib_deps_display = bitbank2/OneBitDisplay @ ^1.11.0 ricmoo/QRCode @ ^0.0.1 @@ -80,6 +80,7 @@ lib_deps_sensors = boschsensortec/BSEC Software Library @ 1.6.1480 https://github.com/ricki-z/SDS011.git lib_deps_basic = + https://github.com/dbSuS/libpax.git @ ^1.0.0 https://github.com/SukkoPera/Arduino-Rokkit-Hash.git bblanchon/ArduinoJson @ ^6 ropg/ezTime @ ^0.8.3 @@ -88,7 +89,6 @@ lib_deps_basic = lewisxhe/AXP202X_Library @ ^1.1.3 geeksville/esp32-micro-sdcard @ ^0.1.1 256dpi/MQTT @ ^2.4.8 - https://github.com/cyberman54/libpax.git#hci lib_deps_all = ${common.lib_deps_basic} ${common.lib_deps_lora} diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf index 66612bdb..0fe927b9 100644 --- a/src/paxcounter_orig.conf +++ b/src/paxcounter_orig.conf @@ -26,7 +26,6 @@ #define BLESCANTIME 0 // [seconds] scan duration, 0 means infinite [default], see note below #define BLESCANWINDOW 80 // [milliseconds] scan window, see below, 3 .. 10240, default 80ms #define BLESCANINTERVAL 80 // [illiseconds] scan interval, see below, 3 .. 10240, default 80ms = 100% duty cycle -#define BLEADVERTISING 0 // 0 = don't advertise [default], 1 = advertise // Corona Exposure Notification Service(ENS) counter #define COUNT_ENS 0 // count found number of devices which advertise Exposure Notification Service