From 58e9bb6ab7f84d38f07d44e510d31ce9d9108963 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 2 Dec 2020 17:44:49 +0100 Subject: [PATCH 1/4] Update platformio esp version 2.0.0 -> 2.1.0 --- platformio_orig.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio_orig.ini b/platformio_orig.ini index def51a91..f505c2ab 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -7,7 +7,7 @@ ; ---> SELECT THE TARGET PLATFORM HERE! <--- [board] -halfile = generic.h +;halfile = generic.h ;halfile = ebox.h ;halfile = eboxtube.h ;halfile = ecopower.h @@ -19,7 +19,7 @@ halfile = generic.h ;halfile = ttgov21new.h ;halfile = ttgofox.h ;halfile = ttgobeam.h -;halfile = ttgobeam10.h +halfile = ttgobeam10.h ;halfile = ttgotdisplay.h ;halfile = fipy.h ;halfile = lopy.h @@ -47,7 +47,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.0.4 +release_version = 2.0.43 ; 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 @@ -55,7 +55,7 @@ extra_scripts = pre:build.py otakeyfile = ota.conf lorakeyfile = loraconf.h lmicconfigfile = lmic_config.h -platform_espressif32 = espressif32@2.0.0 +platform_espressif32 = espressif32@2.1.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 af003ef461c63a126ade2339bb0143cd51f81420 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 2 Dec 2020 17:50:39 +0100 Subject: [PATCH 2/4] platformio_orig.ini update --- platformio_orig.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio_orig.ini b/platformio_orig.ini index f505c2ab..395a09a9 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -1,5 +1,5 @@ ; PlatformIO Project Configuration File -; NOTE: PlatformIO v4 is needed! +; NOTE: PlatformIO v5 is needed! ; ; Please visit documentation for the other options and examples ; http://docs.platformio.org/page/projectconf.html @@ -65,7 +65,7 @@ lib_deps_display = bitbank2/OneBitDisplay @ 1.9.0 bitbank2/BitBang_I2C @ ^2.1.3 ricmoo/QRCode @ ^0.0.1 - bodmer/TFT_eSPI @ ^2.2.20 + bodmer/TFT_eSPI @ ^2.3.51 lib_deps_ledmatrix = seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0 lib_deps_rgbled = From 6bf43cc921cd476f52455d1df3ac8d32b12a4a84 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 3 Dec 2020 18:24:12 +0100 Subject: [PATCH 3/4] update BOSCH BSEC version --- platformio_orig.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platformio_orig.ini b/platformio_orig.ini index 395a09a9..7f63d4e7 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -76,8 +76,7 @@ lib_deps_sensors = adafruit/Adafruit Unified Sensor @ ^1.1.4 adafruit/Adafruit BME280 Library @ ^2.1.1 adafruit/Adafruit BMP085 Library @ ^1.1.0 - ;boschsensortec/BSEC Software Library @ 1.6.1480 - https://github.com/BoschSensortec/BSEC-Arduino-library.git + boschsensortec/BSEC Software Library @ 1.6.1480 https://github.com/ricki-z/SDS011.git lib_deps_basic = bblanchon/ArduinoJson @ <6 From d048b759a82778f9dfeb2d7a6d7246b765fddd95 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Fri, 11 Dec 2020 12:39:25 +0100 Subject: [PATCH 4/4] main.cpp: bugfix wifi start --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 687a926d..6a6d2d0b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -417,7 +417,7 @@ void setup() { // start wifi in monitor mode and start channel rotation timer wifi_sniffer_init(); - if (cfg.blescan) { + if (cfg.wifiscan) { ESP_LOGI(TAG, "Starting Wifi..."); switch_wifi_sniffer(1); } else @@ -526,4 +526,4 @@ void setup() { } // setup() -void loop() { vTaskDelete(NULL); } \ No newline at end of file +void loop() { vTaskDelete(NULL); }