Merge 24342db40e into 9217bb7448

Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v9...v10)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-version: '10'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/pio-dependabot.yaml

@@ -15,7 +15,7 @@ jobs:
     name: run PlatformIO Dependabot
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: run PlatformIO Dependabot
         uses: peterus/platformio_dependabot@v1.2.0
         with:

.github/workflows/stale.yaml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           stale-issue-message: >
             This issue is stale because it has been open 15 days with no activity. Remove stale label or comment or this will be closed in 5 days.

.gitignore

@@ -1,5 +1,6 @@
 .pio
 .vscode
+.PVS-Studio
 build/*
 data/*
 managed_components/*

README.md

@@ -71,5 +71,10 @@ All available information and instructions can be found in the wiki:
       * [Connection](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#connection)
       * [Leds on board](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#leds-on-board)
 
-___
+## Gratitude
-This project is tested with BrowserStack.
+* To the developers of the libraries used: [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library), [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler), [ArduinoJson](https://github.com/bblanchon/ArduinoJson), [NimBLE-Arduino](https://github.com/h2zero/NimBLE-Arduino), [ArduinoMqttClient](https://github.com/arduino-libraries/ArduinoMqttClient), [ESPTelnet](https://github.com/LennartHennigs/ESPTelnet), [FileData](https://github.com/GyverLibs/FileData), [GyverPID](https://github.com/GyverLibs/GyverPID), [GyverBlinker](https://github.com/GyverLibs/GyverBlinker), [FileData](https://github.com/GyverLibs/FileData), [OneWireNg](https://github.com/pstolarz/OneWireNg) & [OneWire](https://github.com/PaulStoffregen/OneWire)
+* To the [PlatformIO](https://platformio.org/) Team
+* To the team and contributors of the [pioarduino](https://github.com/pioarduino/platform-espressif32) project
+* To the [BrowserStack](https://www.browserstack.com/) team. This project is tested with BrowserStack.
+* To the [PVS-Studio](https://pvs-studio.com/pvs-studio/?utm_source=website&utm_medium=github&utm_campaign=open_source) - static analyzer for C, C++, C#, and Java code.
+* And of course to the contributors for their contribution to the development of the project!

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -106,6 +106,11 @@ public:
     return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
+  static bool isCh2Active(unsigned long response)
+  {
+      return response & 0x20;
+  }
+
   static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
     byte responseId = (response >> 16) & 0xFF;
 

platformio.ini

@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
 core_dir = .pio
 
 [env]
-version = 1.5.5
+version = 1.5.6
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.3.0
@@ -60,10 +60,16 @@ monitor_filters =
 	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
@@ -77,6 +83,8 @@ build_flags =
 	;-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 = espressif32@^6.7
@@ -84,8 +92,8 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;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/54.03.20/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip
-platform_packages =
+platform_packages = ${env.platform_packages}
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
@@ -100,11 +108,14 @@ build_flags =
 	${env.build_flags}
 	-D CORE_DEBUG_LEVEL=0
 	-Wl,--wrap=esp_panic_handler
+check_tool = ${env.check_tool}
+check_flags = ${env.check_flags}
 
 
 ; 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}
@@ -119,9 +130,12 @@ build_flags =
 	-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}
@@ -136,9 +150,12 @@ build_flags =
 	-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}
@@ -153,9 +170,12 @@ build_flags =
 	-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}
@@ -170,6 +190,8 @@ build_flags =
 	-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]
 platform = ${esp32_defaults.platform}
@@ -192,6 +214,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=7
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=12
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
 
 [env:s3_mini] 
 platform = ${esp32_defaults.platform}
@@ -218,6 +242,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=12
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=10
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
 
 [env:c3_mini] 
 platform = ${esp32_defaults.platform}
@@ -242,6 +268,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=1
 	-D DEFAULT_STATUS_LED_GPIO=4
 	-D DEFAULT_OT_RX_LED_GPIO=5
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
 
 [env:nodemcu_32]
 platform = ${esp32_defaults.platform}
@@ -263,6 +291,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=26
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=19
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
 
 [env:d1_mini32]
 platform = ${esp32_defaults.platform}
@@ -284,6 +314,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=18
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=19
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
 
 [env:esp32_c6]
 platform = ${esp32_defaults.platform}
@@ -312,6 +344,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=0
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=10
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
 
 [env:otthing] 
 platform = ${esp32_defaults.platform}
@@ -337,3 +371,5 @@ build_flags =
 	-D DEFAULT_STATUS_LED_GPIO=8
 	-D DEFAULT_OT_RX_LED_GPIO=2
 	-D OT_BYPASS_RELAY_GPIO=20
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}

src/HaHelper.h

@@ -418,25 +418,26 @@ public:
 
 
   bool publishSwitchHeatingTurbo(bool enabledByDefault = true) {
-    JsonDocument doc;
+    return publishSwitch( 
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
+      F("heating_turbo"),
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+      F("Turbo heating"),
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo"));
+      F("mdi:rocket-launch-outline"),
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+      F("{{ value_json.heating.turbo }}"),
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
+      F("{\"heating\": {\"turbo\" : true}}"),
-    doc[FPSTR(HA_NAME)] = F("Turbo heating");
+      F("{\"heating\": {\"turbo\" : false}}"),
-    doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
+      enabledByDefault
-    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
+    );
-    doc[FPSTR(HA_STATE_ON)] = true;
+  }
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.turbo }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"heating\": {\"turbo\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"heating\": {\"turbo\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo")).c_str(), doc);
+  bool publishSwitchExtDevice(const String& caption, bool enabledByDefault = true) {
+    return publishSwitch(
+      F("extdev"), 
+      caption, 
+      F("mdi:toggle-switch-outline"),
+      F("{{ value_json.externalDev.state }}"),
+      F("{\"externalDev\": {\"state\" : true}}"), 
+      F("{\"externalDev\": {\"state\" : false}}"),
+      enabledByDefault );
   }
 
   bool publishInputHeatingHysteresis(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
@@ -634,27 +635,19 @@ public:
 
 
   bool publishSwitchPid(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
-    doc[FPSTR(HA_NAME)] = F("PID");
-    doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.enabled }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"pid\": {\"enabled\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"pid\": {\"enabled\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("pid")).c_str(), doc);
+    return publishSwitch( 
+      F("pid"),
+      F("PID"),
+      F("mdi:chart-bar-stacked"),
+      F("{{ value_json.pid.enabled }}"),
+      F("{\"pid\": {\"enabled\" : true}}"),
+      F("{\"pid\": {\"enabled\" : false}}"),
+      enabledByDefault
+    );
   }
   
+
   bool publishInputPidFactorP(bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
@@ -819,25 +812,16 @@ public:
 
 
   bool publishSwitchEquitherm(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
-    doc[FPSTR(HA_NAME)] = F("Equitherm");
-    doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.enabled }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"equitherm\": {\"enabled\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"equitherm\": {\"enabled\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("equitherm")).c_str(), doc);
+    return publishSwitch( 
+      F("equitherm"),
+      F("Equitherm"),
+      F("mdi:sun-snowflake-variant"),
+      F("{{ value_json.equitherm.enabled }}"),
+      F("{\"equitherm\": {\"enabled\" : true}}"),
+      F("{\"equitherm\": {\"enabled\" : false}}"),
+      enabledByDefault
+    );
   }
 
   bool publishInputEquithermFactorN(bool enabledByDefault = true) {
@@ -967,126 +951,87 @@ public:
   }
 
   bool publishHeatingState(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
-    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
-    doc[FPSTR(HA_NAME)] = F("Heating");
-    doc[FPSTR(HA_ICON)] = F("mdi:radiator");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.heating.active, 'ON', 'OFF') }}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating")).c_str(), doc);
+    return publishBinarySensorState(
+      F("heating"),
+      F("Heating"),
+      F("mdi:radiator"),
+      F("{{ iif(value_json.slave.heating.active, 'ON', 'OFF') }}"),
+      F("running"),
+      enabledByDefault
+    );
   }
 
   bool publishDhwState(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
-    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
-    doc[FPSTR(HA_NAME)] = F("DHW");
-    doc[FPSTR(HA_ICON)] = F("mdi:faucet");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.dhw.active, 'ON', 'OFF') }}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw")).c_str(), doc);
+    return publishBinarySensorState(
+      F("dhw"),
+      F("DHW"),
+      F("mdi:faucet"),
+      F("{{ iif(value_json.slave.dhw.active, 'ON', 'OFF') }}"),
+      F("running"),
+      enabledByDefault
+    );
   }
 
   bool publishFlameState(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
-    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("flame"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
-    doc[FPSTR(HA_NAME)] = F("Flame");
-    doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.flame, 'ON', 'OFF') }}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame")).c_str(), doc);
+    return publishBinarySensorState(
+      F("flame"),
+      F("Flame"),
+      F("mdi:gas-burner"),
+      F("{{ iif(value_json.slave.flame, 'ON', 'OFF') }}"),
+      F("running"),
+      enabledByDefault
+    );
   }
 
   bool publishFaultState(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
-    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
-    doc[FPSTR(HA_NAME)] = F("Fault");
-    doc[FPSTR(HA_ICON)] = F("mdi:alert-remove-outline");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.fault.active, 'ON', 'OFF') }}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault")).c_str(), doc);
+    return publishBinarySensorState(
+      F("fault"),
+      F("Fault"),
+      F("mdi:alert-remove-outline"),
+      F("{{ iif(value_json.slave.fault.active, 'ON', 'OFF') }}"),
+      F("problem"),
+      enabledByDefault
+    );
   }
 
   bool publishDiagState(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
-    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
-    doc[FPSTR(HA_NAME)] = F("Diagnostic");
-    doc[FPSTR(HA_ICON)] = F("mdi:account-wrench");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.diag.active, 'ON', 'OFF') }}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
     
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC)).c_str(), doc);
+    return publishBinarySensorState(
+      F("diag"),
+      F("Diagnostic"),
+      F("mdi:account-wrench"),
+      F("{{ iif(value_json.slave.diag.active, 'ON', 'OFF') }}"),
+      F("problem"),
+      enabledByDefault
+    );
   }
 
   bool publishExternalPumpState(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ext_pump"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
-    doc[FPSTR(HA_NAME)] = F("External pump");
-    doc[FPSTR(HA_ICON)] = F("mdi:pump");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.master.externalPump.state, 'ON', 'OFF') }}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
 
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump")).c_str(), doc);
+    return publishBinarySensorState(
+      F("ext_pump"),
+      F("External pump"),
+      F("mdi:pump"),
+      F("{{ iif(value_json.master.externalPump.state, 'ON', 'OFF') }}"),
+      F("running"),
+      enabledByDefault
+    );
+  }
+
+  bool publishExtDevState(const String& caption,  bool enabledByDefault = true) {
+    
+    return publishBinarySensorState(
+      F("extdev"), 
+      caption,
+      F("mdi:toggle-switch"),
+      F("{{ iif(value_json.master.externalDev.state, 'ON', 'OFF') }}"),
+      F("running"),
+      enabledByDefault
+    );
   }
 
   bool publishFaultCode(bool enabledByDefault = true) {
@@ -1357,6 +1302,79 @@ public:
   protected:
     unsigned short expireAfter = 300u;
     String statusTopic, stateTopic, setStateTopic, settingsTopic, setSettingsTopic;
+
+    void initCommonDocFields(JsonDocument& doc, 
+                              const String& uniqueId, 
+                              const String& name, 
+                              const String& icon, 
+                              const String& stateTopic, 
+                              const String& entityCategory,
+                              bool enabledByDefault) {
+        
+        doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+        doc[FPSTR(HA_UNIQUE_ID)] = uniqueId;
+        doc[FPSTR(HA_OBJECT_ID)] = uniqueId;
+        doc[FPSTR(HA_ENTITY_CATEGORY)] = entityCategory;
+        doc[FPSTR(HA_NAME)] = name;
+        doc[FPSTR(HA_ICON)] = icon;
+        doc[FPSTR(HA_STATE_TOPIC)] = stateTopic;
+        doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
+    }
+
+    bool publishSwitch(const String& id,
+                       const String& name,
+                       const String& icon,
+                       const String& valueTemplate,
+                       const String& payloadOn,
+                       const String& payloadOff,
+                       bool enabledByDefault) {
+      JsonDocument doc;
+      initCommonDocFields(doc, 
+                        this->getObjectIdWithPrefix(id), 
+                        name, 
+                        icon, 
+                        this->settingsTopic.c_str(),
+                        FPSTR(HA_ENTITY_CATEGORY_CONFIG), 
+                        enabledByDefault );
+                        
+      doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str(); 
+      doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
+      doc[FPSTR(HA_VALUE_TEMPLATE)] = valueTemplate;
+      doc[FPSTR(HA_STATE_ON)] = true;
+      doc[FPSTR(HA_STATE_OFF)] = false;
+      doc[FPSTR(HA_PAYLOAD_ON)] = payloadOn;
+      doc[FPSTR(HA_PAYLOAD_OFF)] = payloadOff;
+      doc.shrinkToFit();
+      return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), id).c_str(), doc);
+    }
+
+    bool publishBinarySensorState(const String& id,
+                                  const String& name,
+                                  const String& icon,
+                                  const String& valueTemplate,
+                                  const String& deviceClass,
+                                  bool enabledByDefault) {
+      JsonDocument doc;
+      initCommonDocFields(doc, 
+                        this->getObjectIdWithPrefix(id), 
+                        name, 
+                        icon, 
+                        this->stateTopic.c_str(),
+                        FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC), 
+                        enabledByDefault );
+
+      doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
+      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
+      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
+      doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
+
+      doc[FPSTR(HA_DEVICE_CLASS)] = deviceClass;
+      doc[FPSTR(HA_VALUE_TEMPLATE)] = valueTemplate;
+      
+      doc.shrinkToFit();
+      return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), id).c_str(), doc);
+    }
+  
 };
 
 const char HaHelper::AVAILABILITY_OT_CONN[] = "{{ iif(value_json.slave.connected, 'online', 'offline') }}";

src/MainTask.h

@@ -29,6 +29,7 @@ protected:
   enum class PumpStartReason {NONE, HEATING, ANTISTUCK};
 
   Blinker* blinker = nullptr;
+  unsigned long miscRunned = 0;
   unsigned long lastHeapInfo = 0;
   unsigned int minFreeHeap = 0;
   unsigned int minMaxFreeBlockHeap = 0;
@@ -42,6 +43,8 @@ protected:
   bool telnetStarted = false;
   bool emergencyDetected = false;
   unsigned long emergencyFlipTime = 0;
+  bool freezeDetected = false;
+  unsigned long freezeDetectedTime = 0;
 
   #if defined(ARDUINO_ARCH_ESP32)
   const char* getTaskName() override {
@@ -150,17 +153,16 @@ protected:
 
       Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, false, false);
     }
-    this->yield();
 
-    this->emergency();
+    this->yield();
+    if (this->misc()) {
+      this->yield();
+    }
     this->ledStatus();
-    this->cascadeControl();
-    this->externalPump();
-    this->yield();
-
 
     // telnet
     if (this->telnetStarted) {
+      this->yield();
       telnetStream->loop();
       this->yield();
     }
@@ -179,14 +181,28 @@ protected:
 
     // heap info
     this->heap();
+  }
 
+  bool misc() {
+    if (millis() - this->miscRunned < 1000) {
+      return false;
+    }
 
-    // restart
+    // restart if required
     if (this->restartSignalReceived && millis() - this->restartSignalReceivedTime > 15000) {
       this->restartSignalReceived = false;
 
       ESP.restart();
     }
+
+    this->heating();
+    this->emergency();
+    this->cascadeControl();
+    this->externalPump();
+    this->externalDev();
+    this->miscRunned = millis();
+    
+    return true;
   }
 
   void heap() {
@@ -228,6 +244,65 @@ protected:
     }
   }
 
+  void heating() {
+    // freeze protection
+    if (!settings.heating.enabled) {
+      float lowTemp = 255.0f;
+      uint8_t availableSensors = 0;
+
+      if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::INDOOR_TEMP, Sensors::ValueType::PRIMARY);
+        if (value < lowTemp) {
+          lowTemp = value;
+        }
+        
+        availableSensors++;
+      }
+
+      if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::HEATING_TEMP)) {
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::HEATING_TEMP, Sensors::ValueType::PRIMARY);
+        if (value < lowTemp) {
+          lowTemp = value;
+        }
+        
+        availableSensors++;
+      }
+
+      if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::HEATING_RETURN_TEMP)) {
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::HEATING_RETURN_TEMP, Sensors::ValueType::PRIMARY);
+        if (value < lowTemp) {
+          lowTemp = value;
+        }
+
+        availableSensors++;
+      }
+
+      if (availableSensors && lowTemp <= settings.heating.freezeProtection.lowTemp) {
+        if (!this->freezeDetected) {
+          this->freezeDetected = true;
+          this->freezeDetectedTime = millis();
+
+        } else if (millis() - this->freezeDetectedTime > (settings.heating.freezeProtection.thresholdTime * 1000)) {
+          this->freezeDetected = false;
+          settings.heating.enabled = true;
+          fsSettings.update();
+
+          Log.sinfoln(
+            FPSTR(L_MAIN),
+            F("Heating turned on by freeze protection, current low temp: %.2f, threshold: %hhu"),
+            lowTemp, settings.heating.freezeProtection.lowTemp
+          );
+        }
+
+      } else if (this->freezeDetected) {
+        this->freezeDetected = false;
+      }
+
+    } else if (this->freezeDetected) {
+      this->freezeDetected = false;
+    }
+  }
+
   void emergency() {
     // flags
     uint8_t emergencyFlags = 0b00000000;
@@ -614,4 +689,46 @@ protected:
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
     }
   }
+  
+  void externalDev() {
+    static uint8_t configuredGpio = GPIO_IS_NOT_CONFIGURED;
+
+    if(!settings.externalDev.use) return;
+
+    // configure output
+    // if settings are different than the configured GPIO, update
+    if (settings.externalDev.gpio != configuredGpio) {
+      if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        digitalWrite(configuredGpio, LOW);
+      }
+      
+      if (GPIO_IS_VALID(settings.externalDev.gpio)) {
+        configuredGpio = settings.externalDev.gpio;
+        pinMode(configuredGpio, OUTPUT);
+        digitalWrite(configuredGpio, LOW);
+
+      } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        configuredGpio = GPIO_IS_NOT_CONFIGURED;
+      }
+    }
+
+    if (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
+      if (vars.externalDev.state) {
+        vars.externalDev.state = false;
+
+        Log.sinfoln(FPSTR(L_EXTDEV), F("Disabled: use = off"));
+      }
+
+      return;
+    }
+
+    // output configured update relay if required
+    if(settings.externalDev.state != vars.externalDev.state ) {
+      digitalWrite(configuredGpio, settings.externalDev.state? HIGH:LOW );
+      vars.externalDev.state = settings.externalDev.state;
+    }
+
+  }
+
 };
+

src/MqttTask.h

@@ -506,6 +506,9 @@ protected:
     this->haHelper->publishInputEquithermFactorK(false);
     this->haHelper->publishInputEquithermFactorT(false);
 
+    // ext device
+    this->haHelper->publishSwitchExtDevice(String(settings.externalDev.caption), false);
+
     // states
     this->haHelper->publishStatusState();
     this->haHelper->publishEmergencyState();
@@ -515,6 +518,8 @@ protected:
     this->haHelper->publishFaultState();
     this->haHelper->publishDiagState();
     this->haHelper->publishExternalPumpState(false);
+    this->haHelper->publishExtDevState(String(settings.externalDev.caption), false);
+
 
     // sensors
     this->haHelper->publishFaultCode();

src/OpenThermTask.h

@@ -169,12 +169,15 @@ protected:
 
     // Heating settings
     vars.master.heating.enabled = this->isReady()
-      && (settings.heating.enabled || vars.emergency.state) 
+      && settings.heating.enabled
       && vars.cascadeControl.input 
-      && !vars.master.heating.blocking;
+      && !vars.master.heating.blocking
+      && !vars.master.heating.overheat;
 
     // DHW settings
-    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport && settings.dhw.enabled;
+    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport 
+      && settings.dhw.enabled 
+      && !vars.master.dhw.overheat;
     vars.master.dhw.targetTemp = settings.dhw.target;
 
     // CH2 settings
@@ -205,6 +208,12 @@ protected:
       summerWinterMode = vars.master.heating.enabled == summerWinterMode;
     }
 
+    // DHW blocking
+    bool dhwBlocking = settings.opentherm.options.dhwBlocking;
+    if (settings.opentherm.options.dhwStateAsDhwBlocking) {
+      dhwBlocking = vars.master.dhw.enabled == dhwBlocking;
+    }
+
     unsigned long response = this->instance->setBoilerStatus(
       vars.master.heating.enabled,
       vars.master.dhw.enabled,
@@ -212,7 +221,7 @@ protected:
       settings.opentherm.options.nativeHeatingControl,
       vars.master.ch2.enabled,
       summerWinterMode,
-      settings.opentherm.options.dhwBlocking,
+      dhwBlocking,
       statusLb
     );
 
@@ -228,6 +237,7 @@ protected:
       vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
       vars.slave.flame = CustomOpenTherm::isFlameOn(response);
       vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
+      vars.slave.ch2.active = CustomOpenTherm::isCh2Active(response);
       vars.slave.fault.active = CustomOpenTherm::isFault(response);
 
       if (!settings.opentherm.options.ignoreDiagState) {
@@ -238,9 +248,9 @@ protected:
       }
   
       Log.snoticeln(
-        FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; fault: %hhu; diag: %hhu"),
+        FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; channel 2: %hhu; fault: %hhu; diag: %hhu"),
         vars.slave.heating.active, vars.slave.dhw.active,
-        vars.slave.flame, vars.slave.cooling, vars.slave.fault.active, vars.slave.diag.active
+        vars.slave.flame, vars.slave.cooling, vars.slave.ch2.active, vars.slave.fault.active, vars.slave.diag.active
       );
     }
 
@@ -1307,6 +1317,84 @@ protected:
         }
       }
     }
+
+
+    // Heating overheat control
+    if (settings.heating.overheatProtection.highTemp > 0 && settings.heating.overheatProtection.lowTemp > 0) {
+      float highTemp = convertTemp(
+        max({
+          vars.slave.heating.currentTemp,
+          vars.slave.heating.returnTemp,
+          vars.slave.heatExchangerTemp
+        }),
+        settings.opentherm.unitSystem,
+        settings.system.unitSystem
+      );
+
+      if (vars.master.heating.overheat) {
+        if ((float) settings.heating.overheatProtection.lowTemp - highTemp + 0.0001f >= 0.0f) {
+          vars.master.heating.overheat = false;
+
+          Log.sinfoln(
+            FPSTR(L_OT_HEATING), F("Overheating not detected. Current high temp: %.2f, threshold (low): %hhu"),
+            highTemp, settings.heating.overheatProtection.lowTemp
+          );
+        }
+
+      } else if (vars.slave.heating.active) {
+        if (highTemp - (float) settings.heating.overheatProtection.highTemp + 0.0001f >= 0.0f) {
+          vars.master.heating.overheat = true;
+
+          Log.swarningln(
+            FPSTR(L_OT_HEATING), F("Overheating detected! Current high temp: %.2f, threshold (high): %hhu"),
+            highTemp, settings.heating.overheatProtection.highTemp
+          );
+        }
+      }
+
+    } else if (vars.master.heating.overheat) {
+      vars.master.heating.overheat = false;
+    }
+
+    // DHW overheat control
+    if (settings.dhw.overheatProtection.highTemp > 0 && settings.dhw.overheatProtection.lowTemp > 0) {
+      float highTemp = convertTemp(
+        max({
+          vars.slave.heating.currentTemp,
+          vars.slave.heating.returnTemp,
+          vars.slave.heatExchangerTemp,
+          vars.slave.dhw.currentTemp,
+          vars.slave.dhw.currentTemp2,
+          vars.slave.dhw.returnTemp
+        }),
+        settings.opentherm.unitSystem,
+        settings.system.unitSystem
+      );
+
+      if (vars.master.dhw.overheat) {
+        if ((float) settings.dhw.overheatProtection.lowTemp - highTemp + 0.0001f >= 0.0f) {
+          vars.master.dhw.overheat = false;
+
+          Log.sinfoln(
+            FPSTR(L_OT_DHW), F("Overheating not detected. Current high temp: %.2f, threshold (low): %hhu"),
+            highTemp, settings.dhw.overheatProtection.lowTemp
+          );
+        }
+
+      } else if (vars.slave.dhw.active) {
+        if (highTemp - (float) settings.dhw.overheatProtection.highTemp + 0.0001f >= 0.0f) {
+          vars.master.dhw.overheat = true;
+
+          Log.swarningln(
+            FPSTR(L_OT_DHW), F("Overheating detected! Current high temp: %.2f, threshold (high): %hhu"),
+            highTemp, settings.dhw.overheatProtection.highTemp
+          );
+        }
+      }
+
+    } else if (vars.master.dhw.overheat) {
+      vars.master.dhw.overheat = false;
+    }
   }
 
   void initialize() {

src/Sensors.h

@@ -138,7 +138,7 @@ public:
     }
 
     uint8_t amount = 0;
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
       if (settings[id].type == type && (!onlyEnabled || settings[id].enabled)) {
         amount++;
       }
@@ -152,7 +152,7 @@ public:
       return 0;
     }
 
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
       if (strcmp(settings[id].name, name) == 0) {
         return id;
       }
@@ -167,7 +167,7 @@ public:
     }
 
     String refObjectId;
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
       Sensors::makeObjectId(refObjectId, settings[id].name);
       if (refObjectId.equals(objectId)) {
         return id;
@@ -247,7 +247,7 @@ public:
     uint8_t updated = 0;
     
     // read sensors data for current instance
-    for (uint8_t sensorId = 0; sensorId < getMaxSensorId(); sensorId++) {
+    for (uint8_t sensorId = 0; sensorId <= getMaxSensorId(); sensorId++) {
       auto& sSensor = settings[sensorId];
       
       // only target & valid sensors
@@ -311,7 +311,7 @@ public:
     uint8_t updated = 0;
     
     // read sensors data for current instance
-    for (uint8_t sensorId = 0; sensorId < getMaxSensorId(); sensorId++) {
+    for (uint8_t sensorId = 0; sensorId <= getMaxSensorId(); sensorId++) {
       auto& sSensor = settings[sensorId];
       
       // only target & valid sensors
@@ -340,7 +340,7 @@ public:
     float value = 0.0f;
     uint8_t amount = 0;
 
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
       auto& sSensor = settings[id];
       auto& rSensor = results[id];
 
@@ -366,7 +366,7 @@ public:
       return 0;
     }
 
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
       if (settings[id].purpose == purpose && results[id].connected) {
         return true;
       }

src/Settings.h

@@ -71,6 +71,7 @@ struct Settings {
       bool heatingToCh2 = false;
       bool dhwToCh2 = false;
       bool dhwBlocking = false;
+      bool dhwStateAsDhwBlocking = false;
       bool maxTempSyncWithTargetTemp = true;
       bool getMinMaxTemp = true;
       bool ignoreDiagState = false;
@@ -107,6 +108,16 @@ struct Settings {
     byte minTemp = DEFAULT_HEATING_MIN_TEMP;
     byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
     uint8_t maxModulation = 100;
+
+    struct {
+      uint8_t highTemp = 95;
+      uint8_t lowTemp = 90;
+    } overheatProtection;
+
+    struct {
+      uint8_t lowTemp = 10;
+      unsigned short thresholdTime = 600;
+    } freezeProtection;
   } heating;
 
   struct {
@@ -115,6 +126,11 @@ struct Settings {
     byte minTemp = DEFAULT_DHW_MIN_TEMP;
     byte maxTemp = DEFAULT_DHW_MAX_TEMP;
     uint8_t maxModulation = 100;
+    
+    struct {
+      uint8_t highTemp = 95;
+      uint8_t lowTemp = 90;
+    } overheatProtection;
   } dhw;
 
   struct {
@@ -151,6 +167,13 @@ struct Settings {
     unsigned short antiStuckTime = 300;
   } externalPump;
 
+  struct {
+    bool use = false;
+    byte gpio = DEFAULT_EXT_DEV_GPIO;
+    char caption[41] = DEFAULT_EXT_DEV_CAPTION;
+    bool state = false;
+  } externalDev;
+
   struct {
     struct {
       bool enabled = false;
@@ -263,6 +286,10 @@ struct Variables {
     unsigned long lastEnabledTime = 0;
   } externalPump;
 
+  struct {
+    bool state = false;
+  } externalDev;
+
   struct {
     bool input = false;
     bool output = false;
@@ -279,6 +306,7 @@ struct Variables {
       bool blocking = false;
       bool enabled = false;
       bool indoorTempControl = false;
+      bool overheat = false;
       float setpointTemp = 0.0f;
       float targetTemp = 0.0f;
       float currentTemp = 0.0f;
@@ -291,6 +319,7 @@ struct Variables {
 
     struct {
       bool enabled = false;
+      bool overheat = false;
       float targetTemp = 0.0f;
       float currentTemp = 0.0f;
       float returnTemp = 0.0f;
@@ -390,6 +419,7 @@ struct Variables {
     } dhw;
 
     struct {
+      bool active = false;
       bool enabled = false;
       float targetTemp = 0.0f;
       float currentTemp = 0.0f;

src/defines.h

@@ -146,6 +146,14 @@
   #define DEFAULT_EXT_PUMP_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
 
+#ifndef DEFAULT_EXT_DEV_GPIO
+  #define DEFAULT_EXT_DEV_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_EXT_DEV_CAPTION
+  #define DEFAULT_EXT_DEV_CAPTION "Device"
+#endif
+
 #ifndef PROGMEM
   #define PROGMEM 
 #endif

src/strings.h

@@ -32,6 +32,7 @@ const char L_REGULATOR_EQUITHERM[]                  PROGMEM = "REGULATOR.EQUITHE
 const char L_CASCADE_INPUT[]                        PROGMEM = "CASCADE.INPUT";
 const char L_CASCADE_OUTPUT[]                       PROGMEM = "CASCADE.OUTPUT";
 const char L_EXTPUMP[]                              PROGMEM = "EXTPUMP";
+const char L_EXTDEV[]                               PROGMEM = "EXTDEV";
 
 
 const char S_ACTIONS[]                              PROGMEM = "actions";
@@ -68,6 +69,7 @@ const char S_DATE[]                                 PROGMEM = "date";
 const char S_DEADBAND[]                             PROGMEM = "deadband";
 const char S_DHW[]                                  PROGMEM = "dhw";
 const char S_DHW_BLOCKING[]                         PROGMEM = "dhwBlocking";
+const char S_DHW_STATE_AS_DHW_BLOCKING[]            PROGMEM = "dhwStateAsDhwBlocking";
 const char S_DHW_SUPPORT[]                          PROGMEM = "dhwSupport";
 const char S_DHW_TO_CH2[]                           PROGMEM = "dhwToCh2";
 const char S_DIAG[]                                 PROGMEM = "diag";
@@ -81,8 +83,11 @@ const char S_ENV[]                                  PROGMEM = "env";
 const char S_EPC[]                                  PROGMEM = "epc";
 const char S_EQUITHERM[]                            PROGMEM = "equitherm";
 const char S_EXTERNAL_PUMP[]                        PROGMEM = "externalPump";
+const char S_EXTERNAL_DEV[]                         PROGMEM = "externalDev";
+const char S_EXTERNAL_DEV_CAPTION[]                 PROGMEM = "caption";
 const char S_FACTOR[]                               PROGMEM = "factor";
 const char S_FAULT[]                                PROGMEM = "fault";
+const char S_FREEZE_PROTECTION[]                    PROGMEM = "freezeProtection";
 const char S_FILTERING[]                            PROGMEM = "filtering";
 const char S_FILTERING_FACTOR[]                     PROGMEM = "filteringFactor";
 const char S_FLAGS[]                                PROGMEM = "flags";
@@ -98,6 +103,7 @@ const char S_HEATING[]                              PROGMEM = "heating";
 const char S_HEATING_TO_CH2[]                       PROGMEM = "heatingToCh2";
 const char S_HEATING_STATE_TO_SUMMER_WINTER_MODE[]  PROGMEM = "heatingStateToSummerWinterMode";
 const char S_HIDDEN[]                               PROGMEM = "hidden";
+const char S_HIGH_TEMP[]                            PROGMEM = "highTemp";
 const char S_HOME_ASSISTANT_DISCOVERY[]             PROGMEM = "homeAssistantDiscovery";
 const char S_HOSTNAME[]                             PROGMEM = "hostname";
 const char S_HUMIDITY[]                             PROGMEM = "humidity";
@@ -117,6 +123,7 @@ const char S_I_MULTIPLIER[]                         PROGMEM = "i_multiplier";
 const char S_K_FACTOR[]                             PROGMEM = "k_factor";
 const char S_LOGIN[]                                PROGMEM = "login";
 const char S_LOG_LEVEL[]                            PROGMEM = "logLevel";
+const char S_LOW_TEMP[]                             PROGMEM = "lowTemp";
 const char S_MAC[]                                  PROGMEM = "mac";
 const char S_MASTER[]                               PROGMEM = "master";
 const char S_MAX[]                                  PROGMEM = "max";
@@ -149,6 +156,8 @@ const char S_OPTIONS[]                              PROGMEM = "options";
 const char S_OUTDOOR_TEMP[]                         PROGMEM = "outdoorTemp";
 const char S_OUT_GPIO[]                             PROGMEM = "outGpio";
 const char S_OUTPUT[]                               PROGMEM = "output";
+const char S_OVERHEAT[]                             PROGMEM = "overheat";
+const char S_OVERHEAT_PROTECTION[]                  PROGMEM = "overheatProtection";
 const char S_PASSWORD[]                             PROGMEM = "password";
 const char S_PID[]                                  PROGMEM = "pid";
 const char S_PORT[]                                 PROGMEM = "port";

src/utils.h

@@ -461,6 +461,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     otOptions[FPSTR(S_HEATING_TO_CH2)] = src.opentherm.options.heatingToCh2;
     otOptions[FPSTR(S_DHW_TO_CH2)] = src.opentherm.options.dhwToCh2;
     otOptions[FPSTR(S_DHW_BLOCKING)] = src.opentherm.options.dhwBlocking;
+    otOptions[FPSTR(S_DHW_STATE_AS_DHW_BLOCKING)] = src.opentherm.options.dhwStateAsDhwBlocking;
     otOptions[FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)] = src.opentherm.options.maxTempSyncWithTargetTemp;
     otOptions[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.options.getMinMaxTemp;
     otOptions[FPSTR(S_IGNORE_DIAG_STATE)] = src.opentherm.options.ignoreDiagState;
@@ -495,6 +496,14 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
   heating[FPSTR(S_MAX_MODULATION)] = src.heating.maxModulation;
 
+  auto heatingOverheatProtection = heating[FPSTR(S_OVERHEAT_PROTECTION)].to<JsonObject>();
+  heatingOverheatProtection[FPSTR(S_HIGH_TEMP)] = src.heating.overheatProtection.highTemp;
+  heatingOverheatProtection[FPSTR(S_LOW_TEMP)] = src.heating.overheatProtection.lowTemp;
+
+  auto freezeProtection = heating[FPSTR(S_FREEZE_PROTECTION)].to<JsonObject>();
+  freezeProtection[FPSTR(S_LOW_TEMP)] = src.heating.freezeProtection.lowTemp;
+  freezeProtection[FPSTR(S_THRESHOLD_TIME)] = src.heating.freezeProtection.thresholdTime;
+
   auto dhw = dst[FPSTR(S_DHW)].to<JsonObject>();
   dhw[FPSTR(S_ENABLED)] = src.dhw.enabled;
   dhw[FPSTR(S_TARGET)] = roundf(src.dhw.target, 1);
@@ -502,6 +511,10 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   dhw[FPSTR(S_MAX_TEMP)] = src.dhw.maxTemp;
   dhw[FPSTR(S_MAX_MODULATION)] = src.dhw.maxModulation;
 
+  auto dhwOverheatProtection = dhw[FPSTR(S_OVERHEAT_PROTECTION)].to<JsonObject>();
+  dhwOverheatProtection[FPSTR(S_HIGH_TEMP)] = src.dhw.overheatProtection.highTemp;
+  dhwOverheatProtection[FPSTR(S_LOW_TEMP)] = src.dhw.overheatProtection.lowTemp;
+
   auto equitherm = dst[FPSTR(S_EQUITHERM)].to<JsonObject>();
   equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
   equitherm[FPSTR(S_N_FACTOR)] = roundf(src.equitherm.n_factor, 3);
@@ -548,6 +561,15 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     cascadeControlOutput[FPSTR(S_ON_LOSS_CONNECTION)] = src.cascadeControl.output.onLossConnection;
     cascadeControlOutput[FPSTR(S_ON_ENABLED_HEATING)] = src.cascadeControl.output.onEnabledHeating;
   }
+
+  if(!safe ) {
+    dst[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_USE)] = src.externalDev.use;
+    dst[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_GPIO)] = src.externalDev.gpio;
+    dst[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_EXTERNAL_DEV_CAPTION)] = src.externalDev.caption;
+  }
+  
+  if(src.externalDev.use)
+    dst[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_STATE)] = src.externalDev.state;
 }
 
 inline void safeSettingsToJson(const Settings& src, JsonVariant dst) {
@@ -923,6 +945,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_STATE_AS_DHW_BLOCKING)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_STATE_AS_DHW_BLOCKING)].as<bool>();
+
+      if (value != dst.opentherm.options.dhwStateAsDhwBlocking) {
+        dst.opentherm.options.dhwStateAsDhwBlocking = value;
+        changed = true;
+      }
+    }
+
     if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)].is<bool>()) {
       bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)].as<bool>();
 
@@ -1332,6 +1363,49 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 100.0f) && value != dst.heating.overheatProtection.highTemp) {
+      dst.heating.overheatProtection.highTemp = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 99.0f) && value != dst.heating.overheatProtection.lowTemp) {
+      dst.heating.overheatProtection.lowTemp = value;
+      changed = true;
+    }
+  }
+
+  if (dst.heating.overheatProtection.highTemp < dst.heating.overheatProtection.lowTemp) {
+    dst.heating.overheatProtection.highTemp = dst.heating.overheatProtection.lowTemp;
+    changed = true;
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
+    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].as<uint8_t>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 1, 30) && value != dst.heating.freezeProtection.lowTemp) {
+      dst.heating.freezeProtection.lowTemp = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].isNull()) {
+    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].as<unsigned short>();
+
+    if (value >= 30 && value <= 1800) {
+      if (value != dst.heating.freezeProtection.thresholdTime) {
+        dst.heating.freezeProtection.thresholdTime = value;
+        changed = true;
+      }
+    }
+  }
+
 
   // dhw
   if (src[FPSTR(S_DHW)][FPSTR(S_ENABLED)].is<bool>()) {
@@ -1375,6 +1449,29 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
+  if (!src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 100.0f) && value != dst.dhw.overheatProtection.highTemp) {
+      dst.dhw.overheatProtection.highTemp = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 99.0f) && value != dst.dhw.overheatProtection.lowTemp) {
+      dst.dhw.overheatProtection.lowTemp = value;
+      changed = true;
+    }
+  }
+
+  if (dst.dhw.overheatProtection.highTemp < dst.dhw.overheatProtection.lowTemp) {
+    dst.dhw.overheatProtection.highTemp = dst.dhw.overheatProtection.lowTemp;
+    changed = true;
+  }
+
 
   if (!safe) {
     // external pump
@@ -1443,6 +1540,42 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
+    // external device
+    if (src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_USE)].is<bool>()) {
+      bool value = src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_USE)].as<bool>();
+
+      if (value != dst.externalDev.use) {
+        dst.externalDev.use = value;
+        changed = true;
+      }
+    }
+
+    if (!src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_GPIO)].isNull()) {
+      if (src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_GPIO)].is<JsonString>() && 
+          src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_GPIO)].as<JsonString>().size() == 0) {
+        if (dst.externalDev.gpio != GPIO_IS_NOT_CONFIGURED) {
+          dst.externalDev.gpio = GPIO_IS_NOT_CONFIGURED;
+          changed = true;
+        }
+        
+      } else {
+        unsigned char value = src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_GPIO)].as<unsigned char>();
+
+        if (GPIO_IS_VALID(value) && value != dst.externalDev.gpio) {
+          dst.externalDev.gpio = value;
+          changed = true;
+        }
+      }
+    }
+
+    if (!src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_EXTERNAL_DEV_CAPTION)].isNull()) {
+      String value = src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_EXTERNAL_DEV_CAPTION)].as<String>();
+
+      if (value.length() < sizeof(dst.externalDev.caption) && !String(dst.externalDev.caption).equals(value)) {
+        strcpy(dst.externalDev.caption, value.c_str());
+        changed = true;
+      }
+    }
 
     // cascade control
     if (src[FPSTR(S_CASCADE_CONTROL)][FPSTR(S_INPUT)][FPSTR(S_ENABLED)].is<bool>()) {
@@ -1565,6 +1698,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
+  if (dst.externalDev.use && src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_STATE)].is<bool>()) {
+    bool value = src[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_STATE)].as<bool>();
+
+    if (value != dst.externalDev.state) {
+      dst.externalDev.state = value;
+      changed = true;
+    }
+  }
+
   // force check emergency target
   {
     float value = !src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].as<float>() : dst.emergency.target;
@@ -2006,6 +2148,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
   mHeating[FPSTR(S_ENABLED)] = src.master.heating.enabled;
   mHeating[FPSTR(S_BLOCKING)] = src.master.heating.blocking;
   mHeating[FPSTR(S_INDOOR_TEMP_CONTROL)] = src.master.heating.indoorTempControl;
+  mHeating[FPSTR(S_OVERHEAT)] = src.master.heating.overheat;
   mHeating[FPSTR(S_SETPOINT_TEMP)] = roundf(src.master.heating.setpointTemp, 2);
   mHeating[FPSTR(S_TARGET_TEMP)] = roundf(src.master.heating.targetTemp, 2);
   mHeating[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.heating.currentTemp, 2);
@@ -2017,6 +2160,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
 
   auto mDhw = master[FPSTR(S_DHW)].to<JsonObject>();
   mDhw[FPSTR(S_ENABLED)] = src.master.dhw.enabled;
+  mDhw[FPSTR(S_OVERHEAT)] = src.master.dhw.overheat;
   mDhw[FPSTR(S_TARGET_TEMP)] = roundf(src.master.dhw.targetTemp, 2);
   mDhw[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.dhw.currentTemp, 2);
   mDhw[FPSTR(S_RETURN_TEMP)] = roundf(src.master.dhw.returnTemp, 2);
@@ -2028,6 +2172,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
   master[FPSTR(S_MQTT)][FPSTR(S_CONNECTED)] = src.mqtt.connected;
   master[FPSTR(S_EMERGENCY)][FPSTR(S_STATE)] = src.emergency.state;
   master[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_STATE)] = src.externalPump.state;
+  master[FPSTR(S_EXTERNAL_DEV)][FPSTR(S_STATE)] = src.externalDev.state;
 
   auto mCascadeControl = master[FPSTR(S_CASCADE_CONTROL)].to<JsonObject>();
   mCascadeControl[FPSTR(S_INPUT)] = src.cascadeControl.input;

src_data/locales/cn.json

@@ -0,0 +1,516 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "授权许可",
+      "source": "源代码",
+      "help": "帮助",
+      "issues": "问题与反馈",
+      "releases": "发行版"
+    },
+    "dbm": "dBm",
+    "kw": "kW",
+    "time": {
+      "days": "天",
+      "hours": "小时",
+      "min": "分",
+      "sec": "秒"
+    },
+
+    "button": {
+      "upgrade": "固件升级",
+      "restart": "重启",
+      "save": "保存",
+      "saved": "已保存",
+      "refresh": "刷新",
+      "restore": "恢复",
+      "restored": "已恢复",
+      "backup": "备份",
+      "wait": "请等待...",
+      "uploading": "上传中...",
+      "success": "成功",
+      "error": "错误"
+    },
+
+    "index": {
+      "title": "OpenTherm Gateway",
+
+      "section": {
+        "network": "网络",
+        "system": "系统"
+      },
+
+      "system": {
+        "build": {
+          "title": "Build",
+          "version": "固件版本",
+          "date": "日期",
+          "core": "内核版本",
+          "sdk": "SDK"
+        },
+        "uptime": "运行时间",
+        "memory": {
+          "title": "可用内存",
+          "maxFreeBlock": "max free block",
+          "min": "min"
+        },
+        "board": "开发板",
+        "chip": {
+          "model": "芯片",
+          "cores": "核心数",
+          "freq": "频率"
+        },
+        "flash": {
+          "size": "闪存容量",
+          "realSize": "实际容量"
+        },
+        "lastResetReason": "上次重置原因"
+      }
+    },
+
+    "dashboard": {
+      "name": "仪表盘",
+      "title": "仪表盘 - OpenTherm Gateway",
+
+      "section": {
+        "control": "调节",
+        "states": "状态",
+        "sensors": "传感器",
+        "diag": "OpenTherm 诊断"
+      },
+
+      "thermostat": {
+        "heating": "供暖",
+        "dhw": "生活热水",
+        "temp.current": "当前温度",
+        "enable": "启用",
+        "turbo": "Turbo 模式"
+      },
+
+      "notify": {
+        "fault": {
+          "title": "锅炉报警状态已激活!",
+          "note": "建议检查锅炉并查看说明书对应的报警代码:"
+        },
+        "diag": {
+          "title": "锅炉诊断状态已激活!",
+          "note": "锅炉可能需要检查，建议查看说明书对应的诊断代码:"
+        },
+        "reset": "点击复位"
+      },
+
+      "states": {
+        "mNetworkConnected": "网络连接状态",
+        "mMqttConnected": "MQTT服务器连接状态",
+        "mEmergencyState": "应急模式",
+        "mExtPumpState": "外置循环泵",
+        "mExtDevState": "外置设备",
+        "mCascadeControlInput": "Cascade 控制 (input)",
+        "mCascadeControlOutput": "Cascade 控制 (output)",
+
+        "sConnected": "OpenTherm 通讯状态",
+        "sFlame": "火焰",
+        "sCooling": "制冷",
+        "sFaultActive": "报警状态",
+        "sFaultCode": "报警代码",
+        "sDiagActive": "诊断状态",
+        "sDiagCode": "诊断代码",
+        
+        "mHeatEnabled": "供暖功能已启用",
+        "mHeatBlocking": "供暖",
+        "mHeatOverheat": "供暖超热保护",
+        "sHeatActive": "供暖激活状态",
+        "mHeatSetpointTemp": "供暖供水设定温度",
+        "mHeatTargetTemp": "供暖供水目标温度",
+        "mHeatCurrTemp": "供暖当前供水温度",
+        "mHeatRetTemp": "供暖回水温度",
+        "mHeatIndoorTemp": "供暖，室内温度",
+        "mHeatOutdoorTemp": "供暖，室外温度",
+
+        "mDhwEnabled": "生活热水功能已启用",
+        "mDhwOverheat": "生活热水超热保护",
+        "sDhwActive": "生活热水激活",
+        "mDhwTargetTemp": "生活热水目标温度",
+        "mDhwCurrTemp": "生活热水当前出水温度",
+        "mDhwRetTemp": "生活热水回水温度"
+      },
+
+      "sensors": {
+        "values": {
+          "temp": "温度",
+          "humidity": "湿度",
+          "battery": "电量",
+          "rssi": "RSSI"
+        }
+      }
+    },
+
+    "network": {
+      "title": "网络 - OpenTherm Gateway",
+      "name": "网络设置",
+
+      "section": {
+        "static": "静态设置",
+        "availableNetworks": "可用网络",
+        "staSettings": "WiFi 设置",
+        "apSettings": "AP 设置"
+      },
+
+      "scan": {
+        "pos": "#",
+        "info": "Info"
+      },
+
+      "wifi": {
+        "ssid": "SSID",
+        "password": "密码",
+        "channel": "频道",
+        "signal": "信号强度",
+        "connected": "已连接"
+      },
+
+      "params": {
+        "hostname": "Hostname",
+        "dhcp": "自动 (DHCP)",
+        "mac": "物理地址 (MAC)",
+        "ip": "IP",
+        "subnet": "子网掩码",
+        "gateway": "网关",
+        "dns": "DNS 服务器"
+      },
+
+      "sta": {
+        "channel.note": "自动选择设置为0"
+      }
+    },
+
+    "sensors": {
+      "title": "传感器设置 - OpenTherm Gateway",
+      "name": "传感器设置",
+
+      "enabled": "启用",
+      "sensorName": {
+        "title": "传感器名称",
+        "note": "只能包含：a-z、A-Z、0-9、下划线和空格"
+      },
+      "purpose": "用途",
+      "purposes": {
+        "outdoorTemp": "室外温度",
+        "indoorTemp": "室内温度",
+        "heatTemp": "供暖，温度",
+        "heatRetTemp": "供暖回水温度",
+        "dhwTemp": "生活热水温度",
+        "dhwRetTemp": "生活热水回水温度",
+        "dhwFlowRate": "生活热水水流量",
+        "exhaustTemp": "烟气温度",
+        "modLevel": "Modulation level (%)",
+        "number": "Number (raw)",
+        "powerFactor": "功率 (%)",
+        "power": "功率(kW)",
+        "fanSpeed": "风机转速",
+        "co2": "CO2",
+        "pressure": "压力",
+        "humidity": "湿度",
+        "temperature": "温度",
+        "notConfigured": "未配置"
+      },
+      "type": "类型/来源",
+      "types": {
+        "otOutdoorTemp": "OpenTherm, outdoor temp",
+        "otHeatTemp": "OpenTherm, heating, temp",
+        "otHeatRetTemp": "OpenTherm, heating, return temp",
+        "otDhwTemp": "OpenTherm, DHW, temperature",
+        "otDhwTemp2": "OpenTherm, DHW, temperature 2",
+        "otDhwFlowRate": "OpenTherm, DHW, flow rate",
+        "otCh2Temp": "OpenTherm, channel 2, temp",
+        "otExhaustTemp": "OpenTherm, exhaust temp",
+        "otHeatExchangerTemp": "OpenTherm, heat exchanger temp",
+        "otPressure": "OpenTherm, pressure",
+        "otModLevel": "OpenTherm, modulation level",
+        "otCurrentPower": "OpenTherm, current power",
+        "otExhaustCo2": "OpenTherm, exhaust CO2",
+        "otExhaustFanSpeed": "OpenTherm, exhaust fan speed",
+        "otSupplyFanSpeed": "OpenTherm, supply fan speed",
+        "otSolarStorageTemp": "OpenTherm, solar storage temp",
+        "otSolarCollectorTemp": "OpenTherm, solar collector temp",
+        "otFanSpeedSetpoint": "OpenTherm, setpoint fan speed",
+        "otFanSpeedCurrent": "OpenTherm, current fan speed",
+        "otBurnerStarts": "OpenTherm, number of burner starts",
+        "otDhwBurnerStarts": "OpenTherm, number of burner starts (DHW)",
+        "otHeatingPumpStarts": "OpenTherm, number of pump starts (heating)",
+        "otDhwPumpStarts": "OpenTherm, number of pump starts (DHW)",
+        "otBurnerHours": "OpenTherm, number of burner operating hours",
+        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
+        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
+        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
+        
+        "ntcTemp": "NTC 传感器",
+        "dallasTemp": "DALLAS 传感器",
+        "bluetooth": "BLE 传感器",
+        "heatSetpointTemp": "Heating, setpoint temp",
+        "manual": "通过 MQTT/API 手动配置",
+        "notConfigured": "未配置"
+      },
+      "gpio": "GPIO",
+      "address": {
+        "title": "传感器地址",
+        "note": "如需自动检测DALLAS传感器，请保持默认设置；如需连接BLE设备，则需提供MAC地址"
+      },
+      "correction": {
+        "desc": "数值校正",
+        "offset": "补偿值（偏移量）",
+        "factor": "Multiplier"
+      },
+      "filtering": {
+        "desc": "数值滤波",
+        "enabled": {
+          "title": "启用滤波",
+          "note": "如果图表中有大量尖锐的噪声，此功能会很有用。使用的滤波器是 \"滑动平均滤波器\"."
+        },
+        "factor": {
+          "title": "滤波系数",
+          "note": "数值越低，数值变化越平滑且响应越滞后"
+        }
+      }
+    },
+
+    "settings": {
+      "title": "设置 - OpenTherm Gateway",
+      "name": "设置",
+
+      "section": {
+        "portal": "Portal 设置",
+        "system": "系统设置",
+        "diag": "诊断",
+        "heating": "供热设置",
+        "dhw": "生活热水设置",
+        "emergency": "应急模式设置",
+        "equitherm": "气候补偿设置",
+        "pid": "PID 参数设置",
+        "ot": "OpenTherm协议设置",
+        "mqtt": "MQTT 服务器设置",
+        "extPump": "外置循环泵设置",
+        "extDev": "外置设备设置",
+        "cascadeControl": "Cascade 级联控制设置"
+      },
+
+      "enable": "启用",
+      "note": {
+        "restart": "更改这些设置后，必须重启设备以使变更生效",
+        "blankNotUse": "空白 - 未使用",
+        "bleDevice": "BLE设备仅支持搭载BLE功能的特定ESP32开发板使用!"
+      },
+
+      "temp": {
+        "min": "最低温度",
+        "max": "最高温度"
+      },
+      "maxModulation": "最大调制范围",
+      "ohProtection": {
+        "title": "超温保护",
+        "desc": "<b>注意：</b> 当锅炉内置过热保护失效或工作异常导致系统超温时，此功能可提供额外保护。如需禁用，请将<b>最高温度</b>和<b>最低温度</b>均设为0。",
+        "highTemp": {
+          "title": "高温阈值",
+          "note": "触发燃烧器强制关闭的阈值温度"
+        },
+        "lowTemp": {
+          "title": "低温阈值",
+          "note": "燃烧器重新启动的阈值温度"
+        }
+      },
+      "freezeProtection": {
+        "title": "防冻保护",
+        "desc": "当热媒或室内温度在<b>等待时间</b> 内降至<b>低温阈值</b>以下时，系统将强制启动加热功能。",
+        "lowTemp": "低温阈值",
+        "thresholdTime": "等待时间<small>(秒)</small>"
+      },
+
+      "portal": {
+        "login": "登录",
+        "password": "密码",
+        "auth": "需身份验证",
+        "mdns": "使用 mDNS"
+      },
+
+      "system": {
+        "unit": "单位",
+        "metric": "公制 <small>(摄氏度、升、巴)</small>",
+        "imperial": "英制 <small>(华氏度、加仑、psi)</small>",
+        "statusLedGpio": "状态指示灯GPIO引脚",
+        "logLevel": "日志级别",
+        "serial": {
+          "enable": "启用串口",
+          "baud": "串口波特率"
+        },
+        "telnet": {
+          "enable": "启用 Telnet",
+          "port": {
+            "title": "Telnet 端口",
+            "note": "默认值：23"
+          }
+        },
+        "ntp": {
+          "server": "NTP服务器",
+          "timezone": "时区",
+          "timezonePresets": "选择预设配置..."
+        }
+      },
+
+      "heating": {
+        "hyst": "滞后值<small>(单位：度)</small>",
+        "turboFactor": "Turbo 模式系数"
+      },
+
+      "emergency": {
+        "desc": "紧急模式会在以下情况自动激活（当PID或气候补偿无法计算热媒设定值时）：<br />启用气候补偿但室外温度传感器断开连接；<br />启用PID或 OpenTherm 选项中启用<i>原生供暖控制</i>但室内温度传感器断开连接。<br /><b>注意：</b> 网络故障或MQTT 服务器连接故障时，类型为<i>通过MQTT/API手动控制<i>的传感器将显示为断开连接状态。",
+        
+        "target": {
+          "title": "目标温度",
+          "note": "<b>重要提示：</b> 若启用OpenTherm选项 <i>«原生供暖控制»</i>，此处设定值为<u>目标室内温度</u>；<br />其他所有情况下，此处设定值为 <u>目标热媒出水温度</u>."
+        },
+        "treshold": "阈值时间 <small>(秒)</small>"
+      },
+
+      "equitherm": {
+        "n": "N 系数",
+        "k": "K 系数",
+        "t": {
+          "title": "T 系数",
+          "note": "启用PID时此参数无效"
+        }
+      },
+
+      "pid": {
+        "p": "P 系数",
+        "i": "I 系数",
+        "d": "D 系数",
+        "dt": "DT <small>以秒为单位</small>",
+        "limits": {
+          "title": "Limits",
+          "note": "<b>重要提示：</b> When using «Equitherm» and «PID» at the same time, the min and max temperatures limit the influence on the «Equitherm» result temperature.<br />Thus, if the min temperature is set to -15 and the max temperature is set to 15, then the final heat carrier setpoint will be from <code>equitherm_result - 15</code> to <code>equitherm_result + 15</code>."
+        },
+        "deadband": {
+          "title": "Deadband",
+          "note": "Deadband is a range around the target temperature where PID regulation becomes less active. Within this range, the algorithm can reduce intensity or pause adjustments to avoid overreacting to small fluctuations.<br /><br />For instance, with a target temperature of 22°, a lower threshold of 1.0, and an upper threshold of 0.5, the deadband operates between 21° and 22.5°. If the I coefficient is 0.0005 and the I multiplier is 0.05, then within the deadband, the I coefficient becomes: <code>0.0005 * 0.05 = 0.000025</code>",
+          "p_multiplier": "Multiplier for P factor",
+          "i_multiplier": "Multiplier for I factor",
+          "d_multiplier": "Multiplier for D factor",
+          "thresholdHigh": "Threshold high",
+          "thresholdLow": "Threshold low"
+        }
+      },
+
+      "ot": {
+        "advanced": "高级设置",
+        "inGpio": "In GPIO",
+        "outGpio": "Out GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberId": "主设备成员 ID",
+        "flags": "主设备标志",
+        "minPower": {
+          "title": "最小锅炉功率 <small>(kW)</small>",
+          "note": "该值对应锅炉0-1%的调制水平，通常在锅炉参数设置中的\"最小有效热输出\"。"
+        },
+        "maxPower": {
+          "title": "最大锅炉功率 <small>(kW)</small>",
+          "note": "<b>0</b> - 自动检测，通常在锅炉参数设置中的\"最大有效热输出\"。 "
+        },
+
+        "options": {
+          "title": "选项（附加设置）",
+          "desc": "附加设置选项可调整锅炉的运行逻辑。由于协议未完整记录所有选项，同一选项在不同锅炉上可能产生不同效果。<br /><b>注意：</b>若系统运行正常，无需修改设置。",
+          "dhwSupport": "生活热水支持",
+          "coolingSupport": "制冷支持",
+          "summerWinterMode": "夏季/冬季模式",
+          "heatingStateToSummerWinterMode": "以供暖状态作为夏季/冬季模式",
+          "ch2AlwaysEnabled": "CH2 始终启用",
+          "heatingToCh2": "将供暖同步至 CH2",
+          "dhwToCh2": "将生活热水同步至 CH2",
+          "dhwBlocking": "生活热水锁定",
+          "dhwStateAsDhwBlocking": "以生活热水状态作为生活热水锁定依据",
+          "maxTempSyncWithTargetTemp": "将最高供暖温度与目标温度同步",
+          "getMinMaxTemp": "从锅炉获取最小/最大温度参数",
+          "ignoreDiagState": "忽略诊断状态",
+          "autoFaultReset": "自动报警复位 <small>(不推荐！)</small>",
+          "autoDiagReset": "自动诊断复位 <small>(不推荐！)</small>",
+          "setDateAndTime": "同步设置锅炉日期与时间",
+          "immergasFix": "针对Immergas锅炉的兼容性修复"
+        },
+
+        "nativeHeating": {
+          "title": "原生锅炉供暖控制",
+          "note": "<u>注意：</u> 仅适用于锅炉需接收目标室温并自主调节载热介质温度的场景，与固件中的PID及Equithermq气候补偿功能不兼容。"
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant 自动发现",
+        "server": "服务器地址",
+        "port": "端口",
+        "user": "用户名",
+        "password": "密码",
+        "prefix": "Prefix 前缀",
+        "interval": "发布间隔 <small>(秒)</small>"
+      },
+
+      "extPump": {
+        "use": "使用外置循环泵",
+        "gpio": "继电器 GPIO引脚",
+        "postCirculationTime": "后循环时间 <small>(分钟)</small>",
+        "antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
+        "antiStuckTime": "防卡死运行时长<small>(分钟)</small>"
+      },
+
+      "extDev": {
+        "use": "使用外置设备",
+        "gpio": "GPIO 继电器",
+        "state": "状态",
+        "caption": "说明"
+      },
+
+      "cascadeControl": {
+        "input": {
+          "desc": "仅当另一台锅炉发生故障时启用本锅炉加热。另一台锅炉的控制器需在故障发生时切换GPIO输入状态以触发本功能。",
+          "enable": "启用 input",
+          "gpio": "GPIO",
+          "invertState": "切换 GPIO 状态",
+          "thresholdTime": "状态变化阈值时间<small>(秒)</small>"
+        },
+        "output": {
+          "desc": "可通过<u>继电器</u>控制另一台锅炉的启停。",
+          "enable": "启用 output",
+          "gpio": "GPIO",
+          "invertState": "切换 GPIO 状态",
+          "thresholdTime": "状态变化阈值时间 <small>(秒)</small>",
+          "events": {
+            "desc": "事件",
+            "onFault": "当故障状态激活时",
+            "onLossConnection": "当OpenTherm连接中断时",
+            "onEnabledHeating": "当供暖功能启用时"
+          }
+        }
+      }
+    },
+
+    "upgrade": {
+      "title": "固件升级 - OpenTherm Gateway",
+      "name": "固件升级",
+
+      "section": {
+        "backupAndRestore": "备份与恢复",
+        "backupAndRestore.desc": "本功能支持备份和恢复全部设置",
+        "upgrade": "升级",
+        "upgrade.desc": "本模块支持升级设备的固件与系统文件。<br />可从以下地址下载最新版本 <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> 。" 
+      },
+
+      "note": {
+        "disclaimer1": "升级系统文件成功后，所有设置将恢复为默认值！升级前请务必备份配置。",
+        "disclaimer2": "升级成功后，设备将在15秒后自动重启。"
+      },
+
+      "settingsFile": "设置文件",
+      "fw": "Firmware",
+      "fs": "Filesystem"
+    }
+  }
+}

src_data/locales/en.json

@@ -104,6 +104,7 @@
         "mMqttConnected": "MQTT connection",
         "mEmergencyState": "Emergency mode",
         "mExtPumpState": "External pump",
+        "mExtDevState": "External device",
         "mCascadeControlInput": "Cascade control (input)",
         "mCascadeControlOutput": "Cascade control (output)",
 
@@ -117,6 +118,7 @@
         
         "mHeatEnabled": "Heating enabled",
         "mHeatBlocking": "Heating blocked",
+        "mHeatOverheat": "Heating overheat",
         "sHeatActive": "Heating active",
         "mHeatSetpointTemp": "Heating setpoint temp",
         "mHeatTargetTemp": "Heating target temp",
@@ -126,6 +128,7 @@
         "mHeatOutdoorTemp": "Heating, outdoor temp",
 
         "mDhwEnabled": "DHW enabled",
+        "mDhwOverheat": "DHW overheat",
         "sDhwActive": "DHW active",
         "mDhwTargetTemp": "DHW target temp",
         "mDhwCurrTemp": "DHW current temp",
@@ -287,6 +290,7 @@
         "ot": "OpenTherm settings",
         "mqtt": "MQTT settings",
         "extPump": "External pump settings",
+        "extDev": "External device settings",
         "cascadeControl": "Cascade control settings"
       },
 
@@ -302,6 +306,24 @@
         "max": "Maximum temperature"
       },
       "maxModulation": "Max modulation level",
+      "ohProtection": {
+        "title": "Overheating protection",
+        "desc": "<b>Note:</b> This feature can be useful if the built-in boiler overheating protection does not work or does not work correctly and the heat carrier boils. To disable, set 0 as <b>high</b> and <b>low</b> temperature.",
+        "highTemp": {
+          "title": "High temperature threshold",
+          "note": "Threshold at which the burner will be forcibly switched off"
+        },
+        "lowTemp": {
+          "title": "Low temperature threshold",
+          "note": "Threshold at which the burner can be turned on again"
+        }
+      },
+      "freezeProtection": {
+        "title": "Freeze protection",
+        "desc": "Heating will be forced to turn on if the heat carrier or indoor temperature drops below <b>Low temperature</b> during <b>Waiting time</b>.",
+        "lowTemp": "Low temperature threshold",
+        "thresholdTime": "Waiting time <small>(sec)</small>"
+      },
 
       "portal": {
         "login": "Login",
@@ -395,7 +417,8 @@
         },
 
         "options": {
-          "desc": "Options",
+          "title": "Options (additional settings)",
+          "desc": "Options can change the logic of the boiler. Not all options are documented in the protocol, so the same option can have different effects on different boilers.<br /><b>Note:</b> There is no need to change anything if everything works well.",
           "dhwSupport": "DHW support",
           "coolingSupport": "Cooling support",
           "summerWinterMode": "Summer/winter mode",
@@ -404,6 +427,7 @@
           "heatingToCh2": "Duplicate heating to CH2",
           "dhwToCh2": "Duplicate DHW to CH2",
           "dhwBlocking": "DHW blocking",
+          "dhwStateAsDhwBlocking": "DHW state as DHW blocking",
           "maxTempSyncWithTargetTemp": "Sync max heating temp with target temp",
           "getMinMaxTemp": "Get min/max temp from boiler",
           "ignoreDiagState": "Ignore diag state",
@@ -437,6 +461,13 @@
         "antiStuckTime": "Anti stuck time <small>(min)</small>"
       },
       
+      "extDev": {
+        "use": "Use external device",
+        "gpio": "Relay GPIO",
+        "state": "State",
+        "caption": "Caption"
+      },
+
       "cascadeControl": {
         "input": {
           "desc": "Can be used to turn on the heating only if another boiler is faulty. The other boiler controller must change the state of the GPIO input in the event of a fault.",

src_data/locales/it.json

@@ -104,6 +104,7 @@
         "mMqttConnected": "Connessione MQTT",
         "mEmergencyState": "Modo Emergenza",
         "mExtPumpState": "Pompa esterna",
+        "mExtDevState": "Dispositivo esterno",
         "mCascadeControlInput": "Controllo a cascata (input)",
         "mCascadeControlOutput": "Controllo a cascata (output)",
 
@@ -117,6 +118,7 @@
         
         "mHeatEnabled": "Riscaldamento attivato",
         "mHeatBlocking": "Riscaldamento bloccato",
+        "mHeatOverheat": "Riscaldamento surriscaldamento",
         "sHeatActive": "Riscaldamento attivo",
         "mHeatSetpointTemp": "Temp riscaldamento impostato",
         "mHeatTargetTemp": "Target Temp caldaia",
@@ -126,6 +128,7 @@
         "mHeatOutdoorTemp": "Riscaldamento, temp esterna",
 
         "mDhwEnabled": "ACS attivata",
+        "mDhwOverheat": "ACS surriscaldamento",
         "sDhwActive": "ACS attiva",
         "mDhwTargetTemp": "ACS temp impostata",
         "mDhwCurrTemp": "ACS temp attuale",
@@ -287,6 +290,7 @@
         "ot": "Impostazioni OpenTherm",
         "mqtt": "Impostazioni MQTT",
         "extPump": "Impostazioni pompa esterna",
+        "extDev": "Impostazioni dispositivo esterno",
         "cascadeControl": "Impostazioni controllo a cascata"
       },
 
@@ -302,6 +306,24 @@
         "max": "Temperatura massima"
       },
       "maxModulation": "Max livello modulazione",
+      "ohProtection": {
+        "title": "Protezione contro il surriscaldamento",
+        "desc": "<b>Nota:</b> questa funzione può essere utile se la protezione contro il surriscaldamento integrata nella caldaia non funziona o non funziona correttamente e il fluido termovettore bolle. Per disattivarla, impostare 0 come temperatura <b>alta</b> e <b>bassa</b>.",
+        "highTemp": {
+          "title": "Soglia di temperatura alta",
+          "note": "Soglia alla quale il bruciatore verrà spento forzatamente"
+        },
+        "lowTemp": {
+          "title": "Soglia di temperatura bassa",
+          "note": "Soglia alla quale il bruciatore può essere riacceso"
+        }
+      },
+      "freezeProtection": {
+        "title": "Protezione antigelo",
+        "desc": "Il riscaldamento verrà attivato forzatamente se la temperatura del vettore di calore o interna scende al di sotto della <b>temperatura minima</b> durante il <b>tempo di attesa</b>.",
+        "lowTemp": "Soglia di temperatura minima",
+        "thresholdTime": "Tempo di attesa <small>(sec)</small>"
+      },
 
       "portal": {
         "login": "Login",
@@ -395,7 +417,8 @@
         },
 
         "options": {
-          "desc": "Opzioni",
+          "title": "Opzioni (impostazioni aggiuntive)",
+          "desc": "Le opzioni possono modificare la logica della caldaia. Non tutte le opzioni sono documentate nel protocollo, quindi la stessa opzione può avere effetti diversi su caldaie diverse.<br /><b>Nota:</b> Non è necessario modificare nulla se tutto funziona correttamente.",
           "dhwSupport": "Supporto ACS",
           "coolingSupport": "Supporto rafferscamento",
           "summerWinterMode": "Modalità Estate/inverno",
@@ -404,6 +427,7 @@
           "heatingToCh2": "Riproduci riscaldamento su CH2",
           "dhwToCh2": "Riproduci ACS su CH2",
           "dhwBlocking": "Bloccare ACS",
+          "dhwStateAsDhwBlocking": "Stato ACS come bloccare ACS",
           "maxTempSyncWithTargetTemp": "Sincronizza la temperatura massima di riscaldamento con la temperatura target",
           "getMinMaxTemp": "Prendi temp min/max dalla caldaia",
           "ignoreDiagState": "Ignora lo stato diagnostico",
@@ -437,6 +461,13 @@
         "antiStuckTime": "Tempo antiblocco <small>(min)</small>"
       },
 
+      "extDev": {
+        "use": "Usa dispositivo esterno",
+        "gpio": "GPIO relè",
+        "state": "Stato",
+        "caption": "Didascalia"
+      },
+
       "cascadeControl": {
         "input": {
           "desc": "Può essere attivata la caldaia se un'altra ha fallito. Il controllo dell'altra caldaia cambia lo stato dell'ingresso del GPIO in caso di errore.",

src_data/locales/ru.json

@@ -104,6 +104,7 @@
         "mMqttConnected": "Подключение к MQTT",
         "mEmergencyState": "Аварийный режим",
         "mExtPumpState": "Внешний насос",
+        "mExtDevState": "Внешнее устройство",
         "mCascadeControlInput": "Каскадное управление (вход)",
         "mCascadeControlOutput": "Каскадное управление (выход)",
 
@@ -117,6 +118,7 @@
         
         "mHeatEnabled": "Отопление",
         "mHeatBlocking": "Блокировка отопления",
+        "mHeatOverheat": "Отопление, перегрев",
         "sHeatActive": "Активность отопления",
         "mHeatSetpointTemp": "Отопление, уставка",
         "mHeatTargetTemp": "Отопление, целевая температура",
@@ -126,6 +128,7 @@
         "mHeatOutdoorTemp": "Отопление, наружная темп.",
 
         "mDhwEnabled": "ГВС",
+        "mDhwOverheat": "ГВС, перегрев",
         "sDhwActive": "Активность ГВС",
         "mDhwTargetTemp": "ГВС, целевая температура",
         "mDhwCurrTemp": "ГВС, текущая температура",
@@ -287,6 +290,7 @@
         "ot": "Настройки OpenTherm",
         "mqtt": "Настройки MQTT",
         "extPump": "Настройки дополнительного насоса",
+        "extDev": "Настройки внешнего устройства",
         "cascadeControl": "Настройки каскадного управления"
       },
 
@@ -302,6 +306,24 @@
         "max": "Макс. температура"
       },
       "maxModulation": "Макс. уровень модуляции",
+      "ohProtection": {
+        "title": "Защита от перегрева",
+        "desc": "<b>Примечание:</b> Эта функция может быть полезна, если встроенная защита от перегрева котла не срабатывает или срабатывает некорректно и теплоноситель закипает. Для отключения установите 0 в качестве <b>верхнего</b> и <b>нижнего</b> порога температуры.",
+        "highTemp": {
+          "title": "Верхний порог температуры",
+          "note": "Порог, при котором горелка будет принудительно отключена"
+        },
+        "lowTemp": {
+          "title": "Нижний порог температуры",
+          "note": "Порог, при котором горелка может быть включена снова"
+        }
+      },
+      "freezeProtection": {
+        "title": "Защита от замерзания",
+        "desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b> в течение <b>времени ожидания</b>.",
+        "lowTemp": "Нижний порог температуры",
+        "thresholdTime": "Время ожидания <small>(сек)</small>"
+      },
 
       "portal": {
         "login": "Логин",
@@ -395,7 +417,8 @@
         },
 
         "options": {
-          "desc": "Опции",
+          "title": "Опции (дополнительные настройки)",
+          "desc": "Опции могут менять логику работы котла. Не все опции задокументированы в протоколе, поэтому одна и та же опция может иметь разный эффект на разных котлах.<br /><b>Примечание:</b> Нет необходимости что-то менять, если всё работает хорошо.",
           "dhwSupport": "Поддержка ГВС",
           "coolingSupport": "Поддержка охлаждения",
           "summerWinterMode": "Летний/зимний режим",
@@ -404,6 +427,7 @@
           "heatingToCh2": "Дублировать параметры отопления в канал 2",
           "dhwToCh2": "Дублировать параметры ГВС в канал 2",
           "dhwBlocking": "DHW blocking",
+          "dhwStateAsDhwBlocking": "DHW blocking в качестве состояния ГВС",
           "maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
           "getMinMaxTemp": "Получать мин. и макс. температуру от котла",
           "ignoreDiagState": "Игнорировать состояние диагностики",
@@ -437,6 +461,13 @@
         "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
       },
 
+      "extDev": {
+        "use": "Использовать внешнее устройство",
+        "gpio": "GPIO реле",
+        "state": "Состояние",
+        "caption": "Назначение"
+      },
+
       "cascadeControl": {
         "input": {
           "desc": "Может использоваться для включения отопления только при неисправности другого котла. Контроллер другого котла должен изменить состояние входа GPIO в случае неисправности.",

src_data/pages/dashboard.html

@@ -21,6 +21,7 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>
@@ -134,6 +135,10 @@
                   <th scope="row" data-i18n>dashboard.states.mExtPumpState</th>
                   <td><i class="mExtPumpState"></i></td>
                 </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mExtDevState</th>
+                  <td><i class="mExtDevState"></i></td>
+                </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mCascadeControlInput</th>
                   <td><i class="mCascadeControlInput"></i></td>
@@ -184,6 +189,10 @@
                   <th scope="row" data-i18n>dashboard.states.mHeatBlocking</th>
                   <td><i class="mHeatBlocking"></i></td>
                 </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatOverheat</th>
+                  <td><i class="mHeatOverheat"></i></td>
+                </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sHeatActive</th>
                   <td><i class="sHeatActive"></i></td>
@@ -218,6 +227,10 @@
                   <th scope="row" data-i18n>dashboard.states.mDhwEnabled</th>
                   <td><i class="mDhwEnabled"></i></td>
                 </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mDhwOverheat</th>
+                  <td><i class="mDhwOverheat"></i></td>
+                </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sDhwActive</th>
                   <td><i class="sDhwActive"></i></td>
@@ -611,6 +624,11 @@
               result.master.heating.blocking ? "red" : "green"
             );
             setState('.mHeatIndoorTempControl', result.master.heating.indoorTempControl);
+            setStatus(
+              '.mHeatOverheat',
+              result.master.heating.overheat ? "success" : "error",
+              result.master.heating.overheat ? "red" : "green"
+            );
             setValue('.mHeatSetpointTemp', result.master.heating.setpointTemp);
             setValue('.mHeatTargetTemp', result.master.heating.targetTemp);
             setValue('.mHeatCurrTemp', result.master.heating.currentTemp);
@@ -621,6 +639,11 @@
             setValue('.mHeatMaxTemp', result.master.heating.maxTemp);
 
             setState('.mDhwEnabled', result.master.dhw.enabled);
+            setStatus(
+              '.mDhwOverheat',
+              result.master.dhw.overheat ? "success" : "error",
+              result.master.dhw.overheat ? "red" : "green"
+            );
             setValue('.mDhwTargetTemp', result.master.dhw.targetTemp);
             setValue('.mDhwCurrTemp', result.master.dhw.currentTemp);
             setValue('.mDhwRetTemp', result.master.dhw.returnTemp);
@@ -639,6 +662,7 @@
               result.master.emergency.state ? "red" : "green"
             );
             setState('.mExtPumpState', result.master.externalPump.state);
+            setState('.mExtDevState', result.master.externalDev.state);
             setState('.mCascadeControlInput', result.master.cascadeControl.input);
             setState('.mCascadeControlOutput', result.master.cascadeControl.output);
 

src_data/pages/index.html

@@ -21,6 +21,7 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/network.html

@@ -21,6 +21,7 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/sensors.html

@@ -21,6 +21,7 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/pages/settings.html

@@ -21,6 +21,7 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>
@@ -207,6 +208,50 @@
                 <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
               </label>
 
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.ohProtection.title</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.ohProtection.highTemp.title</span>
+                    <input type="number" inputmode="numeric" name="heating[overheatProtection][highTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.highTemp.note</small>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.ohProtection.lowTemp.title</span>
+                    <input type="number" inputmode="numeric" name="heating[overheatProtection][lowTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.lowTemp.note</small>
+                  </label>
+                </div>
+
+                <small data-i18n>settings.ohProtection.desc</small>
+              </details>
+
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.freezeProtection.title</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.freezeProtection.lowTemp</span>
+                    <input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.freezeProtection.thresholdTime</span>
+                    <input type="number" inputmode="numeric" name="heating[freezeProtection][thresholdTime]" min="30" max="1800" step="1" required>
+                  </label>
+                </div>
+
+                <small data-i18n>settings.freezeProtection.desc</small>
+              </details>
+
+              <br />
+
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -236,6 +281,30 @@
                 <input type="number" inputmode="numeric" name="dhw[maxModulation]" min="1" max="100" step="1" required>
               </label>
 
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.ohProtection.title</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.ohProtection.highTemp.title</span>
+                    <input type="number" inputmode="numeric" name="dhw[overheatProtection][highTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.highTemp.note</small>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.ohProtection.lowTemp.title</span>
+                    <input type="number" inputmode="numeric" name="dhw[overheatProtection][lowTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.lowTemp.note</small>
+                  </label>
+                </div>
+
+                <small data-i18n>settings.ohProtection.desc</small>
+              </details>
+
+              <br />
+
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -483,9 +552,15 @@
                 </label>
               </div>
 
-              <fieldset>
+              <details>
-                <legend data-i18n>settings.ot.options.desc</legend>
+                <summary><b data-i18n>settings.ot.options.title</b></summary>
 
+                <div>
+                  <fieldset>
+                    <small data-i18n>settings.ot.options.desc</small>
+                  </fieldset>
+
+                  <fieldset>
                     <label>
                       <input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
                       <span data-i18n>settings.ot.options.dhwSupport</span>
@@ -526,6 +601,11 @@
                       <span data-i18n>settings.ot.options.dhwBlocking</span>
                     </label>
 
+                    <label>
+                      <input type="checkbox" name="opentherm[options][dhwStateAsDhwBlocking]" value="true">
+                      <span data-i18n>settings.ot.options.dhwStateAsDhwBlocking</span>
+                    </label>
+
                     <label>
                       <input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
                       <span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
@@ -562,13 +642,17 @@
                     </label>
 
                     <hr />
+
                     <label>
                       <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
                       <span data-i18n>settings.ot.nativeHeating.title</span><br />
                       <small data-i18n>settings.ot.nativeHeating.note</small>
                     </label>
                   </fieldset>
+                </div>
+              </details>
               
+              <br />
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -679,6 +763,42 @@
 
         <hr />
 
+        <details> 
+          <summary><b data-i18n>settings.section.extDev</b></summary>
+          <div>
+            <div id="extdev-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="extdev-settings" class="hidden">
+              <fieldset>
+                <label for="extdev-use">
+                  <input type="checkbox" id="extdev-use" name="externalDev[use]" value="false">
+                  <span data-i18n>settings.extDev.use</span>
+                </label>
+
+                <label for="extdev-state">
+                  <input type="checkbox" id="extdev-state" name="externalDev[state]" value="false">
+                  <span data-i18n>settings.extDev.state</span>
+                </label>
+              </fieldset>
+              
+              <div class="grid">
+                <label for="extdev-gpio">
+                  <span data-i18n>settings.extDev.gpio</span>
+                  <input type="number" inputmode="numeric" id="extdev-gpio" name="externalDev[gpio]" min="0" max="254" step="1">
+                </label>
+                
+                <label for="extdev-caption">
+                  <span data-i18n>settings.extDev.caption</span>
+                  <input type="text" id="extdev-caption" name="externalDev[caption]" maxlength="40" required>
+                </label>
+              </div>
+              
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
         <details>
           <summary><b data-i18n>settings.section.cascadeControl</b></summary>
           <div>
@@ -818,6 +938,7 @@
           setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
           setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
           setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
+          setCheckboxValue("[name='opentherm[options][dhwStateAsDhwBlocking]']", data.opentherm.options.dhwStateAsDhwBlocking);
           setCheckboxValue("[name='opentherm[options][maxTempSyncWithTargetTemp]']", data.opentherm.options.maxTempSyncWithTargetTemp);
           setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
           setCheckboxValue("[name='opentherm[options][ignoreDiagState]']", data.opentherm.options.ignoreDiagState);
@@ -847,6 +968,13 @@
           setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
           setBusy('#extpump-settings-busy', '#extpump-settings', false);
 
+          // Extdev
+          setCheckboxValue('#extdev-use', data.externalDev.use);
+          setInputValue('#extdev-gpio', data.externalDev.gpio < 255 ? data.externalDev.gpio : '');
+          setInputValue('#extdev-caption', data.externalDev.caption);
+          setCheckboxValue('#extdev-state', data.externalDev.state);
+          setBusy('#extdev-settings-busy', '#extdev-settings', false);
+
           // Cascade control
           setCheckboxValue("[name='cascadeControl[input][enabled]']", data.cascadeControl.input.enabled);
           setInputValue("[name='cascadeControl[input][gpio]']", data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
@@ -874,6 +1002,19 @@
           setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
           setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
           setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
+          setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setInputValue("[name='heating[overheatProtection][lowTemp]']", data.heating.overheatProtection.lowTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue("[name='heating[freezeProtection][lowTemp]']", data.heating.freezeProtection.lowTemp, {
+            "min": data.system.unitSystem == 0 ? 1 : 34,
+            "max": data.system.unitSystem == 0 ? 30 : 86
+          });
+          setInputValue("[name='heating[freezeProtection][thresholdTime]']", data.heating.freezeProtection.thresholdTime);
           setBusy('#heating-settings-busy', '#heating-settings', false);
 
           // DHW
@@ -886,14 +1027,21 @@
             "max": data.system.unitSystem == 0 ? 100 : 212
           });
           setInputValue("[name='dhw[maxModulation]']", data.dhw.maxModulation);
+          setInputValue("[name='dhw[overheatProtection][highTemp]']", data.dhw.overheatProtection.highTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setInputValue("[name='dhw[overheatProtection][lowTemp]']", data.dhw.overheatProtection.lowTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
           setBusy('#dhw-settings-busy', '#dhw-settings', false);
 
           // Emergency mode
-          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
           if (data.opentherm.options.nativeHeatingControl) {
             setInputValue("[name='emergency[target]']", data.emergency.target, {
               "min": data.system.unitSystem == 0 ? 5 : 41,
-              "max": data.system.unitSystem == 0 ? 40 : 86
+              "max": data.system.unitSystem == 0 ? 40 : 104
             });
 
           } else {
@@ -902,7 +1050,7 @@
               "max": data.heating.maxTemp,
             });
           }
-
+          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
           setBusy('#emergency-settings-busy', '#emergency-settings', false);
 
           // Equitherm
@@ -980,6 +1128,7 @@
           setupForm('#ot-settings', fillData);
           setupForm('#mqtt-settings', fillData, ['mqtt.user', 'mqtt.password', 'mqtt.prefix']);
           setupForm('#extpump-settings', fillData);
+          setupForm('#extdev-settings', fillData);
           setupForm('#cc-settings', fillData);
 
         } catch (error) {

src_data/pages/upgrade.html

@@ -21,6 +21,7 @@
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
               <option value="it">IT</option>
               <option value="ru">RU</option>
             </select>

src_data/styles/app.css

@@ -3,6 +3,10 @@
     --pico-block-spacing-vertical: calc(var(--pico-spacing) * 0.75);
     --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 0.75);
   }
+
+  .logo {
+    font-size: 1.2rem;
+  }
 }
 
 @media (min-width: 768px) {
@@ -10,6 +14,10 @@
     --pico-block-spacing-vertical: var(--pico-spacing);
     --pico-block-spacing-horizontal: var(--pico-spacing);
   }
+
+  .logo {
+    font-size: 1.25rem;
+  }
 }
 
 @media (min-width: 1024px) {
@@ -17,6 +25,10 @@
     --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.25);
     --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.25);
   }
+
+  .logo {
+    font-size: 1.25rem;
+  }
 }
 
 @media (min-width: 1280px) {
@@ -25,6 +37,10 @@
     --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.5);
   }
 
+  .logo {
+    font-size: 1.3rem;
+  }
+
   .container {
     max-width: 1000px;
   }
@@ -36,6 +52,10 @@
     --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.75);
   }
 
+  .logo {
+    font-size: 1.3rem;
+  }
+
   .container {
     max-width: 1000px;
   }
@@ -111,7 +131,7 @@ tr.network:hover {
   border-radius: var(--pico-border-radius);
   color: var(--pico-code-kbd-color);
   font-weight: bolder;
-  font-size: 1.3rem;
+  /*font-size: 1.3rem;*/
   font-family: var(--pico-font-family-monospace);
 }
 

tools/esp32.py

@@ -23,10 +23,15 @@ Import("env")
 platform = env.PioPlatform()
 
 import sys
+import os
+import subprocess
 from os.path import join
 
-sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
+def normalize_paths(cmd):
-import esptool
+    for i, arg in enumerate(cmd):
+        if isinstance(arg, str) and '/' in arg:
+            cmd[i] = os.path.normpath(arg)
+    return cmd
 
 def esp32_create_combined_bin(source, target, env):
     print("Generating combined binary for serial flashing")
@@ -39,26 +44,21 @@ def esp32_create_combined_bin(source, target, env):
     sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
     firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
     chip = env.get("BOARD_MCU")
-    flash_size = env.BoardConfig().get("upload.flash_size")
+    flash_size = env.BoardConfig().get("upload.flash_size", "4MB")
-    flash_freq = env.BoardConfig().get("build.f_flash", '40m')
+    flash_mode = env["__get_board_flash_mode"](env)
-    flash_freq = flash_freq.replace('000000L', 'm')
+    flash_freq = env["__get_board_f_flash"](env)
-    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
+
-    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
-    if flash_mode == "qio" or flash_mode == "qout":
-        flash_mode = "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
-        flash_mode = "dout"
     cmd = [
         "--chip",
         chip,
-        "merge_bin",
+        "merge-bin",
         "-o",
         new_file_name,
-        "--flash_mode",
+        "--flash-mode",
         flash_mode,
-        "--flash_freq",
+        "--flash-freq",
         flash_freq,
-        "--flash_size",
+        "--flash-size",
         flash_size,
     ]
 
@@ -71,9 +71,12 @@ def esp32_create_combined_bin(source, target, env):
     print(f" - {hex(app_offset)} | {firmware_name}")
     cmd += [hex(app_offset), firmware_name]
 
-    print('Using esptool.py arguments: %s' % ' '.join(cmd))
+    # print('Using esptool.py arguments: %s' % ' '.join(cmd))
-
+    cmdline = [env.subst("$OBJCOPY")] + normalize_paths(cmd)
-    esptool.main(cmd)
+    print('Command Line: %s' % cmdline)
+    result = subprocess.run(cmdline, text=True, check=False, stdout=subprocess.DEVNULL)
+    if result.returncode != 0:
+        print(f"esptool create firmware failed with exit code: {result.returncode}")
 
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)