Fix issue#32 Error with Fan Modes on thermostat over climate type

.devcontainer/configuration.yaml

@@ -111,3 +111,10 @@ recorder:
       - switch
       - climate
       - sensor
+
+template:
+  - binary_sensor:
+      - name: maison_occupee
+        unique_id: maison_occupee
+        state: "{{is_state('person.jmc', 'home') }}"
+        device_class: occupancy

custom_components/versatile_thermostat/climate.py

@@ -774,6 +774,50 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
 
         return self._hvac_list
 
+    @property
+    def fan_mode(self) -> str | None:
+        """Return the fan setting.
+
+        Requires ClimateEntityFeature.FAN_MODE.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.fan_mode
+
+        return None
+
+    @property
+    def fan_modes(self) -> list[str] | None:
+        """Return the list of available fan modes.
+
+        Requires ClimateEntityFeature.FAN_MODE.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.fan_modes
+
+        return []
+
+    @property
+    def swing_mode(self) -> str | None:
+        """Return the swing setting.
+
+        Requires ClimateEntityFeature.SWING_MODE.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.swing_mode
+
+        return None
+
+    @property
+    def swing_modes(self) -> list[str] | None:
+        """Return the list of available swing modes.
+
+        Requires ClimateEntityFeature.SWING_MODE.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.swing_modes
+
+        return None
+
     @property
     def temperature_unit(self):
         """Return the unit of measurement."""
@@ -820,10 +864,13 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
     @property
     def _is_device_active(self):
         """If the toggleable device is currently active."""
-        if self._is_over_climate or not self.hass.states.get(self._heater_entity_id):
+        if self._is_over_climate and self._underlying_climate:
-            return None
+            return self._underlying_climate.hvac_action not in [
-
+                CURRENT_HVAC_IDLE,
-        return self.hass.states.is_state(self._heater_entity_id, STATE_ON)
+                CURRENT_HVAC_OFF,
+            ]
+        else:
+            return self.hass.states.is_state(self._heater_entity_id, STATE_ON)
 
     @property
     def current_temperature(self):
@@ -1377,11 +1424,17 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
     async def _async_underlying_entity_turn_off(self):
         """Turn heater toggleable device off."""
         if not self._is_over_climate:
+            _LOGGER.debug(
+                "%s - Stopping underlying switch %s", self, self._heater_entity_id
+            )
             data = {ATTR_ENTITY_ID: self._heater_entity_id}
             await self.hass.services.async_call(
                 HA_DOMAIN, SERVICE_TURN_OFF, data, context=self._context
             )
         else:
+            _LOGGER.debug(
+                "%s - Stopping underlying switch %s", self, self._climate_entity_id
+            )
             data = {ATTR_ENTITY_ID: self._climate_entity_id}
             await self.hass.services.async_call(
                 HA_DOMAIN, SERVICE_TURN_OFF, data, context=self._context
@@ -1567,16 +1620,19 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         # Check overpowering condition
         overpowering: bool = await self.check_overpowering()
         if overpowering:
-            _LOGGER.debug("%s - End of cycle (0)", self)
+            _LOGGER.debug("%s - End of cycle (overpowering)", self)
             return
 
         security: bool = await self.check_security()
         if security:
-            _LOGGER.debug("%s - End of cycle (1)", self)
+            _LOGGER.debug("%s - End of cycle (security)", self)
             return
 
         # Stop here if we are off
         if self._hvac_mode == HVAC_MODE_OFF:
+            _LOGGER.debug("%s - End of cycle (HVAC_MODE_OFF)", self)
+            if self._is_device_active:
+                await self._async_underlying_entity_turn_off()
             return
 
         if not self._is_over_climate:
@@ -1616,6 +1672,12 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                         self._async_cancel_cycle = None
                         _LOGGER.debug("%s - Stopping cycle during calculation", self)
 
+                    if self._hvac_mode == HVAC_MODE_OFF:
+                        _LOGGER.debug("%s - End of cycle (HVAC_MODE_OFF - 2)", self)
+                        if self._is_device_active:
+                            await self._async_underlying_entity_turn_off()
+                        return
+
                     if on:
                         security = (
                             await self.check_security()

custom_components/versatile_thermostat/config_flow.py

@@ -39,6 +39,7 @@ from homeassistant.components.input_number import (
 )
 
 from homeassistant.components.person import DOMAIN as PERSON_DOMAIN
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
 
 
 from .const import (
@@ -166,6 +167,22 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         super().__init__()
         _LOGGER.debug("CTOR BaseConfigFlow infos: %s", infos)
         self._infos = infos
+        is_empty: bool = not bool(infos)
+        # Fix features selection depending to infos
+        self._infos[CONF_USE_WINDOW_FEATURE] = (
+            is_empty or self._infos.get(CONF_WINDOW_SENSOR) is not None
+        )
+        self._infos[CONF_USE_MOTION_FEATURE] = (
+            is_empty or self._infos.get(CONF_MOTION_SENSOR) is not None
+        )
+        self._infos[CONF_USE_POWER_FEATURE] = is_empty or (
+            self._infos.get(CONF_POWER_SENSOR) is not None
+            and self._infos.get(CONF_MAX_POWER_SENSOR) is not None
+        )
+        self._infos[CONF_USE_PRESENCE_FEATURE] = (
+            is_empty or self._infos.get(CONF_PRESENCE_SENSOR) is not None
+        )
+
         self.hass = async_get_hass()
         ent_reg = async_get(hass=self.hass)
 
@@ -198,8 +215,8 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                 _LOGGER.debug("Presence sensor !")
                 presence_sensors.append(k)
 
-            # window sensor
+            # window sensor and presence 
-            if k.startswith(INPUT_BOOLEAN_DOMAIN):
+            if k.startswith(INPUT_BOOLEAN_DOMAIN) or k.startswith(BINARY_SENSOR_DOMAIN):
                 _LOGGER.debug("Window or presence sensor !")
                 window_sensors.append(k)
                 presence_sensors.append(k)
@@ -601,8 +618,18 @@ class VersatileThermostatOptionsFlowHandler(
             "Into OptionsFlowHandler.async_step_presets user_input=%s", user_input
         )
 
+        next_step = self.async_step_advanced
+        if self._infos[CONF_USE_WINDOW_FEATURE]:
+            next_step = self.async_step_window
+        elif self._infos[CONF_USE_MOTION_FEATURE]:
+            next_step = self.async_step_motion
+        elif self._infos[CONF_USE_POWER_FEATURE]:
+            next_step = self.async_step_power
+        elif self._infos[CONF_USE_PRESENCE_FEATURE]:
+            next_step = self.async_step_presence
+
         return await self.generic_step(
-            "presets", self.STEP_PRESETS_DATA_SCHEMA, user_input, self.async_step_window
+            "presets", self.STEP_PRESETS_DATA_SCHEMA, user_input, next_step
         )
 
     async def async_step_window(self, user_input: dict | None = None) -> FlowResult:
@@ -611,8 +638,15 @@ class VersatileThermostatOptionsFlowHandler(
             "Into OptionsFlowHandler.async_step_window user_input=%s", user_input
         )
 
+        next_step = self.async_step_advanced
+        if self._infos[CONF_USE_MOTION_FEATURE]:
+            next_step = self.async_step_motion
+        elif self._infos[CONF_USE_POWER_FEATURE]:
+            next_step = self.async_step_power
+        elif self._infos[CONF_USE_PRESENCE_FEATURE]:
+            next_step = self.async_step_presence
         return await self.generic_step(
-            "window", self.STEP_WINDOW_DATA_SCHEMA, user_input, self.async_step_motion
+            "window", self.STEP_WINDOW_DATA_SCHEMA, user_input, next_step
         )
 
     async def async_step_motion(self, user_input: dict | None = None) -> FlowResult:
@@ -621,8 +655,14 @@ class VersatileThermostatOptionsFlowHandler(
             "Into OptionsFlowHandler.async_step_motion user_input=%s", user_input
         )
 
+        next_step = self.async_step_advanced
+        if self._infos[CONF_USE_POWER_FEATURE]:
+            next_step = self.async_step_power
+        elif self._infos[CONF_USE_PRESENCE_FEATURE]:
+            next_step = self.async_step_presence
+
         return await self.generic_step(
-            "motion", self.STEP_MOTION_DATA_SCHEMA, user_input, self.async_step_power
+            "motion", self.STEP_MOTION_DATA_SCHEMA, user_input, next_step
         )
 
     async def async_step_power(self, user_input: dict | None = None) -> FlowResult:
@@ -631,11 +671,15 @@ class VersatileThermostatOptionsFlowHandler(
             "Into OptionsFlowHandler.async_step_power user_input=%s", user_input
         )
 
+        next_step = self.async_step_advanced
+        if self._infos[CONF_USE_PRESENCE_FEATURE]:
+            next_step = self.async_step_presence
+
         return await self.generic_step(
             "power",
             self.STEP_POWER_DATA_SCHEMA,
             user_input,
-            self.async_step_presence,
+            next_step,
         )
 
     async def async_step_presence(self, user_input: dict | None = None) -> FlowResult:
@@ -666,34 +710,20 @@ class VersatileThermostatOptionsFlowHandler(
 
     async def async_end(self):
         """Finalization of the ConfigEntry creation"""
-        _LOGGER.debug(
+        if not self._infos[CONF_USE_WINDOW_FEATURE]:
-            "ConfigFlow.async_finalize - updating entry with: %s", self._infos
+            self._infos[CONF_WINDOW_SENSOR] = None
-        )
+        if not self._infos[CONF_USE_MOTION_FEATURE]:
-        # Find eventual existing entity to update it
+            self._infos[CONF_MOTION_SENSOR] = None
-        # removing entities from registry (they will be recreated)
+        if not self._infos[CONF_USE_POWER_FEATURE]:
+            self._infos[CONF_POWER_SENSOR] = None
+            self._infos[CONF_MAX_POWER_SENSOR] = None
+        if not self._infos[CONF_USE_PRESENCE_FEATURE]:
+            self._infos[CONF_PRESENCE_SENSOR] = None
 
-        # No need to do that. Only the update_listener on __init__.py is necessary
-        # ent_reg = entity_registry.async_get(self.hass)
-
-        # for entry in entity_registry.async_entries_for_config_entry(
-        #    ent_reg, self.config_entry.entry_id
-        # ):
-        #    _LOGGER.info(
-        #        "Removing entity %s due to configuration change", entry.entity_id
-        #    )
-        # ent_reg.async_remove(entry.entity_id)
-
-        # _LOGGER.debug(
-        #    "We have found entities to update: %s", self.config_entry.entry_id
-        # )
-        # await VersatileThermostat.update_entity(self.config_entry.entry_id, self._infos)
-
-        # for entity_id in reg_entities.values():
-        #    ent_reg.async_remove(entity_id)
-        #
         _LOGGER.info(
-            "Recreating entry %s due to configuration change",
+            "Recreating entry %s due to configuration change. New config is now: %s",
             self.config_entry.entry_id,
+            self._infos,
         )
         self.hass.config_entries.async_update_entry(self.config_entry, data=self._infos)
         return self.async_create_entry(title=None, data=None)