Fix #669

custom_components/versatile_thermostat/base_thermostat.py

@@ -1132,6 +1132,11 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
         """Returns the underlying entities"""
         return self._underlyings
 
+    @property
+    def activable_underlying_entities(self) -> list | None:
+        """Returns the activable underlying entities for controling the central boiler"""
+        return self.underlying_entities
+
     def find_underlying_by_entity_id(self, entity_id: str) -> Entity | None:
         """Get the underlying entity by a entity_id"""
         for under in self._underlyings:

custom_components/versatile_thermostat/config_flow.py

@@ -72,8 +72,8 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         else:
             self._central_config = None
 
-        self._init_feature_flags(infos)
         self._init_central_config_flags(infos)
+        self._init_feature_flags(infos)
 
     def _init_feature_flags(self, _):
         """Fix features selection depending to infos"""
@@ -149,14 +149,17 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         if step_id not in ["type", "valve_regulation", "check_complete"]:
             return True
 
-        # underlyings_to_check = data if step_id == "type" else self._infos
-        underlyings_to_check = self._infos  # data if step_id == "type" else self._infos
+        underlyings_to_check = data if step_id == "type" else self._infos
+        # underlyings_to_check = self._infos  # data if step_id == "type" else self._infos
         regulation_infos_to_check = (
             data if step_id == "valve_regulation" else self._infos
         )
 
         ret = True
-        if self.is_valve_regulation_selected(underlyings_to_check):
+        if (
+            self.is_valve_regulation_selected(underlyings_to_check)
+            and step_id != "type"
+        ):
             nb_unders = len(underlyings_to_check.get(CONF_UNDERLYING_LIST))
             nb_offset = len(
                 regulation_infos_to_check.get(CONF_OFFSET_CALIBRATION_LIST, [])
@@ -562,7 +565,6 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         ):
             # Remove TPI info
             for key in [
-                PROPORTIONAL_FUNCTION_TPI,
                 CONF_PROP_FUNCTION,
                 CONF_TPI_COEF_INT,
                 CONF_TPI_COEF_EXT,

custom_components/versatile_thermostat/sensor.py

@@ -3,7 +3,7 @@
 import logging
 import math
 
-from homeassistant.core import HomeAssistant, callback, Event, CoreState
+from homeassistant.core import HomeAssistant, callback, Event, CoreState, State
 
 from homeassistant.const import (
     UnitOfTime,
@@ -23,13 +23,13 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.helpers.event import (
+    async_track_state_change_event,
+)
 
 from homeassistant.components.climate import (
     ClimateEntity,
     DOMAIN as CLIMATE_DOMAIN,
-    HVACAction,
-    HVACMode,
 )
 
 
@@ -708,7 +708,7 @@ class NbActiveDeviceForBoilerSensor(SensorEntity):
         for entity in component.entities:
             if isinstance(entity, BaseThermostat) and entity.is_used_by_central_boiler:
                 self._entities.append(entity)
-                for under in entity.underlying_entities:
+                for under in entity.activable_underlying_entities:
                     underlying_entities_id.append(under.entity_id)
         if len(underlying_entities_id) > 0:
             # Arme l'écoute de la première entité
@@ -728,21 +728,59 @@ class NbActiveDeviceForBoilerSensor(SensorEntity):
 
         await self.calculate_nb_active_devices(None)
 
-    async def calculate_nb_active_devices(self, _):
+    async def calculate_nb_active_devices(self, event: Event):
         """Calculate the number of active VTherm that have an
         influence on central boiler"""
 
-        _LOGGER.debug(
-            "%s - calculating the number of active underlying device for boiler activation",
-            self,
-        )
+        # _LOGGER.debug("%s- calculate_nb_active_devices - the event is %s ", self, event)
+
+        if event is not None:
+            new_state: State = event.data.get("new_state")
+            # _LOGGER.debug(
+            #     "%s - calculate_nb_active_devices new_state is %s", self, new_state
+            # )
+            if not new_state:
+                return
+
+            old_state: State = event.data.get("old_state")
+
+            # For underlying climate, we need to observe also the hvac_action if available
+            new_hvac_action = new_state.attributes.get("hvac_action")
+            old_hvac_action = (
+                old_state.attributes.get("hvac_action")
+                if old_state is not None
+                else None
+            )
+
+            # Filter events that are not interested for us
+            if (
+                old_state is not None
+                and new_state.state == old_state.state
+                and new_hvac_action == old_hvac_action
+            ):
+                # A false state change
+                return
+
+            _LOGGER.debug(
+                "%s - calculating the number of active underlying device for boiler activation. change change from %s to %s",
+                self,
+                old_state,
+                new_state,
+            )
+        else:
+            _LOGGER.debug(
+                "%s - calculating the number of active underlying device for boiler activation. First time calculation",
+                self,
+            )
+
         nb_active = 0
         for entity in self._entities:
-            _LOGGER.debug(
-                "Examining the hvac_action of %s",
-                entity.name,
-            )
             nb_active += entity.nb_device_actives
+            _LOGGER.debug(
+                "After examining the hvac_action of %s, nb_active is %s",
+                entity.name,
+                nb_active,
+            )
 
         self._attr_native_value = nb_active
         _LOGGER.debug(

custom_components/versatile_thermostat/thermostat_climate_valve.py

@@ -284,6 +284,11 @@ class ThermostatOverClimateValve(ThermostatOverClimate):
         else:
             return 0
 
+    @property
+    def activable_underlying_entities(self) -> list | None:
+        """Returns the activable underlying entities for controling the central boiler"""
+        return self._underlyings_valve_regulation
+
     @overrides
     async def service_set_auto_regulation_mode(self, auto_regulation_mode: str):
         """This should not be possible in valve regulation mode"""

tests/test_bugs.py

@@ -407,9 +407,10 @@ async def test_bug_500_1(hass: HomeAssistant, init_vtherm_api) -> None:
 
     flow = VersatileThermostatBaseConfigFlow(config)
 
-    assert flow._infos[CONF_USE_WINDOW_FEATURE] is True
-    assert flow._infos[CONF_USE_POWER_FEATURE] is True
-    assert flow._infos[CONF_USE_PRESENCE_FEATURE] is True
+    assert flow._infos[CONF_USE_WINDOW_FEATURE] is False
+    assert flow._infos[CONF_USE_POWER_FEATURE] is False
+    assert flow._infos[CONF_USE_PRESENCE_FEATURE] is False
+    # we have a motion sensor configured
     assert flow._infos[CONF_USE_MOTION_FEATURE] is True
 
 

tests/test_central_config.py

@@ -15,6 +15,10 @@ from custom_components.versatile_thermostat.thermostat_switch import (
     ThermostatOverSwitch,
 )
 
+from custom_components.versatile_thermostat.thermostat_climate import (
+    ThermostatOverClimate,
+)
+
 from custom_components.versatile_thermostat.vtherm_api import VersatileThermostatAPI
 
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import