chore: bump cssnano-preset-advanced from 7.0.16 to 8.0.0

Bumps [cssnano-preset-advanced](https://github.com/cssnano/cssnano) from 7.0.16 to 8.0.0. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano-preset-advanced@7.0.16...cssnano-preset-advanced@8.0.0) --- updated-dependencies: - dependency-name: cssnano-preset-advanced dependency-version: 8.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
chore: bump gulp-html-minifier-terser from 7.1.0 to 8.0.0 (#224 )
2026-05-07 09:48:24 +05:00 · 2026-05-06 15:25:38 +00:00 · 2026-02-16 23:36:56 +03:00 · 2026-02-13 14:10:08 +03:00 · 2026-02-13 11:21:17 +03:00 · 2026-02-12 23:32:39 +03:00
24 changed files with 303 additions and 149 deletions
@@ -1,5 +1,5 @@
 # Blueprint for reporting indoor/outdoor temperature to OpenTherm Gateway from any home assistant sensor
-# Updated: 03.09.2024
+# Updated: 26.01.2026

 blueprint:
  name: Report temp to OpenTherm Gateway
@@ -15,7 +15,6 @@ blueprint:
          multiple: false
          filter:
            - domain: sensor
-              device_class: temperature
    target_entity:
      name: Target entity
      description: "Usually ``number.opentherm_indoor_temp`` or ``number.opentherm_outdoor_temp``"
@@ -38,8 +37,12 @@ condition:
    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
  - if:
-      - condition: template
-        value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
+      - condition: or
+        conditions:
+          - condition: template
+            value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
+          - condition: template
+            value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
    then:
      - service: number.set_value
        data:
@@ -1,5 +1,5 @@
 # Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
-# Updated: 03.09.2024
+# Updated: 26.01.2026

 blueprint:
  name: Report temp to OpenTherm Gateway from Weather
@@ -37,8 +37,12 @@ condition:
    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
  - if:
-      - condition: template
-        value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
+      - condition: or
+        conditions:
+          - condition: template
+            value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
+          - condition: template
+            value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
    then:
      - service: number.set_value
        data:
@@ -70,50 +70,89 @@ public:
    }
  }

-  bool sendBoilerReset() {
-    unsigned int data = 1;
-    data <<= 8;
-    unsigned long response = this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      data
-    ));
-
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+  inline auto sendBoilerReset() {
+    return this->sendRequestCode(1);
  }

-  bool sendServiceReset() {
-    unsigned int data = 10;
-    data <<= 8;
-    unsigned long response = this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      data
-    ));
-
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+  inline auto sendServiceReset() {
+    return this->sendRequestCode(10);
  }

-  bool sendWaterFilling() {
-    unsigned int data = 2;
-    data <<= 8;
+  inline auto sendWaterFilling() {
+    return this->sendRequestCode(2);
+  }
+
+  bool sendRequestCode(const uint8_t requestCode) {
    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
      OpenThermMessageID::RemoteRequest,
-      data
+      static_cast<unsigned int>(requestCode) << 8
    ));

-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+    if (!isValidResponse(response) || !isValidResponseId(response, OpenThermMessageID::RemoteRequest)) {
+      return false;
+    }
+
+    const uint8_t responseRequestCode = (response & 0xFFFF) >> 8;
+    const uint8_t responseCode = response & 0xFF;
+    if (responseRequestCode != requestCode || responseCode < 128) {
+      return false;
+    }
+
+    // reset
+    this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      0u << 8
+    ));
+
+    return true;
+  }
+
+  bool getStr(OpenThermMessageID id, char* buffer, uint16_t length = 50) {
+    if (buffer == nullptr || length == 0) {
+      return false;
+    }
+
+    unsigned long response;
+    uint8_t index = 0;
+    uint8_t maxIndex = 255;
+
+    while (index <= maxIndex && index < length) {
+      response = this->sendRequest(buildRequest(
+        OpenThermMessageType::READ_DATA,
+        id,
+        static_cast<unsigned int>(index) << 8
+      ));
+
+      if (!isValidResponse(response) || !isValidResponseId(response, id)) {
+        break;
+      }
+
+      const uint8_t character = response & 0xFF;
+      if (character == 0) {
+        break;
+      }
+
+      if (index == 0) {
+        maxIndex = (response & 0xFFFF) >> 8;
+      }
+
+      buffer[index++] = static_cast<char>(character);
+    }
+
+    buffer[index] = '\0';
+    return index > 0;
  }

  static bool isCh2Active(unsigned long response) {
-      return response & 0x20;
+    return response & 0x20;
  }

  static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
-    uint8_t responseId = (response >> 16) & 0xFF;
+    const uint8_t responseId = (response >> 16) & 0xFF;

-    return (uint8_t)id == responseId;
+    return static_cast<uint8_t>(id) == responseId;
  }

  static uint8_t getResponseMessageTypeId(unsigned long response) {
@@ -124,10 +163,10 @@ public:
    uint8_t msgType = getResponseMessageTypeId(response);

    switch (msgType) {
-      case (uint8_t) OpenThermMessageType::READ_ACK:
-      case (uint8_t) OpenThermMessageType::WRITE_ACK:
-      case (uint8_t) OpenThermMessageType::DATA_INVALID:
-      case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
+      case static_cast<uint8_t>(OpenThermMessageType::READ_ACK):
+      case static_cast<uint8_t>(OpenThermMessageType::WRITE_ACK):
+      case static_cast<uint8_t>(OpenThermMessageType::DATA_INVALID):
+      case static_cast<uint8_t>(OpenThermMessageType::UNKNOWN_DATA_ID):
        return CustomOpenTherm::messageTypeToString(
          static_cast<OpenThermMessageType>(msgType)
        );
@@ -5,11 +5,11 @@
  },
  "devDependencies": {
    "cssnano": "^7.0.2",
-    "cssnano-preset-advanced": "^7.0.2",
+    "cssnano-preset-advanced": "^8.0.0",
    "gulp": "^5.0.0",
    "gulp-concat": "^2.6.1",
    "gulp-gzip": "^1.4.2",
-    "gulp-html-minifier-terser": "^7.1.0",
+    "gulp-html-minifier-terser": "^8.0.0",
    "gulp-jsonminify": "^1.1.0",
    "gulp-postcss": "^10.0.0",
    "gulp-terser": "^2.1.0",
@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
 core_dir = .pio

 [env]
-version = 1.5.6
+version = 1.6.0
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.4.2
@@ -25,8 +25,10 @@ lib_deps =
 	gyverlibs/FileData@^1.0.3
 	gyverlibs/GyverPID@^3.3.2
 	gyverlibs/GyverBlinker@^1.1.1
-	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
+	pstolarz/OneWireNg@^0.14.1
+	milesburton/DallasTemperature@^4.0.6
 	laxilef/TinyLogger@^1.1.1
+lib_ignore = OneWire
 build_type = ${secrets.build_type}
 build_flags = 
 	-mtext-section-literals
@@ -73,7 +75,7 @@ platform_packages = ${env.platform_packages}
 lib_deps = 
 	${env.lib_deps}
 	nrwiersma/ESP8266Scheduler@^1.2
-lib_ignore = 
+lib_ignore = ${env.lib_ignore}
 extra_scripts = 
 	post:tools/build.py
 build_type = ${env.build_type}
@@ -92,14 +94,14 @@ check_flags = ${env.check_flags}
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.34/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
 platform_packages = ${env.platform_packages}
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
 nimble_lib = h2zero/NimBLE-Arduino@2.3.7
-lib_ignore = 
+lib_ignore = ${env.lib_ignore}
 extra_scripts = 
 	post:tools/esp32.py
 	post:tools/build.py
@@ -135,8 +135,6 @@ protected:
        tMqtt->disable();
      }

-      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
-
    } else {
      if (this->ntpStarted) {
        this->ntpStarted = false;
@@ -171,7 +171,7 @@ protected:
    vars.master.heating.enabled = this->isReady()
      && settings.heating.enabled
      && vars.cascadeControl.input 
-      && (!vars.master.heating.blocking || settings.heating.hysteresis.action != HysteresisAction::DISABLE_HEATING)
+      && !vars.master.heating.blocking
      && !vars.master.heating.overheat;

    // DHW settings
@@ -186,7 +186,9 @@ protected:
      || (settings.opentherm.options.dhwToCh2 && settings.opentherm.options.dhwSupport && settings.dhw.enabled);

    if (settings.opentherm.options.heatingToCh2) {
-      vars.master.ch2.targetTemp = vars.master.heating.setpointTemp;
+      vars.master.ch2.targetTemp = !settings.opentherm.options.nativeOTC
+        ? vars.master.heating.setpointTemp
+        : vars.master.heating.targetTemp;

    } else if (settings.opentherm.options.dhwToCh2) {
      vars.master.ch2.targetTemp = vars.master.dhw.targetTemp;
@@ -305,6 +307,7 @@ protected:
      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_HOURS, false);
      Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_HOURS, false);
      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_HOURS, false);
+      Sensors::setConnectionStatusByType(Sensors::Type::OT_COOLING_HOURS, false);

      this->initialized = false;
      this->disconnectedTime = millis();
@@ -677,6 +680,21 @@ protected:
        }
      }

+      // Update cooling hours
+      if (Sensors::getAmountByType(Sensors::Type::OT_COOLING_HOURS, true)) {
+        if (this->updateCoolingHours()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received cooling hours: %hu"), vars.slave.stats.coolingHours);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_COOLING_HOURS, vars.slave.stats.coolingHours,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive cooling hours"));
+        }
+      }
+
      // Auto fault reset
      if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
        vars.actions.resetFault = true;
@@ -792,7 +810,7 @@ protected:
      bool result = this->updateDhwTemp();

      if (result) {
-        float convertedDhwTemp = convertTemp(
+        const float convertedDhwTemp = convertTemp(
          vars.slave.dhw.currentTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -816,7 +834,7 @@ protected:
    // Update DHW temp 2
    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
      if (this->updateDhwTemp2()) {
-        float convertedDhwTemp2 = convertTemp(
+        const float convertedDhwTemp2 = convertTemp(
          vars.slave.dhw.currentTemp2,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -840,7 +858,7 @@ protected:
    // Update DHW flow rate
    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
      if (this->updateDhwFlowRate()) {
-        float convertedDhwFlowRate = convertVolume(
+        const float convertedDhwFlowRate = convertVolume(
          vars.slave.dhw.flowRate,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -864,7 +882,7 @@ protected:
    // Update heating temp
    if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_TEMP, true)) {
      if (this->updateHeatingTemp()) {
-        float convertedHeatingTemp = convertTemp(
+        const float convertedHeatingTemp = convertTemp(
          vars.slave.heating.currentTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -888,7 +906,7 @@ protected:
    // Update heating return temp
    if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_RETURN_TEMP, true)) {
      if (this->updateHeatingReturnTemp()) {
-        float convertedHeatingReturnTemp = convertTemp(
+        const float convertedHeatingReturnTemp = convertTemp(
          vars.slave.heating.returnTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -913,7 +931,7 @@ protected:
    if (Sensors::getAmountByType(Sensors::Type::OT_CH2_TEMP, true)) {
      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeOTC) {
        if (this->updateCh2Temp()) {
-          float convertedCh2Temp = convertTemp(
+          const float convertedCh2Temp = convertTemp(
            vars.slave.ch2.currentTemp,
            settings.opentherm.unitSystem,
            settings.system.unitSystem
@@ -938,7 +956,7 @@ protected:
    // Update exhaust temp
    if (Sensors::getAmountByType(Sensors::Type::OT_EXHAUST_TEMP, true)) {
      if (this->updateExhaustTemp()) {
-        float convertedExhaustTemp = convertTemp(
+        const float convertedExhaustTemp = convertTemp(
          vars.slave.exhaust.temp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -962,7 +980,7 @@ protected:
    // Update heat exchanger temp
    if (Sensors::getAmountByType(Sensors::Type::OT_HEAT_EXCHANGER_TEMP, true)) {
      if (this->updateHeatExchangerTemp()) {
-        float convertedHeatExchTemp = convertTemp(
+        const float convertedHeatExchTemp = convertTemp(
          vars.slave.heatExchangerTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -986,7 +1004,7 @@ protected:
    // Update outdoor temp
    if (Sensors::getAmountByType(Sensors::Type::OT_OUTDOOR_TEMP, true)) {
      if (this->updateOutdoorTemp()) {
-        float convertedOutdoorTemp = convertTemp(
+        const float convertedOutdoorTemp = convertTemp(
          vars.slave.heating.outdoorTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1010,7 +1028,7 @@ protected:
    // Update solar storage temp
    if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_STORAGE_TEMP, true)) {
      if (this->updateSolarStorageTemp()) {
-        float convertedSolarStorageTemp = convertTemp(
+        const float convertedSolarStorageTemp = convertTemp(
          vars.slave.solar.storage,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1034,7 +1052,7 @@ protected:
    // Update solar collector temp
    if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_COLLECTOR_TEMP, true)) {
      if (this->updateSolarCollectorTemp()) {
-        float convertedSolarCollectorTemp = convertTemp(
+        const float convertedSolarCollectorTemp = convertTemp(
          vars.slave.solar.collector,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1080,7 +1098,7 @@ protected:
    // Update pressure
    if (Sensors::getAmountByType(Sensors::Type::OT_PRESSURE, true)) {
      if (this->updatePressure()) {
-        float convertedPressure = convertPressure(
+        const float convertedPressure = convertPressure(
          vars.slave.pressure,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1186,9 +1204,12 @@ protected:

    // Update DHW temp
    if (vars.master.dhw.enabled) {
+      // Target dhw temp
+      const float& targetTemp = vars.master.dhw.targetTemp;
+
      // Converted target dhw temp
-      float convertedTemp = convertTemp(
-        vars.master.dhw.targetTemp,
+      const float convertedTemp = convertTemp(
+        targetTemp,
        settings.system.unitSystem,
        settings.opentherm.unitSystem
      );
@@ -1200,7 +1221,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_DHW), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.dhw.targetTemp, convertedTemp, vars.slave.dhw.targetTemp
+            targetTemp, convertedTemp, vars.slave.dhw.targetTemp
          );

        } else {
@@ -1211,14 +1232,17 @@ protected:

    // Send indoor temp if AlwaysSendIndoorTemp option is enabled.
    if (settings.opentherm.options.nativeOTC || settings.opentherm.options.alwaysSendIndoorTemp) {
+      // Current indoor temp
+      const float& indoorTemp = vars.master.heating.indoorTemp;
+
      // Converted current indoor temp
-      float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

      // Set current indoor temp
      if (this->setRoomTemp(convertedTemp)) {
        Log.sinfoln(
          FPSTR(L_OT_HEATING), F("Set current indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-          vars.master.heating.indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
+          indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
        );
        
      } else {
@@ -1230,7 +1254,7 @@ protected:
        if (this->setRoomTempCh2(convertedTemp)) {
          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set current CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
+            indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
          );

        } else {
@@ -1241,8 +1265,15 @@ protected:

    // NativeOTC
    if (settings.opentherm.options.nativeOTC) {
+      // Target indoor temp
+      const float& targetTemp = vars.master.heating.targetTemp;
+
      // Converted target indoor temp
-      float convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );

      // Set target indoor temp
      if (this->needSetHeatingTemp(convertedTemp)) {
@@ -1251,7 +1282,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set target indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.targetTemp, convertedTemp, vars.slave.heating.targetTemp
+            targetTemp, convertedTemp, vars.slave.heating.targetTemp
          );

        } else {
@@ -1266,7 +1297,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set target CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
          );

        } else {
@@ -1275,10 +1306,22 @@ protected:
      }
    }

-    // Normal heating control
-    if (!settings.opentherm.options.nativeOTC && vars.master.heating.enabled) {
+    // Set heating temp
+    {
+      // Target heating temp
+      float targetTemp = 0.0f;
+      if (vars.master.heating.enabled) {
+        targetTemp = !settings.opentherm.options.nativeOTC
+          ? vars.master.heating.setpointTemp
+          : vars.master.heating.targetTemp;
+      }
+
      // Converted target heating temp
-      float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );

      if (this->needSetHeatingTemp(convertedTemp)) {
        // Set max heating temp
@@ -1286,13 +1329,13 @@ protected:
          if (this->setMaxHeatingTemp(convertedTemp)) {
            Log.sinfoln(
              FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
-              vars.master.heating.setpointTemp, convertedTemp
+              targetTemp, convertedTemp
            );

          } else {
            Log.swarningln(
              FPSTR(L_OT_HEATING), F("Failed set max heating temp: %.2f (converted: %.2f)"),
-              vars.master.heating.setpointTemp, convertedTemp
+              targetTemp, convertedTemp
            );
          }
        }
@@ -1303,7 +1346,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set target temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.setpointTemp, convertedTemp, vars.slave.heating.targetTemp
+            targetTemp, convertedTemp, vars.slave.heating.targetTemp
          );

        } else {
@@ -1313,27 +1356,30 @@ protected:
    }

    // Set CH2 temp
-    if (!settings.opentherm.options.nativeOTC && vars.master.ch2.enabled) {
-      if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
-        // Converted target CH2 temp
-        float convertedTemp = convertTemp(
-          vars.master.ch2.targetTemp,
-          settings.system.unitSystem,
-          settings.opentherm.unitSystem
-        );
+    if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
+      // Target CH2 heating temp
+      const float targetTemp = vars.master.ch2.enabled
+        ? vars.master.ch2.targetTemp
+        : 0.0f;

-        if (this->needSetCh2Temp(convertedTemp)) {
-          if (this->setCh2Temp(convertedTemp)) {
-            this->ch2SetTempTime = millis();
+      // Converted target CH2 temp
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );

-            Log.sinfoln(
-              FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-              vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
-            );
+      if (this->needSetCh2Temp(convertedTemp)) {
+        if (this->setCh2Temp(convertedTemp)) {
+          this->ch2SetTempTime = millis();

-          } else {
-            Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
-          }
+          Log.sinfoln(
+            FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
+            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
        }
      }
    }
@@ -1341,7 +1387,7 @@ protected:

    // Heating overheat control
    if (settings.heating.overheatProtection.highTemp > 0 && settings.heating.overheatProtection.lowTemp > 0) {
-      float highTemp = convertTemp(
+      const float highTemp = convertTemp(
        max({
          vars.slave.heating.currentTemp,
          vars.slave.heating.returnTemp,
@@ -1378,7 +1424,7 @@ protected:

    // DHW overheat control
    if (settings.dhw.overheatProtection.highTemp > 0 && settings.dhw.overheatProtection.lowTemp > 0) {
-      float highTemp = convertTemp(
+      const float highTemp = convertTemp(
        max({
          vars.slave.heating.currentTemp,
          vars.slave.heating.returnTemp,
@@ -1472,6 +1518,19 @@ protected:
    } else {
      Log.swarningln(FPSTR(L_OT), F("Failed set master config"));
    }
+
+    /*char buf[100];
+    if (this->instance->getStr(OpenThermMessageID::Brand, buf, sizeof(buf) - 1)) {
+      Log.snoticeln(FPSTR(L_OT), F("Slave brand: %s"), buf);
+    }
+
+    if (this->instance->getStr(OpenThermMessageID::BrandVersion, buf, sizeof(buf) - 1)) {
+      Log.snoticeln(FPSTR(L_OT), F("Slave brand version: %s"), buf);
+    }
+
+    if (this->instance->getStr(OpenThermMessageID::BrandSerialNumber, buf, sizeof(buf) - 1)) {
+      Log.snoticeln(FPSTR(L_OT), F("Slave brand s/n: %s"), buf);
+    }*/
  }

  bool isReady() {
@@ -1649,7 +1708,7 @@ protected:
  }


-  bool setRoomTemp(float temperature) {
+  bool setRoomTemp(const float temperature) {
    const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermMessageType::WRITE_DATA,
@@ -1669,7 +1728,7 @@ protected:
    return CustomOpenTherm::getUInt(response) == request;
  }

-  bool setRoomTempCh2(float temperature) {
+  bool setRoomTempCh2(const float temperature) {
    const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermMessageType::WRITE_DATA,
@@ -2171,6 +2230,25 @@ protected:
    return true;
  }

+  bool updateCoolingHours() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::CoolingOperationHours,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CoolingOperationHours)) {
+      return false;
+    }
+
+    vars.slave.stats.coolingHours = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
  bool updateModulationLevel() {
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermRequestType::READ_DATA,
@@ -2185,7 +2263,7 @@ protected:
      return false;
    }

-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
    if (value < 0) {
      return false;
    }
@@ -2209,7 +2287,7 @@ protected:
      return false;
    }

-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2233,7 +2311,7 @@ protected:
      return false;
    }

-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2287,7 +2365,7 @@ protected:
      return false;
    }

-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2351,7 +2429,7 @@ protected:
      return false;
    }

-    float value = (float) CustomOpenTherm::getInt(response);
+    const float value = (float) CustomOpenTherm::getInt(response);
    if (!isValidTemp(value, settings.opentherm.unitSystem, -40, 500)) {
      return false;
    }
@@ -2375,7 +2453,7 @@ protected:
      return false;
    }

-    float value = (float) CustomOpenTherm::getInt(response);
+    const float value = (float) CustomOpenTherm::getInt(response);
    if (value <= 0) {
      return false;
    }
@@ -2476,7 +2554,7 @@ protected:
      return false;
    }

-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
    if (value < 0) {
      return false;
    }
@@ -241,7 +241,17 @@ protected:

      doc.shrinkToFit();

-      this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"backup.json\""));
+      char filename[64];
+      getFilename(filename, sizeof(filename), "backup");
+
+      char contentDispositionHeaderValue[128];
+      snprintf_P(
+        contentDispositionHeaderValue,
+        sizeof(contentDispositionHeaderValue),
+        PSTR("attachment; filename=\"%s\""),
+        filename
+      );
+      this->webServer->sendHeader(F("Content-Disposition"), contentDispositionHeaderValue);
      this->bufferedWebServer->send(200, F("application/json"), doc);
    });

@@ -839,7 +849,18 @@ protected:
      
      doc.shrinkToFit();

-      this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"debug.json\""));
+      char filename[64];
+      getFilename(filename, sizeof(filename), "debug");
+
+      char contentDispositionHeaderValue[128];
+      snprintf_P(
+        contentDispositionHeaderValue,
+        sizeof(contentDispositionHeaderValue),
+        PSTR("attachment; filename=\"%s\""),
+        filename
+      );
+
+      this->webServer->sendHeader(F("Content-Disposition"), contentDispositionHeaderValue);
      this->bufferedWebServer->send(200, F("application/json"), doc, true);
    });

@@ -1046,4 +1067,12 @@ protected:
    this->dnsServer->stop();
    this->dnsServerEnabled = false;
  }
+
+  static void getFilename(char* filename, size_t maxSizeFilename, const char* type) {
+    const time_t now = time(nullptr);
+    const tm* localNow = localtime(&now);
+    char localNowValue[20];
+    strftime(localNowValue, sizeof(localNowValue), PSTR("%Y-%m-%d-%H-%M-%S"), localNow);
+    snprintf_P(filename, maxSizeFilename, PSTR("%s_%s_%s.json"), networkSettings.hostname, localNowValue, type);
+  }
 };
@@ -57,23 +57,12 @@ protected:
    this->turbo();
    this->hysteresis();

-    if (vars.master.heating.blocking && settings.heating.hysteresis.action == HysteresisAction::SET_ZERO_TARGET) {
-      vars.master.heating.targetTemp = 0.0f;
-      vars.master.heating.setpointTemp = 0.0f;
-
-      // tick if PID enabled
-      if (settings.pid.enabled) {
-        this->getHeatingSetpointTemp();
-      }
-
-    } else {
-      vars.master.heating.targetTemp = settings.heating.target;
-      vars.master.heating.setpointTemp = roundf(constrain(
-        this->getHeatingSetpointTemp(),
-        this->getHeatingMinSetpointTemp(),
-        this->getHeatingMaxSetpointTemp()
-      ), 0);
-    }
+    vars.master.heating.targetTemp = settings.heating.target;
+    vars.master.heating.setpointTemp = roundf(constrain(
+      this->getHeatingSetpointTemp(),
+      this->getHeatingMinSetpointTemp(),
+      this->getHeatingMaxSetpointTemp()
+    ), 0);

    Sensors::setValueByType(
      Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,
@@ -34,6 +34,7 @@ public:
    OT_DHW_BURNER_HOURS     = 24,
    OT_HEATING_PUMP_HOURS   = 25,
    OT_DHW_PUMP_HOURS       = 26,
+    OT_COOLING_HOURS        = 27,
    
    NTC_10K_TEMP            = 50,
    DALLAS_TEMP             = 51,
@@ -66,7 +66,8 @@ public:
  }

 protected:
-  const unsigned int disconnectedTimeout = 120000;
+  const unsigned int wiredDisconnectTimeout = 180000u;
+  const unsigned int wirelessDisconnectTimeout = 600000u;
  const unsigned short dallasSearchInterval = 60000;
  const unsigned short dallasPollingInterval = 10000;
  const unsigned short globalPollingInterval = 15000;
@@ -1004,12 +1005,16 @@ protected:
      } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
        Sensors::setConnectionStatusById(sensorId, false, false);

-      } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
-        Sensors::setConnectionStatusById(sensorId, false, false);
+      } else if (rSensor.connected) {
+        if (sSensor.type == Sensors::Type::MANUAL || sSensor.type == Sensors::Type::BLUETOOTH) {
+          if ((millis() - rSensor.activityTime) > this->wirelessDisconnectTimeout) {
+            Sensors::setConnectionStatusById(sensorId, false, false);
+          }

-      }/* else if (!rSensor.connected) {
-        rSensor.connected = true;
-      }*/
+        } else if ((millis() - rSensor.activityTime) > this->wiredDisconnectTimeout) {
+          Sensors::setConnectionStatusById(sensorId, false, false);
+        }
+      }
    }
  }

@@ -389,6 +389,7 @@ struct Variables {
      uint16_t dhwBurnerStarts = 0;
      uint16_t heatingPumpStarts = 0;
      uint16_t dhwPumpStarts = 0;
+      uint16_t coolingHours = 0;
      uint16_t burnerHours = 0;
      uint16_t dhwBurnerHours = 0;
      uint16_t heatingPumpHours = 0;
@@ -1932,6 +1932,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_HOURS):
      case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_HOURS):
      case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_HOURS):
+      case static_cast<uint8_t>(Sensors::Type::OT_COOLING_HOURS):

      case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
      case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
@@ -2108,21 +2109,18 @@ bool jsonToSensorResult(const uint8_t sensorId, const JsonVariantConst src) {
    return false;
  }

-  auto& dst = Sensors::results[sensorId];
-  bool changed = false;
-
  // value
  if (!src[FPSTR(S_VALUE)].isNull()) {
-    float value = src[FPSTR(S_VALUE)].as<float>();
-
-    uint8_t vType = static_cast<uint8_t>(Sensors::ValueType::PRIMARY);
-    if (fabsf(value - dst.values[vType]) > 0.0001f) {
-      dst.values[vType] = roundf(value, 2);
-      changed = true;
-    }
+    return Sensors::setValueById(
+      sensorId,
+      src[FPSTR(S_VALUE)].as<float>(),
+      Sensors::ValueType::PRIMARY,
+      true,
+      true
+    );
  }

-  return changed;
+  return false;
 }

 void varsToJson(const Variables& src, JsonVariant dst) {
@@ -2131,7 +2129,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  slave[FPSTR(S_FLAGS)] = src.slave.flags;
  slave[FPSTR(S_TYPE)] = src.slave.type;
  slave[FPSTR(S_APP_VERSION)] = src.slave.appVersion;
-  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.appVersion;
+  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.protocolVersion;
  slave[FPSTR(S_CONNECTED)] = src.slave.connected;
  slave[FPSTR(S_FLAME)] = src.slave.flame;

@@ -243,6 +243,7 @@
        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
+        "otCoolingHours": "OpenTherm, number of cooling hours",
        
        "ntcTemp": "NTC 传感器",
        "dallasTemp": "DALLAS 传感器",
@@ -243,6 +243,7 @@
        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
+        "otCoolingHours": "OpenTherm, number of cooling hours",
        
        "ntcTemp": "NTC sensor",
        "dallasTemp": "DALLAS sensor",
@@ -243,6 +243,7 @@
        "otDhwBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore (ACS)",
        "otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
        "otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
+        "otCoolingHours": "OpenTherm, numero di ore di funzionamento della cooling",
        
        "ntcTemp": "Sensore NTC",
        "dallasTemp": "Sensore DALLAS",
@@ -222,6 +222,8 @@
        "otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
        "otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
        "otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
+        "otCoolingHours": "OpenTherm, aantal cooling",
+
        "ntcTemp": "NTC-sensor",
        "dallasTemp": "DALLAS-sensor",
        "bluetooth": "BLE-sensor",
@@ -243,6 +243,7 @@
        "otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
        "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
        "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
+        "otCoolingHours": "OpenTherm, кол-во часов работы охлаждения",
        
        "ntcTemp": "NTC датчик",
        "dallasTemp": "DALLAS датчик",
@@ -320,7 +320,7 @@

      document.addEventListener('DOMContentLoaded', async () => {
        const lang = new Lang(document.getElementById('lang'));
-        lang.build();
+        await lang.build();

        let actionTimer = null;
        let actionLongPress = false;
@@ -169,7 +169,7 @@
    <script>
      document.addEventListener('DOMContentLoaded', async () => {
        const lang = new Lang(document.getElementById('lang'));
-        lang.build();
+        await lang.build();

        setTimeout(async function onLoadPage() {
          try {
@@ -179,7 +179,7 @@
    <script>
      document.addEventListener('DOMContentLoaded', async () => {
        const lang = new Lang(document.getElementById('lang'));
-        lang.build();
+        await lang.build();

        const fillData = (data) => {
          setInputValue("[name='hostname']", data.hostname);
@@ -113,6 +113,7 @@
                      <option value="24" data-i18n>sensors.types.otDhwBurnerHours</option>
                      <option value="25" data-i18n>sensors.types.otHeatingPumpHours</option>
                      <option value="26" data-i18n>sensors.types.otDhwPumpHours</option>
+                      <option value="27" data-i18n>sensors.types.otCoolingHours</option>

                      <option value="50" data-i18n>sensors.types.ntcTemp</option>
                      <option value="51" data-i18n>sensors.types.dallasTemp</option>
@@ -200,7 +201,7 @@
    <script>
      document.addEventListener("DOMContentLoaded", async () => {
        const lang = new Lang(document.getElementById("lang"));
-        lang.build();
+        await lang.build();

        const container = document.querySelector("article");
        const templateNode = container.querySelector("#template");
@@ -925,7 +925,7 @@
    <script>
      document.addEventListener('DOMContentLoaded', async () => {
        const lang = new Lang(document.getElementById('lang'));
-        lang.build();
+        await lang.build();

        let etChart = null;
        let etChartConfig = {
@@ -105,7 +105,7 @@
    <script>
      document.addEventListener('DOMContentLoaded', async () => {
        const lang = new Lang(document.getElementById('lang'));
-        lang.build();
+        await lang.build();

        setupRestoreBackupForm('#restore');
        setupUpgradeForm('#upgrade');
Author	SHA1	Message	Date
dependabot[bot]	a326e55e81	chore: bump cssnano-preset-advanced from 7.0.16 to 8.0.0 Bumps [cssnano-preset-advanced](https://github.com/cssnano/cssnano) from 7.0.16 to 8.0.0. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano-preset-advanced@7.0.16...cssnano-preset-advanced@8.0.0) --- updated-dependencies: - dependency-name: cssnano-preset-advanced dependency-version: 8.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-06 15:25:38 +00:00
dependabot[bot]	4775d36f1b	chore: bump gulp-html-minifier-terser from 7.1.0 to 8.0.0 (#224 ) Bumps [gulp-html-minifier-terser](https://github.com/pioug/gulp-html-minifier-terser) from 7.1.0 to 8.0.0. - [Release notes](https://github.com/pioug/gulp-html-minifier-terser/releases) - [Commits](https://github.com/pioug/gulp-html-minifier-terser/compare/v7.1.0...v8.0.0) --- updated-dependencies: - dependency-name: gulp-html-minifier-terser dependency-version: 8.0.0 dependency-type: direct:development 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>	2026-02-16 23:36:56 +03:00
Yurii	1f895690db	chore: bump `milesburton/DallasTemperature` from 4.0.5 to 4.0.6 #213 https://github.com/milesburton/Arduino-Temperature-Control-Library/pull/289	2026-02-13 14:10:08 +03:00
Yurii	13e8bedf3f	fix: added `await` for `lang.build()`	2026-02-13 11:21:17 +03:00
Yurii	3a6bb03456	chore: fix build	2026-02-12 23:32:39 +03:00
Yurii	7fcca3c4aa	chore: fix ha blueprints to support all source sensors	2026-01-26 02:09:57 +03:00
Yurii	2f6bd237c7	chore: updated ha blueprints for new releases	2026-01-26 01:59:03 +03:00
Yurii	e4d1ba7d7b	refactor: added different timeouts for wired and wireless sensors	2026-01-26 01:03:26 +03:00
Yurii	b70c212235	fix: filtering fake data from ds18b20 (#217 )	2026-01-23 00:19:03 +03:00
Yurii	781b2a1f9c	chore: bump pioarduino/platform-espressif32 from 3.3.5 to 3.3.6	2026-01-23 00:17:30 +03:00
Konstantin	10ab75c055	feat: dynamic filenames for backup/debug (#207 ) * feat: generate dynamic filenames for JSON file downloads (backup and debug) based on hostname and timestamp * fix: threadsafe getFilename	2025-12-23 11:32:40 +03:00
Yurii	56a8574aba	chore: bump version to 1.6.0	2025-12-20 12:06:25 +03:00
Yurii	3adfabdf40	chore: bump `pioarduino/platform-espressif32` from 3.3.4 to 3.3.5	2025-12-20 12:06:06 +03:00
Yurii	a9220d9fa1	refactor: always set temperature to ID 1	2025-12-13 06:25:16 +03:00
Yurii	5a14857f52	refactor: minor changes	2025-12-13 06:21:21 +03:00
Yurii	e487c78921	feat: added sensor type "OT, Cooling hours"	2025-12-13 06:17:15 +03:00
Yurii	6c3b79bda1	fix: OT protocol version in JSON of slave fixed	2025-12-13 04:15:48 +03:00