mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-02-02 23:57:44 +05:00
Merge branch 'async' into passive_ble
This commit is contained in:
@@ -4,21 +4,21 @@ extra_configs = secrets.default.ini
|
||||
core_dir = .pio
|
||||
|
||||
[env]
|
||||
version = 1.5.7-passiveble
|
||||
version = 1.6.0-passiveble
|
||||
framework = arduino
|
||||
lib_deps = ESP32Async/AsyncTCP
|
||||
;ESP32Async/ESPAsyncWebServer
|
||||
https://github.com/ESP32Async/ESPAsyncWebServer
|
||||
lib_deps = ESP32Async/AsyncTCP@^2.0.0
|
||||
ESP32Async/ESPAsyncWebServer@^3.9.4
|
||||
mathieucarbou/MycilaWebSerial@^8.2.0
|
||||
bblanchon/ArduinoJson@^7.4.2
|
||||
;ihormelnyk/OpenTherm Library@^1.1.5
|
||||
https://github.com/Laxilef/opentherm_library#esp32_timer
|
||||
arduino-libraries/ArduinoMqttClient@^0.1.8
|
||||
lennarthennigs/ESP Telnet@^2.2.3
|
||||
gyverlibs/FileData@^1.0.3
|
||||
gyverlibs/GyverPID@^3.3.2
|
||||
gyverlibs/GyverBlinker@^1.1.1
|
||||
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
|
||||
laxilef/TinyLogger@^1.1.1
|
||||
;laxilef/TinyLogger@^1.1.1
|
||||
https://github.com/Laxilef/TinyLogger#custom_handlers
|
||||
build_type = ${secrets.build_type}
|
||||
build_flags = -mtext-section-literals
|
||||
-Wno-deprecated-declarations
|
||||
@@ -29,10 +29,10 @@ build_flags = -mtext-section-literals
|
||||
-D CONFIG_ASYNC_TCP_STACK_SIZE=4096
|
||||
-D ARDUINOJSON_USE_DOUBLE=0
|
||||
-D ARDUINOJSON_USE_LONG_LONG=0
|
||||
-D TINYLOGGER_GLOBAL
|
||||
-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
|
||||
-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
|
||||
-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
|
||||
-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
|
||||
-D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
|
||||
-D DEFAULT_LOG_LEVEL=${secrets.log_level}
|
||||
-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
|
||||
-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
|
||||
@@ -51,31 +51,14 @@ upload_speed = 921600
|
||||
monitor_speed = 115200
|
||||
;monitor_filters = direct
|
||||
monitor_filters = esp32_exception_decoder
|
||||
esp8266_exception_decoder
|
||||
board_build.flash_mode = dio
|
||||
board_build.filesystem = littlefs
|
||||
check_tool = ;pvs-studio
|
||||
check_flags = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
|
||||
|
||||
; Defaults
|
||||
[esp8266_defaults]
|
||||
platform = espressif8266@^4.2.1
|
||||
platform_packages = ${env.platform_packages}
|
||||
lib_deps = ${env.lib_deps}
|
||||
nrwiersma/ESP8266Scheduler@^1.2
|
||||
lib_ignore =
|
||||
extra_scripts = post:tools/build.py
|
||||
build_type = ${env.build_type}
|
||||
build_flags = ${env.build_flags}
|
||||
-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
|
||||
;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
|
||||
-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||
board_build.ldscript = eagle.flash.4m1m.ld
|
||||
check_tool = ${env.check_tool}
|
||||
check_flags = ${env.check_flags}
|
||||
|
||||
[esp32_defaults]
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.34/platform-espressif32.zip
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
|
||||
platform_packages = ${env.platform_packages}
|
||||
board_build.partitions = esp32_partitions.csv
|
||||
lib_deps = ${env.lib_deps}
|
||||
@@ -120,50 +103,6 @@ check_flags = ${env.check_flags}
|
||||
|
||||
|
||||
; Boards
|
||||
[env:d1_mini]
|
||||
extends = esp8266_defaults
|
||||
board = d1_mini
|
||||
build_flags = ${esp8266_defaults.build_flags}
|
||||
-D DEFAULT_OT_IN_GPIO=4
|
||||
-D DEFAULT_OT_OUT_GPIO=5
|
||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
||||
-D DEFAULT_STATUS_LED_GPIO=13
|
||||
-D DEFAULT_OT_RX_LED_GPIO=15
|
||||
|
||||
[env:d1_mini_lite]
|
||||
extends = esp8266_defaults
|
||||
board = d1_mini_lite
|
||||
build_flags = ${esp8266_defaults.build_flags}
|
||||
-D DEFAULT_OT_IN_GPIO=4
|
||||
-D DEFAULT_OT_OUT_GPIO=5
|
||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
||||
-D DEFAULT_STATUS_LED_GPIO=13
|
||||
-D DEFAULT_OT_RX_LED_GPIO=15
|
||||
|
||||
[env:d1_mini_pro]
|
||||
extends = esp8266_defaults
|
||||
board = d1_mini_pro
|
||||
build_flags = ${esp8266_defaults.build_flags}
|
||||
-D DEFAULT_OT_IN_GPIO=4
|
||||
-D DEFAULT_OT_OUT_GPIO=5
|
||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
||||
-D DEFAULT_STATUS_LED_GPIO=13
|
||||
-D DEFAULT_OT_RX_LED_GPIO=15
|
||||
|
||||
[env:nodemcu_8266]
|
||||
extends = esp8266_defaults
|
||||
board = nodemcuv2
|
||||
build_flags = ${esp8266_defaults.build_flags}
|
||||
-D DEFAULT_OT_IN_GPIO=13
|
||||
-D DEFAULT_OT_OUT_GPIO=15
|
||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||
-D DEFAULT_SENSOR_INDOOR_GPIO=4
|
||||
-D DEFAULT_STATUS_LED_GPIO=2
|
||||
-D DEFAULT_OT_RX_LED_GPIO=16
|
||||
|
||||
[env:s2_mini]
|
||||
extends = esp32_defaults
|
||||
board = lolin_s2_mini
|
||||
@@ -187,8 +126,8 @@ build_unflags = -DARDUINO_USB_MODE=1
|
||||
build_flags = ${esp32_defaults.build_flags}
|
||||
-D ARDUINO_USB_MODE=0
|
||||
-D ARDUINO_USB_CDC_ON_BOOT=1
|
||||
-D USE_BLE=1
|
||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
||||
-D USE_BLE=1
|
||||
-D DEFAULT_OT_IN_GPIO=35
|
||||
-D DEFAULT_OT_OUT_GPIO=36
|
||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
|
||||
@@ -203,7 +142,8 @@ lib_deps = ${esp32_defaults.lib_deps}
|
||||
${esp32_defaults.nimble_lib}
|
||||
build_unflags = -mtext-section-literals
|
||||
build_flags = ${esp32_defaults.build_flags}
|
||||
-D USE_BLE=1
|
||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
||||
-D USE_BLE=1
|
||||
-D DEFAULT_OT_IN_GPIO=8
|
||||
-D DEFAULT_OT_OUT_GPIO=10
|
||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
||||
@@ -265,6 +205,7 @@ lib_deps = ${esp32_defaults.lib_deps}
|
||||
${esp32_defaults.nimble_lib}
|
||||
build_unflags = -mtext-section-literals
|
||||
build_flags = ${esp32_defaults.build_flags}
|
||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
||||
-D USE_BLE=1
|
||||
-D DEFAULT_OT_IN_GPIO=3
|
||||
-D DEFAULT_OT_OUT_GPIO=1
|
||||
|
||||
Reference in New Issue
Block a user