mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-02-11 11:57:05 +05:00
Compare commits
29 Commits
069ba8e864
...
passive_bl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67adb3b9cf | ||
|
|
ced0385d5b | ||
|
|
7fcca3c4aa | ||
|
|
2f6bd237c7 | ||
|
|
e4d1ba7d7b | ||
|
|
aae53d605a | ||
|
|
de9276d04e | ||
|
|
cb8cd7c26e | ||
|
|
74e321cc1e | ||
|
|
80e2d8e939 | ||
|
|
b70c212235 | ||
|
|
781b2a1f9c | ||
|
|
1e83f284cb | ||
|
|
27baf675e5 | ||
|
|
1fdc06fce6 | ||
|
|
725185beba | ||
|
|
c6518db0d3 | ||
|
|
10ab75c055 | ||
|
|
c39eeee9cf | ||
|
|
f2fe6036c2 | ||
|
|
40dc863530 | ||
|
|
a40413aeac | ||
|
|
9a045bfc40 | ||
|
|
c78d2d0c0b | ||
|
|
b7825111bb | ||
|
|
d5691ef8f7 | ||
|
|
0213582464 | ||
|
|
396dc7f7e3 | ||
|
|
9d38525251 |
@@ -1,5 +1,5 @@
|
|||||||
# Blueprint for reporting indoor/outdoor temperature to OpenTherm Gateway from any home assistant sensor
|
# Blueprint for reporting indoor/outdoor temperature to OpenTherm Gateway from any home assistant sensor
|
||||||
# Updated: 03.09.2024
|
# Updated: 26.01.2026
|
||||||
|
|
||||||
blueprint:
|
blueprint:
|
||||||
name: Report temp to OpenTherm Gateway
|
name: Report temp to OpenTherm Gateway
|
||||||
@@ -15,7 +15,6 @@ blueprint:
|
|||||||
multiple: false
|
multiple: false
|
||||||
filter:
|
filter:
|
||||||
- domain: sensor
|
- domain: sensor
|
||||||
device_class: temperature
|
|
||||||
target_entity:
|
target_entity:
|
||||||
name: Target entity
|
name: Target entity
|
||||||
description: "Usually ``number.opentherm_indoor_temp`` or ``number.opentherm_outdoor_temp``"
|
description: "Usually ``number.opentherm_indoor_temp`` or ``number.opentherm_outdoor_temp``"
|
||||||
@@ -38,8 +37,12 @@ condition:
|
|||||||
value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
|
value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
|
||||||
action:
|
action:
|
||||||
- if:
|
- if:
|
||||||
|
- condition: or
|
||||||
|
conditions:
|
||||||
- condition: template
|
- condition: template
|
||||||
value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
|
value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
|
||||||
|
- condition: template
|
||||||
|
value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
|
||||||
then:
|
then:
|
||||||
- service: number.set_value
|
- service: number.set_value
|
||||||
data:
|
data:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
|
# Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
|
||||||
# Updated: 03.09.2024
|
# Updated: 26.01.2026
|
||||||
|
|
||||||
blueprint:
|
blueprint:
|
||||||
name: Report temp to OpenTherm Gateway from Weather
|
name: Report temp to OpenTherm Gateway from Weather
|
||||||
@@ -37,8 +37,12 @@ condition:
|
|||||||
value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
|
value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
|
||||||
action:
|
action:
|
||||||
- if:
|
- if:
|
||||||
|
- condition: or
|
||||||
|
conditions:
|
||||||
- condition: template
|
- condition: template
|
||||||
value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
|
value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
|
||||||
|
- condition: template
|
||||||
|
value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
|
||||||
then:
|
then:
|
||||||
- service: number.set_value
|
- service: number.set_value
|
||||||
data:
|
data:
|
||||||
|
|||||||
306
platformio.ini
306
platformio.ini
@@ -1,25 +1,13 @@
|
|||||||
; PlatformIO Project Configuration File
|
|
||||||
;
|
|
||||||
; Build options: build flags, source filter
|
|
||||||
; Upload options: custom upload port, speed and extra flags
|
|
||||||
; Library options: dependencies, extra library storages
|
|
||||||
; Advanced options: extra scripting
|
|
||||||
;
|
|
||||||
; Please visit documentation for the other options and examples
|
|
||||||
; https://docs.platformio.org/page/projectconf.html
|
|
||||||
|
|
||||||
[platformio]
|
[platformio]
|
||||||
;extra_configs = secrets.ini
|
;extra_configs = secrets.ini
|
||||||
extra_configs = secrets.default.ini
|
extra_configs = secrets.default.ini
|
||||||
core_dir = .pio
|
core_dir = .pio
|
||||||
|
|
||||||
[env]
|
[env]
|
||||||
version = 1.6.0
|
version = 1.6.0-passiveble
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps =
|
lib_deps = ESP32Async/AsyncTCP@^3.4.10
|
||||||
ESP32Async/AsyncTCP
|
ESP32Async/ESPAsyncWebServer@^3.9.4
|
||||||
;ESP32Async/ESPAsyncWebServer
|
|
||||||
https://github.com/ESP32Async/ESPAsyncWebServer#main
|
|
||||||
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
|
||||||
@@ -28,12 +16,15 @@ lib_deps =
|
|||||||
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 =
|
build_flags = -mtext-section-literals
|
||||||
-mtext-section-literals
|
-Wno-deprecated-declarations
|
||||||
-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
|
-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
|
||||||
;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
|
;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
|
||||||
-D BUILD_VERSION='"${this.version}"'
|
-D BUILD_VERSION='"${this.version}"'
|
||||||
@@ -62,57 +53,53 @@ build_flags =
|
|||||||
upload_speed = 921600
|
upload_speed = 921600
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
;monitor_filters = direct
|
;monitor_filters = direct
|
||||||
monitor_filters =
|
monitor_filters = esp32_exception_decoder
|
||||||
esp32_exception_decoder
|
|
||||||
esp8266_exception_decoder
|
|
||||||
board_build.flash_mode = dio
|
board_build.flash_mode = dio
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
check_tool = ;pvs-studio
|
check_tool = ;pvs-studio
|
||||||
check_flags =
|
check_flags = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
|
||||||
; pvs-studio:
|
|
||||||
; --analysis-mode=4
|
|
||||||
; --exclude-path=./.pio/libdeps
|
|
||||||
|
|
||||||
; Defaults
|
; 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]
|
[esp32_defaults]
|
||||||
;platform = espressif32@^6.7
|
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
|
||||||
;platform = https://github.com/platformio/platform-espressif32.git
|
|
||||||
;platform_packages =
|
|
||||||
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
|
|
||||||
; framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
|
|
||||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/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 =
|
lib_deps = ${env.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 =
|
lib_ignore = ${env.lib_ignore}
|
||||||
extra_scripts =
|
BluetoothSerial
|
||||||
post:tools/esp32.py
|
SimpleBLE
|
||||||
|
ESP RainMaker
|
||||||
|
RainMaker
|
||||||
|
ESP Insights
|
||||||
|
Insights
|
||||||
|
Zigbee
|
||||||
|
Matter
|
||||||
|
OpenThread
|
||||||
|
dsp
|
||||||
|
custom_component_remove = espressif/esp_hosted
|
||||||
|
espressif/esp_wifi_remote
|
||||||
|
espressif/esp-dsp
|
||||||
|
espressif/esp_modem
|
||||||
|
espressif/esp_rainmaker
|
||||||
|
espressif/rmaker_common
|
||||||
|
espressif/esp_insights
|
||||||
|
espressif/esp_diag_data_store
|
||||||
|
espressif/esp_diagnostics
|
||||||
|
espressif/libsodium
|
||||||
|
espressif/esp-modbus
|
||||||
|
espressif/esp-cbor
|
||||||
|
espressif/esp-sr
|
||||||
|
espressif/esp32-camera
|
||||||
|
espressif/qrcode
|
||||||
|
espressif/esp-zboss-lib
|
||||||
|
espressif/esp-zigbee-lib
|
||||||
|
chmorgan/esp-libhelix-mp3
|
||||||
|
extra_scripts = post:tools/esp32.py
|
||||||
post:tools/build.py
|
post:tools/build.py
|
||||||
build_type = ${env.build_type}
|
build_type = ${env.build_type}
|
||||||
build_flags =
|
build_flags = ${env.build_flags}
|
||||||
${env.build_flags}
|
|
||||||
-D CORE_DEBUG_LEVEL=0
|
-D CORE_DEBUG_LEVEL=0
|
||||||
-Wl,--wrap=esp_panic_handler
|
-Wl,--wrap=esp_panic_handler
|
||||||
check_tool = ${env.check_tool}
|
check_tool = ${env.check_tool}
|
||||||
@@ -120,99 +107,11 @@ check_flags = ${env.check_flags}
|
|||||||
|
|
||||||
|
|
||||||
; Boards
|
; Boards
|
||||||
[env:d1_mini]
|
|
||||||
platform = ${esp8266_defaults.platform}
|
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
|
||||||
board = d1_mini
|
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
|
||||||
build_type = ${esp8266_defaults.build_type}
|
|
||||||
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
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:d1_mini_lite]
|
|
||||||
platform = ${esp8266_defaults.platform}
|
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
|
||||||
board = d1_mini_lite
|
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
|
||||||
build_type = ${esp8266_defaults.build_type}
|
|
||||||
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
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:d1_mini_pro]
|
|
||||||
platform = ${esp8266_defaults.platform}
|
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
|
||||||
board = d1_mini_pro
|
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
|
||||||
build_type = ${esp8266_defaults.build_type}
|
|
||||||
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
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:nodemcu_8266]
|
|
||||||
platform = ${esp8266_defaults.platform}
|
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
|
||||||
board = nodemcuv2
|
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
|
||||||
build_type = ${esp8266_defaults.build_type}
|
|
||||||
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
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:s2_mini]
|
[env:s2_mini]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = lolin_s2_mini
|
board = lolin_s2_mini
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
build_unflags = -DARDUINO_USB_MODE=1
|
||||||
lib_deps = ${esp32_defaults.lib_deps}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
|
||||||
build_unflags =
|
|
||||||
-DARDUINO_USB_MODE=1
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
build_flags =
|
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D ARDUINO_USB_MODE=0
|
-D ARDUINO_USB_MODE=0
|
||||||
-D ARDUINO_USB_CDC_ON_BOOT=1
|
-D ARDUINO_USB_CDC_ON_BOOT=1
|
||||||
-D DEFAULT_OT_IN_GPIO=33
|
-D DEFAULT_OT_IN_GPIO=33
|
||||||
@@ -221,24 +120,14 @@ build_flags =
|
|||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=7
|
-D DEFAULT_SENSOR_INDOOR_GPIO=7
|
||||||
-D DEFAULT_STATUS_LED_GPIO=11
|
-D DEFAULT_STATUS_LED_GPIO=11
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=12
|
-D DEFAULT_OT_RX_LED_GPIO=12
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:s3_mini]
|
[env:s3_mini]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = lolin_s3_mini
|
board = lolin_s3_mini
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
lib_deps =
|
|
||||||
${esp32_defaults.lib_deps}
|
|
||||||
${esp32_defaults.nimble_lib}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
build_unflags = -DARDUINO_USB_MODE=1
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
build_unflags =
|
|
||||||
-DARDUINO_USB_MODE=1
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
build_flags =
|
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D ARDUINO_USB_MODE=0
|
-D ARDUINO_USB_MODE=0
|
||||||
-D ARDUINO_USB_CDC_ON_BOOT=1
|
-D ARDUINO_USB_CDC_ON_BOOT=1
|
||||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
||||||
@@ -249,24 +138,14 @@ build_flags =
|
|||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=12
|
-D DEFAULT_SENSOR_INDOOR_GPIO=12
|
||||||
-D DEFAULT_STATUS_LED_GPIO=11
|
-D DEFAULT_STATUS_LED_GPIO=11
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=10
|
-D DEFAULT_OT_RX_LED_GPIO=10
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:c3_mini]
|
[env:c3_mini]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = lolin_c3_mini
|
board = lolin_c3_mini
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
lib_deps =
|
|
||||||
${esp32_defaults.lib_deps}
|
|
||||||
${esp32_defaults.nimble_lib}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
build_unflags = -mtext-section-literals
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
build_unflags =
|
|
||||||
-mtext-section-literals
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
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
|
||||||
@@ -275,22 +154,13 @@ build_flags =
|
|||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=1
|
-D DEFAULT_SENSOR_INDOOR_GPIO=1
|
||||||
-D DEFAULT_STATUS_LED_GPIO=4
|
-D DEFAULT_STATUS_LED_GPIO=4
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=5
|
-D DEFAULT_OT_RX_LED_GPIO=5
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:nodemcu_32]
|
[env:nodemcu_32]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = nodemcu-32s
|
board = nodemcu-32s
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
lib_deps =
|
|
||||||
${esp32_defaults.lib_deps}
|
|
||||||
${esp32_defaults.nimble_lib}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
build_flags =
|
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D USE_BLE=1
|
-D USE_BLE=1
|
||||||
-D DEFAULT_OT_IN_GPIO=16
|
-D DEFAULT_OT_IN_GPIO=16
|
||||||
-D DEFAULT_OT_OUT_GPIO=4
|
-D DEFAULT_OT_OUT_GPIO=4
|
||||||
@@ -298,26 +168,17 @@ build_flags =
|
|||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=26
|
-D DEFAULT_SENSOR_INDOOR_GPIO=26
|
||||||
-D DEFAULT_STATUS_LED_GPIO=2
|
-D DEFAULT_STATUS_LED_GPIO=2
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=19
|
-D DEFAULT_OT_RX_LED_GPIO=19
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:nodemcu_32_160mhz]
|
[env:nodemcu_32_160mhz]
|
||||||
extends = env:nodemcu_32
|
extends = env:nodemcu_32
|
||||||
board_build.f_cpu = 160000000L ; set frequency to 160MHz
|
board_build.f_cpu = 160000000L ; set frequency to 160MHz
|
||||||
|
|
||||||
[env:d1_mini32]
|
[env:d1_mini32]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = wemos_d1_mini32
|
board = wemos_d1_mini32
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
lib_deps =
|
|
||||||
${esp32_defaults.lib_deps}
|
|
||||||
${esp32_defaults.nimble_lib}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
build_flags =
|
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D USE_BLE=1
|
-D USE_BLE=1
|
||||||
-D DEFAULT_OT_IN_GPIO=21
|
-D DEFAULT_OT_IN_GPIO=21
|
||||||
-D DEFAULT_OT_OUT_GPIO=22
|
-D DEFAULT_OT_OUT_GPIO=22
|
||||||
@@ -325,29 +186,14 @@ build_flags =
|
|||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=18
|
-D DEFAULT_SENSOR_INDOOR_GPIO=18
|
||||||
-D DEFAULT_STATUS_LED_GPIO=2
|
-D DEFAULT_STATUS_LED_GPIO=2
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=19
|
-D DEFAULT_OT_RX_LED_GPIO=19
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:esp32_c6]
|
[env:esp32_c6]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
framework = arduino, espidf
|
board = esp32-c6-devkitc-1
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = esp32-c6-devkitm-1
|
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
|
||||||
board_build.embed_txtfiles =
|
|
||||||
managed_components/espressif__esp_insights/server_certs/https_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
|
|
||||||
lib_deps = ${esp32_defaults.lib_deps}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
lib_ignore =
|
${esp32_defaults.nimble_lib}
|
||||||
${esp32_defaults.lib_ignore}
|
build_unflags = -mtext-section-literals
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
build_unflags =
|
|
||||||
-mtext-section-literals
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
build_flags =
|
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D USE_BLE=1
|
-D USE_BLE=1
|
||||||
-D DEFAULT_OT_IN_GPIO=15
|
-D DEFAULT_OT_IN_GPIO=15
|
||||||
-D DEFAULT_OT_OUT_GPIO=23
|
-D DEFAULT_OT_OUT_GPIO=23
|
||||||
@@ -355,24 +201,14 @@ build_flags =
|
|||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=0
|
-D DEFAULT_SENSOR_INDOOR_GPIO=0
|
||||||
-D DEFAULT_STATUS_LED_GPIO=11
|
-D DEFAULT_STATUS_LED_GPIO=11
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=10
|
-D DEFAULT_OT_RX_LED_GPIO=10
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:otthing]
|
[env:otthing]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
|
||||||
board = lolin_c3_mini
|
board = lolin_c3_mini
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
lib_deps =
|
|
||||||
${esp32_defaults.lib_deps}
|
|
||||||
${esp32_defaults.nimble_lib}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
build_unflags = -mtext-section-literals
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
build_unflags =
|
|
||||||
-mtext-section-literals
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
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
|
||||||
@@ -382,5 +218,3 @@ build_flags =
|
|||||||
-D DEFAULT_STATUS_LED_GPIO=8
|
-D DEFAULT_STATUS_LED_GPIO=8
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=2
|
-D DEFAULT_OT_RX_LED_GPIO=2
|
||||||
-D OT_BYPASS_RELAY_GPIO=20
|
-D OT_BYPASS_RELAY_GPIO=20
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|||||||
@@ -49,6 +49,10 @@ protected:
|
|||||||
return "Main";
|
return "Main";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint32_t getTaskStackSize() override {
|
||||||
|
return 6000;
|
||||||
|
}
|
||||||
|
|
||||||
/*BaseType_t getTaskCore() override {
|
/*BaseType_t getTaskCore() override {
|
||||||
return 1;
|
return 1;
|
||||||
}*/
|
}*/
|
||||||
@@ -128,8 +132,6 @@ protected:
|
|||||||
tMqtt->disable();
|
tMqtt->disable();
|
||||||
}
|
}
|
||||||
|
|
||||||
Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (this->ntpStarted) {
|
if (this->ntpStarted) {
|
||||||
this->ntpStarted = false;
|
this->ntpStarted = false;
|
||||||
|
|||||||
@@ -38,8 +38,12 @@ protected:
|
|||||||
return "OpenTherm";
|
return "OpenTherm";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint32_t getTaskStackSize() override {
|
||||||
|
return 7500;
|
||||||
|
}
|
||||||
|
|
||||||
BaseType_t getTaskCore() override {
|
BaseType_t getTaskCore() override {
|
||||||
return 1;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int getTaskPriority() override {
|
int getTaskPriority() override {
|
||||||
|
|||||||
@@ -172,8 +172,19 @@ protected:
|
|||||||
sensorSettingsToJson(sensorId, Sensors::settings[sensorId], sensorsettingsDoc);
|
sensorSettingsToJson(sensorId, Sensors::settings[sensorId], sensorsettingsDoc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char filename[64];
|
||||||
|
getFilename(filename, sizeof(filename), "backup");
|
||||||
|
|
||||||
|
char contentDispositionValue[128];
|
||||||
|
snprintf_P(
|
||||||
|
contentDispositionValue,
|
||||||
|
sizeof(contentDispositionValue),
|
||||||
|
PSTR("attachment; filename=\"%s\""),
|
||||||
|
filename
|
||||||
|
);
|
||||||
|
|
||||||
// send response
|
// send response
|
||||||
response->addHeader("Content-Disposition", "attachment; filename=\"backup.json\"");
|
response->addHeader("Content-Disposition", contentDispositionValue);
|
||||||
response->setLength();
|
response->setLength();
|
||||||
request->send(response);
|
request->send(response);
|
||||||
}).addMiddleware(&authMiddleware);
|
}).addMiddleware(&authMiddleware);
|
||||||
@@ -624,8 +635,19 @@ protected:
|
|||||||
docCrash[FPSTR(S_EPC)] = epcStr;
|
docCrash[FPSTR(S_EPC)] = epcStr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
char filename[64];
|
||||||
|
getFilename(filename, sizeof(filename), "debug");
|
||||||
|
|
||||||
|
char contentDispositionValue[128];
|
||||||
|
snprintf_P(
|
||||||
|
contentDispositionValue,
|
||||||
|
sizeof(contentDispositionValue),
|
||||||
|
PSTR("attachment; filename=\"%s\""),
|
||||||
|
filename
|
||||||
|
);
|
||||||
|
|
||||||
// send response
|
// send response
|
||||||
response->addHeader("Content-Disposition", "attachment; filename=\"debug.json\"");
|
response->addHeader("Content-Disposition", contentDispositionValue);
|
||||||
response->setLength();
|
response->setLength();
|
||||||
request->send(response);
|
request->send(response);
|
||||||
}).addMiddleware(&authMiddleware);
|
}).addMiddleware(&authMiddleware);
|
||||||
@@ -783,4 +805,12 @@ protected:
|
|||||||
this->dnsServer->stop();
|
this->dnsServer->stop();
|
||||||
this->dnsServerEnabled = false;
|
this->dnsServerEnabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void getFilename(char* filename, size_t maxSizeFilename, const char* type) {
|
||||||
|
const time_t now = time(nullptr);
|
||||||
|
const tm* localNow = localtime(&now);
|
||||||
|
char localNowValue[20];
|
||||||
|
strftime(localNowValue, sizeof(localNowValue), PSTR("%Y-%m-%d-%H-%M-%S"), localNow);
|
||||||
|
snprintf_P(filename, maxSizeFilename, PSTR("%s_%s_%s.json"), networkSettings.hostname, localNowValue, type);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
@@ -20,6 +20,10 @@ protected:
|
|||||||
return "Regulator";
|
return "Regulator";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint32_t getTaskStackSize() override {
|
||||||
|
return 5000;
|
||||||
|
}
|
||||||
|
|
||||||
/*BaseType_t getTaskCore() override {
|
/*BaseType_t getTaskCore() override {
|
||||||
return 1;
|
return 1;
|
||||||
}*/
|
}*/
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
19
src/utils.h
19
src/utils.h
@@ -2099,21 +2099,18 @@ bool jsonToSensorResult(const uint8_t sensorId, const JsonVariantConst src) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto& dst = Sensors::results[sensorId];
|
|
||||||
bool changed = false;
|
|
||||||
|
|
||||||
// value
|
// value
|
||||||
if (!src[FPSTR(S_VALUE)].isNull()) {
|
if (!src[FPSTR(S_VALUE)].isNull()) {
|
||||||
float value = src[FPSTR(S_VALUE)].as<float>();
|
return Sensors::setValueById(
|
||||||
|
sensorId,
|
||||||
uint8_t vType = static_cast<uint8_t>(Sensors::ValueType::PRIMARY);
|
src[FPSTR(S_VALUE)].as<float>(),
|
||||||
if (fabsf(value - dst.values[vType]) > 0.0001f) {
|
Sensors::ValueType::PRIMARY,
|
||||||
dst.values[vType] = roundf(value, 2);
|
true,
|
||||||
changed = true;
|
true
|
||||||
}
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return changed;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void varsToJson(const Variables& src, JsonVariant dst) {
|
void varsToJson(const Variables& src, JsonVariant dst) {
|
||||||
|
|||||||
Reference in New Issue
Block a user