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

Merge pull request #976 from cyberman54/master

Browse Source 
sync dev to master
This commit is contained in:
Verkehrsrot 2023-06-15 12:48:08 +02:00 committed by GitHub
commit fd2fdd8e3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platformio_orig.ini
View File

@ -55,7 +55,7 @@ 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@6.3.0 platform_espressif32 = espressif32@6.3.1
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 =
@ -67,7 +67,7 @@ lib_deps_display =
lib_deps_ledmatrix = lib_deps_ledmatrix =
seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0 seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0
lib_deps_rgbled = lib_deps_rgbled =
fastled/FastLED @ ^3.5.0 fastled/FastLED @ ^3.6.0
lib_deps_gps = lib_deps_gps =
mikalhart/TinyGPSPlus @ ^1.0.3 mikalhart/TinyGPSPlus @ ^1.0.3
lib_deps_sensors = lib_deps_sensors =
@ -82,7 +82,7 @@ lib_deps_basic =
bblanchon/ArduinoJson @ ^6.21.2 bblanchon/ArduinoJson @ ^6.21.2
makuna/RTC @ ^2.3.7 makuna/RTC @ ^2.3.7
mathertel/OneButton @ ^2.0.3 mathertel/OneButton @ ^2.0.3
lewisxhe/XPowersLib @ ^0.1.5 lewisxhe/XPowersLib @ ^0.1.7
256dpi/MQTT @ ^2.5.1 256dpi/MQTT @ ^2.5.1
lib_deps_all = lib_deps_all =
${common.lib_deps_basic} ${common.lib_deps_basic}

4
platformio_orig_s3.ini
View File

@ -18,13 +18,13 @@ 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@6.3.0 platform_espressif32 = espressif32@6.3.1
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.1 bitbank2/bb_spi_lcd @ ^2.4.1
fastled/FastLED @ ^3.5.0 fastled/FastLED @ ^3.6.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.21.2 bblanchon/ArduinoJson @ ^6.21.2