Merge branch 'master' into async

chore: fix ha blueprints to support all source sensors
chore: updated ha blueprints for new releases
2026-02-02 23:57:44 +05:00 · 2026-01-26 02:19:54 +03:00 · 2026-01-26 02:09:57 +03:00 · 2026-01-26 01:59:03 +03:00 · 2026-01-26 01:03:26 +03:00 · 2026-01-23 00:25:12 +03:00
6 changed files with 46 additions and 35 deletions
--- a/assets/ha/report_temp_to_otgateway.yaml
+++ b/assets/ha/report_temp_to_otgateway.yaml
@@ -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:
--- a/assets/ha/report_temp_to_otgateway_from_weather.yaml
+++ b/assets/ha/report_temp_to_otgateway_from_weather.yaml
@@ -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:
--- a/platformio.ini
+++ b/platformio.ini
@@ -6,9 +6,9 @@ core_dir                = .pio
 [env]
 version                 = 1.6.0-async
 framework               = arduino
-lib_deps                = ESP32Async/AsyncTCP@^2.0.0
+lib_deps                = ESP32Async/AsyncTCP@^3.4.10
                          ESP32Async/ESPAsyncWebServer@^3.9.4
-													mathieucarbou/MycilaWebSerial@^8.2.0
+                          mathieucarbou/MycilaWebSerial@^8.2.0
                          bblanchon/ArduinoJson@^7.4.2
                          ;ihormelnyk/OpenTherm Library@^1.1.5
                          https://github.com/Laxilef/opentherm_library#esp32_timer
@@ -16,9 +16,12 @@ lib_deps                = ESP32Async/AsyncTCP@^2.0.0
                          gyverlibs/FileData@^1.0.3
                          gyverlibs/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.5
+                          https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
                          ;laxilef/TinyLogger@^1.1.1
-													https://github.com/Laxilef/TinyLogger#custom_handlers
+                          https://github.com/Laxilef/TinyLogger#custom_handlers
+lib_ignore              = paulstoffregen/OneWire
 build_type              = ${secrets.build_type}
 build_flags             = -mtext-section-literals
                          -Wno-deprecated-declarations
@@ -29,7 +32,7 @@ build_flags             = -mtext-section-literals
                          -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
                          -D ARDUINOJSON_USE_DOUBLE=0
                          -D ARDUINOJSON_USE_LONG_LONG=0
-													-D TINYLOGGER_GLOBAL
+                          -D TINYLOGGER_GLOBAL
                          -D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
                          -D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
                          -D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
@@ -58,13 +61,14 @@ check_flags             = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/l

 ; Defaults
 [esp32_defaults]
-platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
+platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
 platform_packages       = ${env.platform_packages}
 board_build.partitions  = esp32_partitions.csv
 lib_deps                = ${env.lib_deps}
                          laxilef/ESP32Scheduler@^1.0.1
 nimble_lib              = https://github.com/h2zero/NimBLE-Arduino
-lib_ignore              = BluetoothSerial
+lib_ignore              = ${env.lib_ignore}
+                          BluetoothSerial
                          SimpleBLE
                          ESP RainMaker
                          RainMaker
@@ -143,7 +147,7 @@ lib_deps                = ${esp32_defaults.lib_deps}
 build_unflags           = -mtext-section-literals
 build_flags             = ${esp32_defaults.build_flags}
                          -D MYNEWT_VAL_BLE_EXT_ADV=1
-													-D USE_BLE=1
+                          -D USE_BLE=1
                          -D DEFAULT_OT_IN_GPIO=8
                          -D DEFAULT_OT_OUT_GPIO=10
                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
@@ -205,7 +209,7 @@ lib_deps                = ${esp32_defaults.lib_deps}
                          ${esp32_defaults.nimble_lib}
 build_unflags           = -mtext-section-literals
 build_flags             = ${esp32_defaults.build_flags}
-													-D MYNEWT_VAL_BLE_EXT_ADV=1
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
                          -D USE_BLE=1
                          -D DEFAULT_OT_IN_GPIO=3
                          -D DEFAULT_OT_OUT_GPIO=1
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -128,8 +128,6 @@ protected:
        tMqtt->disable();
      }

-      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
-
    } else {
      if (this->ntpStarted) {
        this->ntpStarted = false;
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -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);
+        }
+      }
    }
  }

--- a/src/utils.h
+++ b/src/utils.h
@@ -2099,21 +2099,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) {
Author	SHA1	Message	Date
Yurii	ced0385d5b	Merge branch 'master' into async	2026-01-26 02:19:54 +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	80e2d8e939	Merge branch 'master' into async	2026-01-23 00:25:12 +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