mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-02-04 00:27:45 +05:00
Merge branch 'master' into async
This commit is contained in:
@@ -6,9 +6,9 @@ core_dir = .pio
|
|||||||
[env]
|
[env]
|
||||||
version = 1.6.0-async
|
version = 1.6.0-async
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps = ESP32Async/AsyncTCP@^2.0.0
|
lib_deps = ESP32Async/AsyncTCP@^3.4.10
|
||||||
ESP32Async/ESPAsyncWebServer@^3.9.4
|
ESP32Async/ESPAsyncWebServer@^3.9.4
|
||||||
mathieucarbou/MycilaWebSerial@^8.2.0
|
mathieucarbou/MycilaWebSerial@^8.2.0
|
||||||
bblanchon/ArduinoJson@^7.4.2
|
bblanchon/ArduinoJson@^7.4.2
|
||||||
;ihormelnyk/OpenTherm Library@^1.1.5
|
;ihormelnyk/OpenTherm Library@^1.1.5
|
||||||
https://github.com/Laxilef/opentherm_library#esp32_timer
|
https://github.com/Laxilef/opentherm_library#esp32_timer
|
||||||
@@ -16,9 +16,12 @@ lib_deps = ESP32Async/AsyncTCP@^2.0.0
|
|||||||
gyverlibs/FileData@^1.0.3
|
gyverlibs/FileData@^1.0.3
|
||||||
gyverlibs/GyverPID@^3.3.2
|
gyverlibs/GyverPID@^3.3.2
|
||||||
gyverlibs/GyverBlinker@^1.1.1
|
gyverlibs/GyverBlinker@^1.1.1
|
||||||
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
|
pstolarz/OneWireNg@^0.14.1
|
||||||
|
;milesburton/DallasTemperature@^4.0.5
|
||||||
|
https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
|
||||||
;laxilef/TinyLogger@^1.1.1
|
;laxilef/TinyLogger@^1.1.1
|
||||||
https://github.com/Laxilef/TinyLogger#custom_handlers
|
https://github.com/Laxilef/TinyLogger#custom_handlers
|
||||||
|
lib_ignore = paulstoffregen/OneWire
|
||||||
build_type = ${secrets.build_type}
|
build_type = ${secrets.build_type}
|
||||||
build_flags = -mtext-section-literals
|
build_flags = -mtext-section-literals
|
||||||
-Wno-deprecated-declarations
|
-Wno-deprecated-declarations
|
||||||
@@ -29,7 +32,7 @@ build_flags = -mtext-section-literals
|
|||||||
-D CONFIG_ASYNC_TCP_STACK_SIZE=4096
|
-D CONFIG_ASYNC_TCP_STACK_SIZE=4096
|
||||||
-D ARDUINOJSON_USE_DOUBLE=0
|
-D ARDUINOJSON_USE_DOUBLE=0
|
||||||
-D ARDUINOJSON_USE_LONG_LONG=0
|
-D ARDUINOJSON_USE_LONG_LONG=0
|
||||||
-D TINYLOGGER_GLOBAL
|
-D TINYLOGGER_GLOBAL
|
||||||
-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
|
-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
|
||||||
-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
|
-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
|
||||||
-D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
|
-D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
|
||||||
@@ -58,13 +61,14 @@ check_flags = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/l
|
|||||||
|
|
||||||
; Defaults
|
; Defaults
|
||||||
[esp32_defaults]
|
[esp32_defaults]
|
||||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
|
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
|
||||||
platform_packages = ${env.platform_packages}
|
platform_packages = ${env.platform_packages}
|
||||||
board_build.partitions = esp32_partitions.csv
|
board_build.partitions = esp32_partitions.csv
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
laxilef/ESP32Scheduler@^1.0.1
|
laxilef/ESP32Scheduler@^1.0.1
|
||||||
nimble_lib = https://github.com/h2zero/NimBLE-Arduino
|
nimble_lib = https://github.com/h2zero/NimBLE-Arduino
|
||||||
lib_ignore = BluetoothSerial
|
lib_ignore = ${env.lib_ignore}
|
||||||
|
BluetoothSerial
|
||||||
SimpleBLE
|
SimpleBLE
|
||||||
ESP RainMaker
|
ESP RainMaker
|
||||||
RainMaker
|
RainMaker
|
||||||
@@ -143,7 +147,7 @@ lib_deps = ${esp32_defaults.lib_deps}
|
|||||||
build_unflags = -mtext-section-literals
|
build_unflags = -mtext-section-literals
|
||||||
build_flags = ${esp32_defaults.build_flags}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
||||||
-D USE_BLE=1
|
-D USE_BLE=1
|
||||||
-D DEFAULT_OT_IN_GPIO=8
|
-D DEFAULT_OT_IN_GPIO=8
|
||||||
-D DEFAULT_OT_OUT_GPIO=10
|
-D DEFAULT_OT_OUT_GPIO=10
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
||||||
@@ -205,7 +209,7 @@ lib_deps = ${esp32_defaults.lib_deps}
|
|||||||
${esp32_defaults.nimble_lib}
|
${esp32_defaults.nimble_lib}
|
||||||
build_unflags = -mtext-section-literals
|
build_unflags = -mtext-section-literals
|
||||||
build_flags = ${esp32_defaults.build_flags}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
||||||
-D USE_BLE=1
|
-D USE_BLE=1
|
||||||
-D DEFAULT_OT_IN_GPIO=3
|
-D DEFAULT_OT_IN_GPIO=3
|
||||||
-D DEFAULT_OT_OUT_GPIO=1
|
-D DEFAULT_OT_OUT_GPIO=1
|
||||||
|
|||||||
Reference in New Issue
Block a user