DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #928 from cyberman54/master

Browse Source 
sync dev to master
This commit is contained in:
Verkehrsrot 2023-01-17 14:33:51 +01:00 committed by GitHub
commit 689480f32d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platformio_orig.ini
View File

@ -46,22 +46,22 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
[common] [common]
; for release_version use max. 10 chars total, use any decimal format like "a.b.c" ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
release_version = 3.4.4 release_version = 3.4.5
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 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 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
debug_level = 3 debug_level = 3
extra_scripts = pre:build.py extra_scripts = pre:src/build.py
otakeyfile = ota.conf otakeyfile = ota.conf
lorakeyfile = loraconf.h lorakeyfile = loraconf.h
lmicconfigfile = lmic_config.h lmicconfigfile = lmic_config.h
platform_espressif32 = espressif32@5.3.0 platform_espressif32 = espressif32@6.0.0
monitor_speed = 115200 monitor_speed = 115200
upload_speed = 115200 ; set by build.py and taken from hal file upload_speed = 115200 ; set by build.py and taken from hal file
lib_deps_lora = lib_deps_lora =
mcci-catena/MCCI LoRaWAN LMIC library @ ^4.1.1 mcci-catena/MCCI LoRaWAN LMIC library @ ^4.1.1
lib_deps_display = lib_deps_display =
bitbank2/OneBitDisplay @ ^2.2.1 bitbank2/OneBitDisplay @ ^2.3.0
bitbank2/bb_spi_lcd @ ^2.4.0 bitbank2/bb_spi_lcd @ ^2.4.1
ricmoo/QRCode @ ^0.0.1 ricmoo/QRCode @ ^0.0.1
lib_deps_ledmatrix = lib_deps_ledmatrix =
seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0 seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0
@ -72,13 +72,13 @@ lib_deps_gps =
lib_deps_sensors = lib_deps_sensors =
adafruit/Adafruit Unified Sensor @ ^1.1.7 adafruit/Adafruit Unified Sensor @ ^1.1.7
adafruit/Adafruit BME280 Library @ ^2.2.2 adafruit/Adafruit BME280 Library @ ^2.2.2
adafruit/Adafruit BMP085 Library @ ^1.2.1 adafruit/Adafruit BMP085 Library @ ^1.2.2
boschsensortec/BSEC Software Library @ 1.6.1480 boschsensortec/BSEC Software Library @ 1.6.1480
lewapek/Nova Fitness Sds dust sensors library @ ^1.5.1 lewapek/Nova Fitness Sds dust sensors library @ ^1.5.1
lib_deps_basic = lib_deps_basic =
greyrook/libpax @ ^1.1.0 greyrook/libpax @ ^1.1.0
https://github.com/SukkoPera/Arduino-Rokkit-Hash.git https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
bblanchon/ArduinoJson @ ^6 bblanchon/ArduinoJson @ ^6.20.0
makuna/RTC @ ^2.3.5 makuna/RTC @ ^2.3.5
mathertel/OneButton @ ^2.0.3 mathertel/OneButton @ ^2.0.3
lewisxhe/XPowersLib @ ^0.1.4 lewisxhe/XPowersLib @ ^0.1.4

10
platformio_orig_s3.ini
View File

@ -10,24 +10,24 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
[common] [common]
; for release_version use max. 10 chars total, use any decimal format like "a.b.c" ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
release_version = 3.4.4 release_version = 3.4.5
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 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 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
debug_level = 3 debug_level = 3
extra_scripts = pre:build.py extra_scripts = pre:src/build.py
otakeyfile = ota.conf otakeyfile = ota.conf
lorakeyfile = loraconf.h lorakeyfile = loraconf.h
lmicconfigfile = lmic_config.h lmicconfigfile = lmic_config.h
platform_espressif32 = espressif32@5.3.0 platform_espressif32 = espressif32@6.0.0
monitor_speed = 115200 monitor_speed = 115200
upload_speed = 115200 ; set by build.py and taken from hal file upload_speed = 115200 ; set by build.py and taken from hal file
lib_deps_all = lib_deps_all =
bitbank2/BitBang_I2C@ ^2.2.1 bitbank2/BitBang_I2C@ ^2.2.1
bitbank2/bb_spi_lcd @ ^2.4.0 bitbank2/bb_spi_lcd @ ^2.4.1
fastled/FastLED @ ^3.5.0 fastled/FastLED @ ^3.5.0
greyrook/libpax @ ^1.1.0 greyrook/libpax @ ^1.1.0
https://github.com/SukkoPera/Arduino-Rokkit-Hash.git https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
bblanchon/ArduinoJson @ ^6 bblanchon/ArduinoJson @ ^6.20.0
mathertel/OneButton @ ^2.0.3 mathertel/OneButton @ ^2.0.3
256dpi/MQTT @ ^2.5.0 256dpi/MQTT @ ^2.5.0
ricmoo/QRCode @ ^0.0.1 ricmoo/QRCode @ ^0.0.1

0
build.py → src/build.py
View File