-
-
Notifications
You must be signed in to change notification settings - Fork 413
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #976 from cyberman54/master
sync dev to master
- Loading branch information
Showing
2 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,7 +55,7 @@ extra_scripts = pre:src/build.py | |
| otakeyfile = ota.conf | ||
| lorakeyfile = loraconf.h | ||
| lmicconfigfile = lmic_config.h | ||
| platform_espressif32 = [email protected].0 | ||
| platform_espressif32 = [email protected].1 | ||
| monitor_speed = 115200 | ||
| upload_speed = 115200 ; set by build.py and taken from hal file | ||
| lib_deps_lora = | ||
|
|
@@ -67,7 +67,7 @@ lib_deps_display = | |
| lib_deps_ledmatrix = | ||
| seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0 | ||
| lib_deps_rgbled = | ||
| fastled/FastLED @ ^3.5.0 | ||
| fastled/FastLED @ ^3.6.0 | ||
| lib_deps_gps = | ||
| mikalhart/TinyGPSPlus @ ^1.0.3 | ||
| lib_deps_sensors = | ||
|
|
@@ -82,7 +82,7 @@ lib_deps_basic = | |
| bblanchon/ArduinoJson @ ^6.21.2 | ||
| makuna/RTC @ ^2.3.7 | ||
| mathertel/OneButton @ ^2.0.3 | ||
| lewisxhe/XPowersLib @ ^0.1.5 | ||
| lewisxhe/XPowersLib @ ^0.1.7 | ||
| 256dpi/MQTT @ ^2.5.1 | ||
| lib_deps_all = | ||
| ${common.lib_deps_basic} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,13 +18,13 @@ extra_scripts = pre:src/build.py | |
| otakeyfile = ota.conf | ||
| lorakeyfile = loraconf.h | ||
| lmicconfigfile = lmic_config.h | ||
| platform_espressif32 = [email protected].0 | ||
| platform_espressif32 = [email protected].1 | ||
| monitor_speed = 115200 | ||
| upload_speed = 115200 ; set by build.py and taken from hal file | ||
| lib_deps_all = | ||
| bitbank2/BitBang_I2C@ ^2.2.1 | ||
| bitbank2/bb_spi_lcd @ ^2.4.1 | ||
| fastled/FastLED @ ^3.5.0 | ||
| fastled/FastLED @ ^3.6.0 | ||
| greyrook/libpax @ ^1.1.0 | ||
| https://github.com/SukkoPera/Arduino-Rokkit-Hash.git | ||
| bblanchon/ArduinoJson @ ^6.21.2 | ||
|
|
||