TRVZB (#1861)

* trying to fix the sonoff trvzb calibration problem

* maintenance

* maintenance

* mpc virtual temp

* mpc virtual temp

* mpc virtual temp

* trvzb quirk and maintenance

* maintenance and mpc virtual temp

* trv profile and performance curve

* block learning after window is closed again

* mpc learn fix

* remove solar gains

* mpc force loss learning

* mpc learning bugfix

* mpc save trv profile

* ka sensor - learning clampings

* new icon and lint

Author: wtom

custom_components/better_thermostat/climate.py

@@ -143,9 +143,14 @@ async def _apply_temperature_update(self, new_temp):
             "better_thermostat %s: external_temperature write to TRV failed (non critical)",
             self.device_name,
         )
-    # Enqueue control action
+    # Enqueue control action (skip during valve maintenance to avoid overwriting exercise).
+    # Still mark that a control cycle is needed after maintenance so we immediately
+    # resume with the latest temperature.
     if self.control_queue_task is not None:
-        await self.control_queue_task.put(self)
+        if getattr(self, "in_maintenance", False):
+            self._control_needed_after_maintenance = True
+        else:
+            await self.control_queue_task.put(self)
     _LOGGER.debug(
         "better_thermostat %s: _apply_temperature_update finished", self.device_name
     )

custom_components/better_thermostat/events/temperature.py

@@ -113,9 +113,14 @@ async def window_queue(self):
                     if current_window_state == window_event_to_process:
                         self.window_open = window_event_to_process
                         self.async_write_ha_state()
-                        if not self.control_queue_task.empty():
-                            empty_queue(self.control_queue_task)
-                        await self.control_queue_task.put(self)
+                        if getattr(self, "in_maintenance", False):
+                            # Keep state up to date during maintenance, but defer control
+                            # until maintenance ends.
+                            self._control_needed_after_maintenance = True
+                        else:
+                            if not self.control_queue_task.empty():
+                                empty_queue(self.control_queue_task)
+                            await self.control_queue_task.put(self)
             except asyncio.CancelledError:
                 raise
             finally:

custom_components/better_thermostat/events/window.py

@@ -4,12 +4,32 @@
 percentages and mirroring external temperature into the TRV when supported.
 """
 
+import asyncio
 import logging
 
 from homeassistant.helpers import entity_registry as er
 
 _LOGGER = logging.getLogger(__name__)
 
+VALVE_MAINTENANCE_INTERVAL_HOURS = 24
+
+# Some users report that the TRVZB motor can occasionally lose its calibration and
+# fail to fully close the valve when commanded to very small openings.
+#
+# Workaround: when requesting a further close (target_pct < last_pct), briefly
+# command the valve to open a bit more and then to the requested target.
+_TRVZB_CLOSE_BUMP_OPEN_DELTA_PCT = 10
+_TRVZB_CLOSE_BUMP_DELAY_S = 5.0
+
+
+def _cancel_pending_valve_bump(trv_state: dict) -> None:
+    task = trv_state.pop("_trvzb_valve_bump_task", None)
+    if task is not None:
+        try:
+            task.cancel()
+        except Exception:
+            pass
+
 
 def fix_local_calibration(self, entity_id, offset):
     """Return unchanged local calibration for TRVZB by default."""
@@ -215,7 +235,67 @@ async def override_set_valve(self, entity_id, percent: int):
     Returns True if handled (write attempted), False to let adapter fallback run.
     """
     try:
-        ok = await maybe_set_sonoff_valve_percent(self, entity_id, percent)
+        target_pct = max(0, min(100, int(percent)))
+
+        trv_state = self.real_trvs.get(entity_id)
+        if not isinstance(trv_state, dict):
+            return False
+
+        # During valve maintenance we don't want to add additional delayed steps.
+        if getattr(self, "in_maintenance", False):
+            ok = await maybe_set_sonoff_valve_percent(self, entity_id, target_pct)
+            return bool(ok)
+
+        # Cancel any previous pending delayed "bump then set".
+        _cancel_pending_valve_bump(trv_state)
+
+        last_pct_raw = trv_state.get("last_valve_percent")
+        try:
+            last_pct = None if last_pct_raw is None else int(last_pct_raw)
+        except Exception:
+            last_pct = None
+
+        # If we don't know the last commanded percent, just set directly.
+        if last_pct is None:
+            ok = await maybe_set_sonoff_valve_percent(self, entity_id, target_pct)
+            return bool(ok)
+
+        # Only apply workaround when closing further.
+        if target_pct < last_pct:
+            bump_pct = min(100, int(last_pct) + _TRVZB_CLOSE_BUMP_OPEN_DELTA_PCT)
+
+            # If we can't "bump open", fall back to direct set.
+            ok_bump = await maybe_set_sonoff_valve_percent(self, entity_id, bump_pct)
+            if not ok_bump:
+                ok = await maybe_set_sonoff_valve_percent(self, entity_id, target_pct)
+                return bool(ok)
+
+            seq = int(trv_state.get("_trvzb_valve_bump_seq", 0)) + 1
+            trv_state["_trvzb_valve_bump_seq"] = seq
+
+            async def _delayed_set():
+                try:
+                    await asyncio.sleep(float(_TRVZB_CLOSE_BUMP_DELAY_S))
+                    cur_state = self.real_trvs.get(entity_id, {}) or {}
+                    if int(cur_state.get("_trvzb_valve_bump_seq", 0)) != seq:
+                        return
+                    await maybe_set_sonoff_valve_percent(self, entity_id, target_pct)
+                except asyncio.CancelledError:
+                    return
+                except Exception as ex:
+                    _LOGGER.debug(
+                        "better_thermostat %s: TRVZB delayed valve set exception: %s",
+                        getattr(self, "device_name", "unknown"),
+                        ex,
+                    )
+
+            trv_state["_trvzb_valve_bump_task"] = self.hass.async_create_task(
+                _delayed_set()
+            )
+            return True
+
+        # Opening (or same) => set directly.
+        ok = await maybe_set_sonoff_valve_percent(self, entity_id, target_pct)
         return bool(ok)
     except Exception:
         return False

custom_components/better_thermostat/model_fixes/TRVZB.py

@@ -13,6 +13,8 @@
 STATE_UNLOCKED = "unlocked"
 _LOGGER = logging.getLogger(__name__)
 
+VALVE_MAINTENANCE_INTERVAL_HOURS = 168  # Default: 7 days
+
 
 def fix_local_calibration(self, entity_id, offset):
     """Return the given local calibration offset unchanged."""

custom_components/better_thermostat/model_fixes/default.py

@@ -54,6 +54,7 @@ async def async_setup_entry(
                 BetterThermostatVirtualTempSensor(bt_climate),
                 BetterThermostatMpcGainSensor(bt_climate),
                 BetterThermostatMpcLossSensor(bt_climate),
+                BetterThermostatMpcKaSensor(bt_climate),
                 BetterThermostatMpcStatusSensor(bt_climate),
             ]
         )
@@ -328,6 +329,61 @@ def _update_state(self):
             self._attr_native_value = None
 
 
+class BetterThermostatMpcKaSensor(SensorEntity):
+    """Representation of a Better Thermostat MPC Insulation (Ka) Sensor."""
+
+    _attr_has_entity_name = True
+    _attr_name = "MPC Insulation"
+    _attr_device_class = None
+    _attr_state_class = SensorStateClass.MEASUREMENT
+    _attr_native_unit_of_measurement = "1/min"
+    _attr_should_poll = False
+    _attr_icon = "mdi:home-thermometer"
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    def __init__(self, bt_climate):
+        """Initialize the sensor."""
+        self._bt_climate = bt_climate
+        self._attr_unique_id = f"{bt_climate.unique_id}_mpc_ka"
+        self._attr_device_info = bt_climate.device_info
+
+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        if self._bt_climate.entity_id:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [self._bt_climate.entity_id], self._on_climate_update
+                )
+            )
+        self._update_state()
+
+    @callback
+    def _on_climate_update(self, event):
+        """Handle climate entity update."""
+        self._update_state()
+        self.async_write_ha_state()
+
+    def _update_state(self):
+        """Update state from climate entity."""
+        val = None
+        if hasattr(self._bt_climate, "real_trvs"):
+            for trv_id, trv_data in self._bt_climate.real_trvs.items():
+                cal_bal = trv_data.get("calibration_balance")
+                if cal_bal and "debug" in cal_bal:
+                    debug = cal_bal["debug"]
+                    if "mpc_ka" in debug:
+                        val = debug["mpc_ka"]
+                        break
+
+        if val is not None:
+            try:
+                self._attr_native_value = float(val)
+            except (ValueError, TypeError):
+                self._attr_native_value = None
+        else:
+            self._attr_native_value = None
+
+
 class BetterThermostatSolarIntensitySensor(SensorEntity):
     """Representation of a Better Thermostat Solar Intensity Sensor."""