-
Notifications
You must be signed in to change notification settings - Fork 803
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Arduino core and BLE/WiFiManager libs. (#1310)
* Update Arduino core and BLE/WiFiManager libs. * Add esp32-s3 and esp32-c3 environments. * Update build script to use matrix. * Update release build. * Fix WiFiManager crash * Use espressif32 version 3.5.0 for standard ESP32. * Resolves BLE scan_evt timeout issue with latest version (5.2.0). * ESP32C3 and ESP32S3 Env's use espressif32 version 5.2.0. * Update LED pins for C3/S3 environments.
- Loading branch information
Showing
6 changed files
with
129 additions
and
27 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
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
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
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
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
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 |
|---|---|---|
|
|
@@ -100,7 +100,7 @@ arduinolog = https://github.com/1technophile/Arduino-Log.git#d13cd80 | |
| pubsubclient = [email protected] | ||
| rc-switch = https://github.com/1technophile/rc-switch.git#98537e9 | ||
| newremoteswitch = https://github.com/1technophile/NewRemoteSwitch.git#8eb980e | ||
| ble = https://github.com/h2zero/NimBLE-Arduino.git#1.3.8 | ||
| ble = https://github.com/h2zero/NimBLE-Arduino.git#1.4.1 | ||
| irremoteesp = [email protected] | ||
| irremote = https://github.com/z3t0/Arduino-IRremote.git#1c08a37 | ||
| lora = https://github.com/sandeepmistry/arduino-LoRa.git#f4a1d27 | ||
|
|
@@ -118,7 +118,7 @@ htu21 = SparkFun HTU21D Humidity and Temperature Sensor [email protected] | |
| ahtx0 = Adafruit AHTX0 | ||
| ina226 = https://github.com/jarzebski/Arduino-INA226.git#968a684 | ||
| a6lib = https://github.com/h2zero/A6lib | ||
| wifimanager32 = https://github.com/tzapu/WiFiManager.git#c3ff582 | ||
| wifimanager32 = https://github.com/tzapu/WiFiManager.git#9f5981e | ||
| wifimanager8266 = https://github.com/tzapu/WiFiManager.git#2.0.5-beta | ||
| ethernet = Ethernet | ||
| esp8266_mdns = esp8266_mdns | ||
|
|
@@ -154,7 +154,8 @@ monitor_speed = 115200 | |
|
|
||
| [com] | ||
| esp8266_platform = [email protected] | ||
| esp32_platform = [email protected] | ||
| esp32_platform = [email protected] | ||
| esp32_c3_s3_platform = [email protected] | ||
| atmelavr_platform = [email protected] | ||
|
|
||
| [com-esp] | ||
|
|
@@ -919,7 +920,7 @@ lib_deps = | |
| ${com-esp.lib_deps} | ||
| ${libraries.wifimanager32} | ||
| ${libraries.lora} | ||
| ${libraries.ssd1306} | ||
| ${libraries.ssd1306} | ||
| build_flags = | ||
| ${com-esp.build_flags} | ||
| ; *** OpenMQTTGateway Modules *** | ||
|
|
@@ -940,7 +941,7 @@ lib_deps = | |
| ${com-esp.lib_deps} | ||
| ${libraries.wifimanager32} | ||
| ${libraries.lora} | ||
| ${libraries.ssd1306} | ||
| ${libraries.ssd1306} | ||
| build_flags = | ||
| ${com-esp.build_flags} | ||
| ; *** OpenMQTTGateway Modules *** | ||
|
|
@@ -1388,3 +1389,38 @@ build_flags = | |
| '-DpubKnownBLEServiceData=true' | ||
| '-DpubBLEServiceUUID=true' | ||
| '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"' | ||
|
|
||
| [env:esp32s3-dev-c1-ble] | ||
| platform = ${com.esp32_c3_s3_platform} | ||
| board = esp32-s3-devkitc-1 | ||
| lib_deps = | ||
| ${com-esp.lib_deps} | ||
| ${libraries.wifimanager32} | ||
| ${libraries.ble} | ||
| ${libraries.decoder} | ||
| build_flags = | ||
| ${com-esp.build_flags} | ||
| '-DZgatewayBT="BT"' | ||
| '-DLED_SEND_RECEIVE=12' | ||
| '-DLED_SEND_RECEIVE_ON=0' | ||
| '-DLED_INFO=13' | ||
| '-DLED_ERROR=14' | ||
| '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"' | ||
|
|
||
| [env:esp32c3-dev-m1-ble] | ||
| platform = ${com.esp32_c3_s3_platform} | ||
| board = esp32-c3-devkitm-1 | ||
| board_build.partitions = min_spiffs.csv | ||
| lib_deps = | ||
| ${com-esp.lib_deps} | ||
| ${libraries.wifimanager32} | ||
| ${libraries.ble} | ||
| ${libraries.decoder} | ||
| build_flags = | ||
| ${com-esp.build_flags} | ||
| '-DZgatewayBT="BT"' | ||
| '-DLED_SEND_RECEIVE=2' | ||
| '-DLED_SEND_RECEIVE_ON=0' | ||
| '-DLED_INFO=6' | ||
| '-DLED_ERROR=7' | ||
| '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"' | ||