Fix overpowering is set even if other heater have on_percent = 0

.devcontainer/configuration.yaml

@@ -8,13 +8,12 @@ recorder:
         domains:
             - input_boolean
             - input_number
-            - input_select
             - switch
             - climate
             - sensor
             - binary_sensor
             - number
-            - select
+            - input_select
             - versatile_thermostat
 
 logger:
@@ -244,11 +243,6 @@ climate:
       heater: input_boolean.fake_valve_sonoff_trvzb2
       target_sensor: input_number.fake_temperature_sensor1
       ac_mode: false
-    - platform: generic_thermostat
-      name: Underlying switch climate
-      heater: input_boolean.fake_heater_switch2
-      target_sensor: input_number.fake_temperature_sensor1
-      ac_mode: false
 
 input_datetime:
     fake_last_seen:

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/issue.md

@@ -4,10 +4,7 @@ about: Create a report to help us improve
 
 ---
 
-# Read this carefully
-
-> Please read carefully this instructions and fill this form before writing an issue. It helps me to help you.
-> If you choose to not follow this template, you accept to have no answer from the author. The tag on the issue 'Template not respected' means you don't respect this template. Potentially, you will not have a relevant answer.
+> Please read carefuly this instructions and fill this form before writing an issue. It helps me to help you.
 
 <!-- This template will allow the maintainer to be efficient and post the more accurante response as possible. There is many types / modes / configuration possible, so the analysis can be very tricky. If don't follow this template, your issue could be rejected without any message. Please help me to help you. -->
 
@@ -15,7 +12,7 @@ about: Create a report to help us improve
 
 If you have a simple question or you are not sure this is an issue, don't open an issue but open a new discussion [here](https://github.com/jmcollin78/versatile_thermostat/discussions).
 
-Check also in the [Troubleshooting] paragrah of the README if the aswer is not already given.
+Check also in the [Troubleshooting](#troubleshooting) paragrah of the README if the aswer is not already given.
 
 Issues not containing the minimum requirements will be closed:
 

README-fr.md

@@ -13,11 +13,15 @@ Ce composant personnalisé pour Home Assistant est une mise à niveau et une ré
 
 # Quoi de neuf ?
 ![Nouveau](images/new-icon.png)
-> * **Release 7.2**:
+> * **Release 6.8**:
 >
-> - Prise en compte native des équipements pilotable via une entité de type `select` (ou `input_select`) ou `climate` pour des _VTherm_ de type `over_switch`. Cette évolution rend obsolète, la création de switch virtuels pour l'intégration des Nodon ou Heaty ou eCosy ... etc. Plus d'informations [ici](documentation/fr/over-switch.md#la-personnalisation-des-commandes).
+> Ajout d'une nouvelle méthode de régulation pour les Versatile Thermostat de type `over_climate`. Cette méthode nommée 'Contrôle direct de la vanne' permet de contrôler directement la vanne d'un TRV et éventuellement un décalage pour calibrer le thermomètre interne de votre TRV. Cette nouvelle méthode a été testée avec des Sonoff TRVZB et généralisée pour d'autre type de TRV pour lesquels la vanne est directement commandable via des entités de type `number`.
 >
-> - Lien vers la documentation : cette version 7.2 expérimente des liens vers la documentation depuis les pages de configuration. Le lien est accessible via l'icone [![?](https://img.icons8.com/color/18/help.png)](https://github.com/jmcollin78/versatile_thermostat/blob/main/documentation/fr/over-switch.md#configuration). Elle est expérimentée sur la page de configuration des sous-jacents des _VTherm_ `over_switch`.
+> Plus d'informations [ici](documentation/fr/over-climate.md) et [ici](documentation/fr/self-regulation.md).
+>
+> * **Refonte de la documentation**:
+>
+> Avec toutes les évolutions réalisées depuis le début de l'intégration, la documentation nécessitait une profonde re-organisation, c'est chose faite sur cette version. Tous vos retours sur cette nouvelle organisation seront les bienvenus.
 
 
 # 🍻 Merci pour les bières [buymecoffee](https://www.buymeacoffee.com/jmcollin78) 🍻
@@ -31,38 +35,31 @@ Un grand merci à tous mes fournisseurs de bières pour leurs dons et leurs enco
 
   _AC_ : Air conditionné. Un équipement est AC si il fait du froid. Les températures sont alors inversées : Eco est plus chaud que Confort qui est plus chaud que Boost. Les algorithmes tiennent compte de cette information.
 
-  _EMA_ : Exponential Moving Average. Utilisé pour lisser les mesures de températures de capteur. Elle correspond à une moyenne glissante de la température de la pièce. Elle est utilisée pour calculer la pente de la courbe de température (slope) qui serait trop instable sur la courbe brute.
-
-  _slope_ : la pente de la courbe de température. Elle est mesurée en °(C ou K)/h. Elle est positive si la température augmente et négative si elle diminue. Cette pente est calculée sur l'_EMA_
-
-  _PAC_ : Pompe à chaleur
-
 # Documentation
 
 La documentation est maintenant découpée en plusieurs pages pour faciliter la lecture et la recherche d'informations :
 1. [présentation](documentation/fr/presentation.md),
-2. [Installation](documentation/fr/installation.md),
-3. [choisir un type de VTherm](documentation/fr/creation.md),
-4. [les attributs de base](documentation/fr/base-attributes.md)
-5. [configurer un VTherm sur un `switch`](documentation/fr/over-switch.md)
-6. [configurer un VTherm sur un `climate`](documentation/fr/over-climate.md)
-7. [configurer un VTherm sur une vanne](documentation/fr/over-valve.md)
-8. [les pré-régages (preset)](documentation/fr/feature-presets.md)
-9. [la gestion des ouvertures](documentation/fr/feature-window.md)
-10. [la gestion de la présence](documentation/fr/feature-presence.md)
-11. [la gestion de mouvement](documentation/fr/feature-motion.md)
-12. [la gestion de la puissance](documentation/fr/feature-power.md)
-13. [l'auto start and stop](documentation/fr/feature-auto-start-stop.md)
-14. [la contrôle centralisé de tous vos VTherms](documentation/fr/feature-central-mode.md)
-15. [la commande du chauffage central](documentation/fr/feature-central-boiler.md)
-16. [aspects avancés, mode sécurité](documentation/fr/feature-advanced.md)
-17. [l'auto-régulation](documentation/fr/self-regulation.md)
-18. [exemples de réglages](documentation/fr/tuning-examples.md)
-19. [les différents algorithmes](documentation/fr/algorithms.md)
-20. [documentation de référence](documentation/fr/reference.md)
-21. [exemple de réglages](documentation/fr/tuning-examples.md)
-22. [dépannage](documentation/fr/troubleshooting.md)
-23. [notes de version](documentation/fr/releases.md)
+2. [choisir un type de VTherm](documentation/fr/creation.md),
+3. [les attributs de base](documentation/fr/base-attributes.md)
+3. [configurer un VTherm sur un `switch`](documentation/fr/over-switch.md)
+3. [configurer un VTherm sur un `climate`](documentation/fr/over-climate.md)
+3. [configurer un VTherm sur une vanne](documentation/fr/over-valve.md)
+4. [les pré-régages (preset)](documentation/fr/feature-presets.md)
+5. [la gestion des ouvertures](documentation/fr/feature-window.md)
+6. [la gestion de la présence](documentation/fr/feature-presence.md)
+7. [la gestion de mouvement](documentation/fr/feature-motion.md)
+8. [la gestion de la puissance](documentation/fr/feature-power.md)
+9. [l'auto start and stop](documentation/fr/feature-auto-start-stop.md)
+10. [la contrôle centralisé de tous vos VTherms](documentation/fr/feature-central-mode.md)
+11. [la commande du chauffage central](documentation/fr/feature-central-boiler.md)
+12. [aspects avancés, mode sécurité](documentation/fr/feature-advanced.md)
+12. [l'auto-régulation](documentation/fr/self-regulation.md)
+13. [exemples de réglages](documentation/fr/tuning-examples.md)
+14. [les différents algorithmes](documentation/fr/algorithms.md)
+15. [documentation de référence](documentation/fr/reference.md)
+16. [exemple de réglages](documentation/fr/tuning-examples.md)
+17. [dépannage](documentation/fr/troubleshooting.md)
+18. [notes de version](documentation/fr/releases.md)
 
 
 # Quelques résultats

README.md

@@ -34,12 +34,6 @@ A big thank you to all my beer sponsors for their donations and encouragements.
 
   _AC_: Air Conditioning. An AC device cools instead of heats. Temperatures are reversed: Eco is warmer than Comfort, which is warmer than Boost. The algorithms take this information into account.
 
-  _EMA_: Exponential Moving Average. Used to smooth sensor temperature measurements. It represents a moving average of the room's temperature and is used to calculate the slope of the temperature curve, which would be too unstable on the raw data.
-
-  _slope_: The slope of the temperature curve, measured in ° (C or K)/h. It is positive when the temperature increases and negative when it decreases. This slope is calculated based on the _EMA_.
-
-  _PAC_ : Heat pump
-
 # Documentation
 
 The documentation is now divided into several pages for easier reading and searching:

custom_components/versatile_thermostat/base_manager.py

@@ -27,7 +27,7 @@ class BaseFeatureManager:
         """Initialize the attributes of the FeatureManager"""
         raise NotImplementedError()
 
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity"""
         raise NotImplementedError()
 

custom_components/versatile_thermostat/base_thermostat.py

@@ -53,7 +53,7 @@ from homeassistant.const import (
 )
 
 from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
-from .commons import ConfigData, T
+from .commons import ConfigData, T, deprecated
 
 from .config_schema import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
@@ -98,6 +98,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                     "comfort_away_temp",
                     "power_temp",
                     "ac_mode",
+                    "current_max_power",
                     "saved_preset_mode",
                     "saved_target_temp",
                     "saved_hvac_mode",
@@ -477,7 +478,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
 
         # start listening for all managers
         for manager in self._managers:
-            await manager.start_listening()
+            manager.start_listening()
 
         await self.get_my_previous_state()
 
@@ -605,6 +606,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                 "saved_preset_mode", None
             )
 
+            self._hvac_off_reason = old_state.attributes.get("hvac_mode_reason", None)
+
             old_total_energy = old_state.attributes.get(ATTR_TOTAL_ENERGY)
             self._total_energy = old_total_energy if old_total_energy is not None else 0
             _LOGGER.debug(
@@ -1031,10 +1034,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
 
             return
 
-        # Remove eventual overpoering if we want to turn-off
-        if hvac_mode == HVACMode.OFF and self.power_manager.is_overpowering_detected:
-            await self.power_manager.set_overpowering(False)
-
         self._hvac_mode = hvac_mode
 
         # Delegate to all underlying
@@ -1050,7 +1049,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
             self._hvac_mode in [HVACMode.COOL, HVACMode.HEAT, HVACMode.HEAT_COOL]
             and self.preset_mode != PRESET_NONE
         ):
-            if self.preset_mode != PRESET_FROST_PROTECTION or self._hvac_mode in [HVACMode.HEAT, HVACMode.HEAT_COOL]:
+            if self.preset_mode != PRESET_FROST_PROTECTION:
                 await self.async_set_preset_mode_internal(self.preset_mode, True)
             else:
                 await self.async_set_preset_mode_internal(PRESET_ECO, True, False)
@@ -1067,7 +1066,9 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
         save_state()
 
     @overrides
-    async def async_set_preset_mode(self, preset_mode: str, overwrite_saved_preset=True):
+    async def async_set_preset_mode(
+        self, preset_mode: str, overwrite_saved_preset=True
+    ):
         """Set new preset mode."""
 
         # We accept a new preset when:
@@ -1095,10 +1096,14 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
 
             return
 
-        await self.async_set_preset_mode_internal(preset_mode, force=False, overwrite_saved_preset=overwrite_saved_preset)
+        await self.async_set_preset_mode_internal(
+            preset_mode, force=False, overwrite_saved_preset=overwrite_saved_preset
+        )
         await self.async_control_heating(force=True)
 
-    async def async_set_preset_mode_internal(self, preset_mode: str, force=False, overwrite_saved_preset=True):
+    async def async_set_preset_mode_internal(
+        self, preset_mode: str, force=False, overwrite_saved_preset=True
+    ):
         """Set new preset mode."""
         _LOGGER.info("%s - Set preset_mode: %s force=%s", self, preset_mode, force)
         if (
@@ -1244,12 +1249,12 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
 
     async def async_set_humidity(self, humidity: int):
         """Set new target humidity."""
-        _LOGGER.info("%s - Set humidity: %s", self, humidity)
+        _LOGGER.info("%s - Set fan mode: %s", self, humidity)
         return
 
     async def async_set_swing_mode(self, swing_mode: str):
         """Set new target swing operation."""
-        _LOGGER.info("%s - Set swing mode: %s", self, swing_mode)
+        _LOGGER.info("%s - Set fan mode: %s", self, swing_mode)
         return
 
     async def async_set_temperature(self, **kwargs):
@@ -1528,8 +1533,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
         is_window_detected = self._window_manager.is_window_detected
         if new_central_mode == CENTRAL_MODE_AUTO:
             if not is_window_detected and not first_init:
-                await self.restore_preset_mode(force=False)
-                await self.restore_hvac_mode(need_control_heating=True)
+                await self.restore_hvac_mode()
+                await self.restore_preset_mode()
             elif is_window_detected and self.hvac_mode == HVACMode.OFF:
                 # do not restore but mark the reason of off with window detection
                 self.set_hvac_off_reason(HVAC_OFF_REASON_WINDOW_DETECTION)
@@ -1567,7 +1572,9 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                 and HVACMode.HEAT in self.hvac_modes
             ):
                 await self.async_set_hvac_mode(HVACMode.HEAT)
-                await self.async_set_preset_mode(PRESET_FROST_PROTECTION, overwrite_saved_preset=False)
+                await self.async_set_preset_mode(
+                    PRESET_FROST_PROTECTION, overwrite_saved_preset=False
+                )
             else:
                 self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
                 await self.async_set_hvac_mode(HVACMode.OFF)
@@ -1602,8 +1609,14 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                 return False
 
         # Check overpowering condition
-        # Not usefull. Will be done at the next power refresh
-        # await VersatileThermostatAPI.get_vtherm_api().central_power_manager.refresh_state()
+        await VersatileThermostatAPI.get_vtherm_api().central_power_manager.refresh_state()
+
+        # TODO remove this
+        # overpowering is now centralized
+        # overpowering = await self._power_manager.check_overpowering()
+        # if overpowering == STATE_ON:
+        #    _LOGGER.debug("%s - End of cycle (overpowering)", self)
+        #    return True
 
         safety: bool = await self._safety_manager.refresh_state()
         if safety and self.is_over_climate:
@@ -1792,7 +1805,9 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
         # If the changed preset is active, change the current temperature
         # Issue #119 - reload new preset temperature also in ac mode
         if preset.startswith(self._attr_preset_mode):
-            await self.async_set_preset_mode_internal(preset.rstrip(PRESET_AC_SUFFIX), force=True)
+            await self.async_set_preset_mode_internal(
+                preset.rstrip(PRESET_AC_SUFFIX), force=True
+            )
             await self.async_control_heating(force=True)
 
     async def SERVICE_SET_SAFETY(
@@ -1948,7 +1963,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
     def _set_now(self, now: datetime):
         """Set the now timestamp. This is only for tests purpose
         This method should be replaced by the vthermAPI equivalent"""
-        VersatileThermostatAPI.get_vtherm_api(self._hass)._set_now(now)  # pylint: disable=protected-access
+        VersatileThermostatAPI.get_vtherm_api(self._hass)._set_now(now)
 
     # @deprecated
     @property
@@ -1959,17 +1974,5 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
 
     @property
     def power_percent(self) -> float | None:
-        """Get the current on_percent as a percentage value. valid only for Vtherm with a TPI algo
-        Get the current on_percent value"""
-        if self._prop_algorithm and self._prop_algorithm.on_percent is not None:
-            return round(self._prop_algorithm.on_percent * 100, 0)
-        else:
-            return None
-
-    @property
-    def on_percent(self) -> float | None:
         """Get the current on_percent value. valid only for Vtherm with a TPI algo"""
-        if self._prop_algorithm and self._prop_algorithm.on_percent is not None:
-            return self._prop_algorithm.on_percent
-        else:
-            return None
+        return None

custom_components/versatile_thermostat/central_feature_power_manager.py

@@ -4,14 +4,10 @@ import logging
 from typing import Any
 from functools import cmp_to_key
 
-from datetime import timedelta
-
-from homeassistant.const import STATE_OFF
 from homeassistant.core import HomeAssistant, Event, callback
 from homeassistant.helpers.event import (
     async_track_state_change_event,
     EventStateChangedData,
-    async_call_later,
 )
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.components.climate import (
@@ -46,9 +42,6 @@ class CentralFeaturePowerManager(BaseFeatureManager):
         self._current_power: float = None
         self._current_max_power: float = None
         self._power_temp: float = None
-        self._cancel_calculate_shedding_call = None
-        self._started_vtherm_total_power: float = None
-        # Not used now
         self._last_shedding_date = None
 
     def post_init(self, entry_infos: ConfigData):
@@ -72,11 +65,10 @@ class CentralFeaturePowerManager(BaseFeatureManager):
             and self._power_temp
         ):
             self._is_configured = True
-            self._started_vtherm_total_power = 0
         else:
             _LOGGER.info("Power management is not fully configured and will be deactivated")
 
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the power sensor"""
         if not self._is_configured:
             return
@@ -104,8 +96,6 @@ class CentralFeaturePowerManager(BaseFeatureManager):
         """Handle power changes."""
         _LOGGER.debug("Receive new Power event")
         _LOGGER.debug(event)
-
-        self._started_vtherm_total_power = 0
         await self.refresh_state()
 
     @callback
@@ -119,54 +109,45 @@ class CentralFeaturePowerManager(BaseFeatureManager):
     async def refresh_state(self) -> bool:
         """Tries to get the last state from sensor
         Returns True if a change has been made"""
+        ret = False
+        if self._is_configured:
+            # try to acquire current power and power max
+            if (
+                new_state := get_safe_float(self._hass, self._power_sensor_entity_id)
+            ) is not None:
+                self._current_power = new_state
+                _LOGGER.debug("Current power have been retrieved: %.3f", self._current_power)
+                ret = True
 
-        async def _calculate_shedding_internal(_):
-            _LOGGER.debug("Do the shedding calculation")
-            await self.calculate_shedding()
-            if self._cancel_calculate_shedding_call:
-                self._cancel_calculate_shedding_call()
-                self._cancel_calculate_shedding_call = None
+            # Try to acquire power max
+            if (
+                new_state := get_safe_float(
+                    self._hass, self._max_power_sensor_entity_id
+                )
+            ) is not None:
+                self._current_max_power = new_state
+                _LOGGER.debug("Current power max have been retrieved: %.3f", self._current_max_power)
+                ret = True
 
-        if not self._is_configured:
-            return False
+            # check if we need to re-calculate shedding
+            if ret:
+                now = self._vtherm_api.now
+                dtimestamp = (
+                    (now - self._last_shedding_date).seconds
+                    if self._last_shedding_date
+                    else 999
+                )
+                if dtimestamp >= MIN_DTEMP_SECS:
+                    await self.calculate_shedding()
+                    self._last_shedding_date = now
 
-        # Retrieve current power
-        new_power = get_safe_float(self._hass, self._power_sensor_entity_id)
-        power_changed = new_power is not None and self._current_power != new_power
-        if power_changed:
-            self._current_power = new_power
-            _LOGGER.debug("New current power has been retrieved: %.3f", self._current_power)
-
-        # Retrieve max power
-        new_max_power = get_safe_float(self._hass, self._max_power_sensor_entity_id)
-        max_power_changed = new_max_power is not None and self._current_max_power != new_max_power
-        if max_power_changed:
-            self._current_max_power = new_max_power
-            _LOGGER.debug("New current max power has been retrieved: %.3f", self._current_max_power)
-
-        # Schedule shedding calculation if there's any change
-        if power_changed or max_power_changed:
-            if not self._cancel_calculate_shedding_call:
-                self._cancel_calculate_shedding_call = async_call_later(self.hass, timedelta(seconds=MIN_DTEMP_SECS), _calculate_shedding_internal)
-            return True
-
-        return False
-
-    # For testing purpose only, do an immediate shedding calculation
-    async def _do_immediate_shedding(self):
-        """Do an immmediate shedding calculation if a timer was programmed.
-        Else, do nothing"""
-        if self._cancel_calculate_shedding_call:
-            self._cancel_calculate_shedding_call()
-            self._cancel_calculate_shedding_call = None
-            await self.calculate_shedding()
+        return ret
 
     async def calculate_shedding(self):
         """Do the shedding calculation and set/unset VTherm into overpowering state"""
         if not self.is_configured or self.current_max_power is None or self.current_power is None:
             return
 
-        _LOGGER.debug("-------- Start of calculate_shedding")
         # Find all VTherms
         available_power = self.current_max_power - self.current_power
         vtherms_sorted = self.find_all_vtherm_with_power_management_sorted_by_dtemp()
@@ -182,56 +163,54 @@ class CentralFeaturePowerManager(BaseFeatureManager):
             total_power_gain = 0
 
             for vtherm in vtherms_sorted:
+                device_power = vtherm.power_manager.device_power
                 if vtherm.is_device_active and not vtherm.power_manager.is_overpowering_detected:
-                    device_power = vtherm.power_manager.device_power
                     total_power_gain += device_power
-                    _LOGGER.info("vtherm %s should be in overpowering state (device_power=%.2f)", vtherm.name, device_power)
+                    _LOGGER.debug("vtherm %s should be in overpowering state", vtherm.name)
                     await vtherm.power_manager.set_overpowering(True, device_power)
 
                 _LOGGER.debug("after vtherm %s total_power_gain=%s, available_power=%s", vtherm.name, total_power_gain, available_power)
                 if total_power_gain >= -available_power:
                     _LOGGER.debug("We have found enough vtherm to set to overpowering")
                     break
-        # unshedding only
         else:
-            vtherms_sorted.reverse()
+            # vtherms_sorted.reverse()
             _LOGGER.debug("The available power is is > 0 (%s). Do a complete shedding/un-shedding calculation for list: %s", available_power, vtherms_sorted)
 
-            total_power_added = 0
+            total_affected_power = 0
+            force_overpowering = False
 
             for vtherm in vtherms_sorted:
-                # We want to do always unshedding in order to initialize the state
-                # so we cannot use is_overpowering_detected which test also UNKNOWN and UNAVAILABLE
-                if vtherm.power_manager.overpowering_state == STATE_OFF:
-                    continue
-
-                power_consumption_max = device_power = vtherm.power_manager.device_power
+                device_power = vtherm.power_manager.device_power
                 # calculate the power_consumption_max
-                if vtherm.on_percent is not None:
-                    power_consumption_max = max(
-                        device_power / vtherm.nb_underlying_entities,
-                        device_power * vtherm.on_percent,
-                    )
+                if vtherm.is_device_active:
+                    power_consumption_max = 0
+                else:
+                    if vtherm.is_over_climate:
+                        power_consumption_max = device_power
+                    else:
+                        if vtherm.proportional_algorithm.on_percent > 0:
+                            power_consumption_max = max(
+                                device_power / vtherm.nb_underlying_entities,
+                                device_power * vtherm.proportional_algorithm.on_percent,
+                            )
+                        else:
+                            power_consumption_max = 0
 
                 _LOGGER.debug("vtherm %s power_consumption_max is %s (device_power=%s, overclimate=%s)", vtherm.name, power_consumption_max, device_power, vtherm.is_over_climate)
-
-                # or not ... is for initializing the overpowering state if not already done
-                if total_power_added + power_consumption_max < available_power or not vtherm.power_manager.is_overpowering_detected:
-                    # we count the unshedding only if the VTherm was in shedding
-                    if vtherm.power_manager.is_overpowering_detected:
-                        _LOGGER.info("vtherm %s should not be in overpowering state (power_consumption_max=%.2f)", vtherm.name, power_consumption_max)
-                        total_power_added += power_consumption_max
-
+                if force_overpowering or (total_affected_power + power_consumption_max >= available_power):
+                    _LOGGER.debug("vtherm %s should be in overpowering state", vtherm.name)
+                    if not vtherm.power_manager.is_overpowering_detected:
+                        # To force all others vtherms to be in overpowering
+                        force_overpowering = True
+                        await vtherm.power_manager.set_overpowering(True, power_consumption_max)
+                else:
+                    total_affected_power += power_consumption_max
+                    # Always set to false to init the state
+                    _LOGGER.debug("vtherm %s should not be in overpowering state", vtherm.name)
                     await vtherm.power_manager.set_overpowering(False)
 
-                if total_power_added >= available_power:
-                    _LOGGER.debug("We have found enough vtherm to set to non-overpowering")
-                    break
-
-                _LOGGER.debug("after vtherm %s total_power_added=%s, available_power=%s", vtherm.name, total_power_added, available_power)
-
-        self._last_shedding_date = self._vtherm_api.now
-        _LOGGER.debug("-------- End of calculate_shedding")
+                _LOGGER.debug("after vtherm %s total_affected_power=%s, available_power=%s", vtherm.name, total_affected_power, available_power)
 
     def get_climate_components_entities(self) -> list:
         """Get all VTherms entitites"""
@@ -279,12 +258,6 @@ class CentralFeaturePowerManager(BaseFeatureManager):
         vtherms.sort(key=cmp_to_key(cmp_temps))
         return vtherms
 
-    def add_started_vtherm_total_power(self, started_power: float):
-        """Add the power into the _started_vtherm_total_power which holds all VTherm started after
-        the last power measurement"""
-        self._started_vtherm_total_power += started_power
-        _LOGGER.debug("%s - started_vtherm_total_power is now %s", self, self._started_vtherm_total_power)
-
     @property
     def is_configured(self) -> bool:
         """True if the FeatureManager is fully configured"""
@@ -315,10 +288,5 @@ class CentralFeaturePowerManager(BaseFeatureManager):
         """Return the max power sensor entity id"""
         return self._max_power_sensor_entity_id
 
-    @property
-    def started_vtherm_total_power(self) -> float | None:
-        """Return the started_vtherm_total_power"""
-        return self._started_vtherm_total_power
-
     def __str__(self):
         return "CentralPowerManager"

custom_components/versatile_thermostat/config_flow.py

@@ -4,12 +4,13 @@
 from __future__ import annotations
 
 from typing import Any
-import re
 import logging
 import copy
 from collections.abc import Mapping  # pylint: disable=import-error
 import voluptuous as vol
 
+from homeassistant.exceptions import HomeAssistantError
+
 from homeassistant.core import callback
 from homeassistant.config_entries import (
     ConfigEntry,
@@ -89,10 +90,11 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             CONF_USE_MOTION_FEATURE, False
         ) and (self._infos.get(CONF_MOTION_SENSOR) is not None or is_central_config)
 
-        self._infos[CONF_USE_POWER_FEATURE] = (
-            self._infos.get(CONF_USE_POWER_CENTRAL_CONFIG, False)
-            or self._infos.get(CONF_USE_POWER_FEATURE, False)
-            or (is_central_config and self._infos.get(CONF_POWER_SENSOR) is not None and self._infos.get(CONF_MAX_POWER_SENSOR) is not None)
+        self._infos[CONF_USE_POWER_FEATURE] = self._infos.get(
+            CONF_USE_POWER_CENTRAL_CONFIG, False
+        ) 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] = (
             self._infos.get(CONF_USE_PRESENCE_CENTRAL_CONFIG, False)
@@ -182,7 +184,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         Data has the keys from STEP_*_DATA_SCHEMA with values provided by the user.
         """
 
-        # check the entity_ids
+        # check the heater_entity_id
         for conf in [
             CONF_UNDERLYING_LIST,
             CONF_TEMP_SENSOR,
@@ -272,34 +274,6 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                     CONF_MIN_OPENING_DEGREES
                 ) from exc
 
-        # Check the VSWITCH configuration. There should be the same number of vswitch_on (resp. vswitch_off) than the number of underlying entity
-        if self._infos.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_SWITCH and step_id == "type":
-            if not self.check_vswitch_configuration(data):
-                raise VirtualSwitchConfigurationIncorrect(CONF_VSWITCH_ON_CMD_LIST)
-
-    def check_vswitch_configuration(self, data) -> bool:
-        """Check the Virtual switch configuration and return True if the configuration is correct"""
-        nb_under = len(data.get(CONF_UNDERLYING_LIST, []))
-
-        # check format of each command_on
-        for command in data.get(CONF_VSWITCH_ON_CMD_LIST, []) + data.get(CONF_VSWITCH_OFF_CMD_LIST, []):
-            pattern = r"^(?P<command>[a-zA-Z0-9_]+)(?:/(?P<argument>[a-zA-Z0-9_]+)(?::(?P<value>[a-zA-Z0-9_]+))?)?$"
-            if not re.match(pattern, command):
-                return False
-
-        nb_command_on = len(data.get(CONF_VSWITCH_ON_CMD_LIST, []))
-        nb_command_off = len(data.get(CONF_VSWITCH_OFF_CMD_LIST, []))
-        if (nb_command_on == nb_under or nb_command_on == 0) and (nb_command_off == nb_under or nb_command_off == 0):
-            # There is enough command_on and off
-            # Check if one under is not a switch (which have default command).
-            if any(
-                not thermostat_type.startswith(SWITCH_DOMAIN) and not thermostat_type.startswith(INPUT_BOOLEAN_DOMAIN) for thermostat_type in data.get(CONF_UNDERLYING_LIST, [])
-            ):
-                if nb_command_on != nb_under or nb_command_off != nb_under:
-                    return False
-            return True
-        return False
-
     def check_config_complete(self, infos) -> bool:
         """True if the config is now complete (ie all mandatory attributes are set)"""
         is_central_config = (
@@ -345,8 +319,9 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             ):
                 return False
 
-            # checks that at least one underlying is set but not it central configuration
-            if len(infos.get(CONF_UNDERLYING_LIST, [])) < 1:
+            if infos.get(CONF_UNDERLYING_LIST, None) is not None and not infos.get(
+                CONF_UNDERLYING_LIST, None
+            ):
                 return False
 
             if (
@@ -355,7 +330,14 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             ):
                 return False
 
-            if infos.get(CONF_USE_POWER_FEATURE, False) is True and infos.get(CONF_USE_POWER_CENTRAL_CONFIG, False) is False and infos.get(CONF_PRESET_POWER, None) is None:
+            if (
+                infos.get(CONF_USE_POWER_FEATURE, False) is True
+                and infos.get(CONF_USE_POWER_CENTRAL_CONFIG, False) is False
+                and (
+                    infos.get(CONF_POWER_SENSOR, None) is None
+                    or infos.get(CONF_MAX_POWER_SENSOR, None) is None
+                )
+            ):
                 return False
 
             if (
@@ -434,8 +416,6 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                 errors["base"] = "valve_regulation_nb_entities_incorrect"
             except ValveRegulationMinOpeningDegreesIncorrect as err:
                 errors[str(err)] = "min_opening_degrees_format"
-            except VirtualSwitchConfigurationIncorrect as err:
-                errors["base"] = "vswitch_configuration_incorrect"
             except Exception:  # pylint: disable=broad-except
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
@@ -835,7 +815,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         """Handle the specific power flow steps"""
         _LOGGER.debug("Into ConfigFlow.async_step_spec_power user_input=%s", user_input)
 
-        schema = STEP_NON_CENTRAL_POWER_DATA_SCHEMA
+        schema = STEP_CENTRAL_POWER_DATA_SCHEMA
 
         self._infos[COMES_FROM] = "async_step_spec_power"
 
@@ -929,42 +909,10 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         return await self.generic_step("advanced", schema, user_input, next_step)
 
     async def async_step_finalize(self, _):
-        """Finalize the creation. Should be overriden by underlyings"""
-        if not self._infos[CONF_USE_WINDOW_FEATURE]:
-            self._infos[CONF_USE_WINDOW_CENTRAL_CONFIG] = False
-            if CONF_WINDOW_SENSOR in self._infos:
-                del self._infos[CONF_WINDOW_SENSOR]
-            if CONF_WINDOW_AUTO_CLOSE_THRESHOLD in self._infos:
-                del self._infos[CONF_WINDOW_AUTO_CLOSE_THRESHOLD]
-            if CONF_WINDOW_AUTO_OPEN_THRESHOLD in self._infos:
-                del self._infos[CONF_WINDOW_AUTO_OPEN_THRESHOLD]
-            if CONF_WINDOW_AUTO_MAX_DURATION in self._infos:
-                del self._infos[CONF_WINDOW_AUTO_MAX_DURATION]
-        if not self._infos[CONF_USE_MOTION_FEATURE]:
-            self._infos[CONF_USE_MOTION_CENTRAL_CONFIG] = False
-            if CONF_MOTION_SENSOR in self._infos:
-                del self._infos[CONF_MOTION_SENSOR]
-        if not self._infos[CONF_USE_POWER_FEATURE]:
-            self._infos[CONF_USE_POWER_CENTRAL_CONFIG] = False
-            if CONF_POWER_SENSOR in self._infos:
-                del self._infos[CONF_POWER_SENSOR]
-            if CONF_MAX_POWER_SENSOR in self._infos:
-                del self._infos[CONF_MAX_POWER_SENSOR]
-        if not self._infos[CONF_USE_PRESENCE_FEATURE]:
-            self._infos[CONF_USE_PRESENCE_CENTRAL_CONFIG] = False
-            if CONF_PRESENCE_SENSOR in self._infos:
-                del self._infos[CONF_PRESENCE_SENSOR]
-        if not self._infos[CONF_USE_CENTRAL_BOILER_FEATURE]:
-            if CONF_CENTRAL_BOILER_ACTIVATION_SRV in self._infos:
-                del self._infos[CONF_CENTRAL_BOILER_ACTIVATION_SRV]
-            if CONF_CENTRAL_BOILER_DEACTIVATION_SRV in self._infos:
-                del self._infos[CONF_CENTRAL_BOILER_DEACTIVATION_SRV]
-        if not self._infos[CONF_USE_AUTO_START_STOP_FEATURE]:
-            self._infos[CONF_AUTO_START_STOP_LEVEL] = AUTO_START_STOP_LEVEL_NONE
-
-        # Removes temporary value
-        if COMES_FROM in self._infos:
-            del self._infos[COMES_FROM]
+        """Should be implemented by Leaf classes"""
+        raise HomeAssistantError(
+            "async_finalize not implemented on VersatileThermostat sub-class"
+        )
 
 
 class VersatileThermostatConfigFlow(  # pylint: disable=abstract-method
@@ -988,8 +936,9 @@ class VersatileThermostatConfigFlow(  # pylint: disable=abstract-method
     async def async_step_finalize(self, _):
         """Finalization of the ConfigEntry creation"""
         _LOGGER.debug("ConfigFlow.async_finalize")
-        await super().async_step_finalize(_)
-
+        # Removes temporary value
+        if COMES_FROM in self._infos:
+            del self._infos[COMES_FROM]
         return self.async_create_entry(title=self._infos[CONF_NAME], data=self._infos)
 
 
@@ -1027,13 +976,37 @@ class VersatileThermostatOptionsFlowHandler(
 
     async def async_step_finalize(self, _):
         """Finalization of the ConfigEntry creation"""
+        if not self._infos[CONF_USE_WINDOW_FEATURE]:
+            self._infos[CONF_USE_WINDOW_CENTRAL_CONFIG] = False
+            self._infos[CONF_WINDOW_SENSOR] = None
+            self._infos[CONF_WINDOW_AUTO_CLOSE_THRESHOLD] = None
+            self._infos[CONF_WINDOW_AUTO_OPEN_THRESHOLD] = None
+            self._infos[CONF_WINDOW_AUTO_MAX_DURATION] = None
+        if not self._infos[CONF_USE_MOTION_FEATURE]:
+            self._infos[CONF_USE_MOTION_CENTRAL_CONFIG] = False
+            self._infos[CONF_MOTION_SENSOR] = None
+        if not self._infos[CONF_USE_POWER_FEATURE]:
+            self._infos[CONF_USE_POWER_CENTRAL_CONFIG] = False
+            self._infos[CONF_POWER_SENSOR] = None
+            self._infos[CONF_MAX_POWER_SENSOR] = None
+        if not self._infos[CONF_USE_PRESENCE_FEATURE]:
+            self._infos[CONF_USE_PRESENCE_CENTRAL_CONFIG] = False
+            self._infos[CONF_PRESENCE_SENSOR] = None
+        if not self._infos[CONF_USE_CENTRAL_BOILER_FEATURE]:
+            self._infos[CONF_CENTRAL_BOILER_ACTIVATION_SRV] = None
+            self._infos[CONF_CENTRAL_BOILER_DEACTIVATION_SRV] = None
+        if not self._infos[CONF_USE_AUTO_START_STOP_FEATURE]:
+            self._infos[CONF_AUTO_START_STOP_LEVEL] = AUTO_START_STOP_LEVEL_NONE
 
         _LOGGER.info(
             "Recreating entry %s due to configuration change. New config is now: %s",
             self.config_entry.entry_id,
             self._infos,
         )
-        await super().async_step_finalize(_)
+
+        # Removes temporary value
+        if COMES_FROM in self._infos:
+            del self._infos[COMES_FROM]
 
         self.hass.config_entries.async_update_entry(self.config_entry, data=self._infos)
         return self.async_create_entry(title=None, data=None)

custom_components/versatile_thermostat/config_schema.py

@@ -16,14 +16,6 @@ from homeassistant.components.input_number import (
     DOMAIN as INPUT_NUMBER_DOMAIN,
 )
 
-from homeassistant.components.select import (
-    DOMAIN as SELECT_DOMAIN,
-)
-
-from homeassistant.components.input_select import (
-    DOMAIN as INPUT_SELECT_DOMAIN,
-)
-
 from homeassistant.components.input_datetime import (
     DOMAIN as INPUT_DATETIME_DOMAIN,
 )
@@ -128,7 +120,9 @@ STEP_CENTRAL_BOILER_SCHEMA = vol.Schema(
 STEP_THERMOSTAT_SWITCH = vol.Schema(  # pylint: disable=invalid-name
     {
         vol.Required(CONF_UNDERLYING_LIST): selector.EntitySelector(
-            selector.EntitySelectorConfig(domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN, SELECT_DOMAIN, INPUT_SELECT_DOMAIN, CLIMATE_DOMAIN], multiple=True),
+            selector.EntitySelectorConfig(
+                domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN], multiple=True
+            ),
         ),
         vol.Optional(CONF_HEATER_KEEP_ALIVE): cv.positive_int,
         vol.Required(CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI): vol.In(
@@ -138,10 +132,6 @@ STEP_THERMOSTAT_SWITCH = vol.Schema(  # pylint: disable=invalid-name
         ),
         vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
         vol.Optional(CONF_INVERSE_SWITCH, default=False): cv.boolean,
-        vol.Optional("on_command_text"): vol.In([]),
-        vol.Optional(CONF_VSWITCH_ON_CMD_LIST): selector.TextSelector(selector.TextSelectorConfig(type=selector.TextSelectorType.TEXT, multiple=True)),
-        vol.Optional("off_command_text"): vol.In([]),
-        vol.Optional(CONF_VSWITCH_OFF_CMD_LIST): selector.TextSelector(selector.TextSelectorConfig(type=selector.TextSelectorType.TEXT, multiple=True)),
     }
 )
 
@@ -241,8 +231,16 @@ STEP_TPI_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
 
 STEP_CENTRAL_TPI_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
     {
-        vol.Required(CONF_TPI_COEF_INT, default=0.6): selector.NumberSelector(selector.NumberSelectorConfig(min=0.0, max=1.0, step=0.01, mode=selector.NumberSelectorMode.BOX)),
-        vol.Required(CONF_TPI_COEF_EXT, default=0.01): selector.NumberSelector(selector.NumberSelectorConfig(min=0.0, max=1.0, step=0.001, mode=selector.NumberSelectorMode.BOX)),
+        vol.Required(CONF_TPI_COEF_INT, default=0.6): selector.NumberSelector(
+            selector.NumberSelectorConfig(
+                min=0.0, max=1.0, step=0.01, mode=selector.NumberSelectorMode.BOX
+            )
+        ),
+        vol.Required(CONF_TPI_COEF_EXT, default=0.01): selector.NumberSelector(
+            selector.NumberSelectorConfig(
+                min=0.0, max=1.0, step=0.01, mode=selector.NumberSelectorMode.BOX
+            )
+        ),
     }
 )
 
@@ -267,11 +265,12 @@ STEP_WINDOW_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
 STEP_CENTRAL_WINDOW_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
     {
         vol.Optional(CONF_WINDOW_DELAY, default=30): cv.positive_int,
-        vol.Optional(CONF_WINDOW_OFF_DELAY, default=30): cv.positive_int,
         vol.Optional(CONF_WINDOW_AUTO_OPEN_THRESHOLD, default=3): vol.Coerce(float),
         vol.Optional(CONF_WINDOW_AUTO_CLOSE_THRESHOLD, default=0): vol.Coerce(float),
         vol.Optional(CONF_WINDOW_AUTO_MAX_DURATION, default=30): cv.positive_int,
-        vol.Optional(CONF_WINDOW_ACTION, default=CONF_WINDOW_TURN_OFF): selector.SelectSelector(
+        vol.Optional(
+            CONF_WINDOW_ACTION, default=CONF_WINDOW_TURN_OFF
+        ): selector.SelectSelector(
             selector.SelectSelectorConfig(
                 options=CONF_WINDOW_ACTIONS,
                 translation_key="window_action",
@@ -284,8 +283,9 @@ STEP_CENTRAL_WINDOW_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
 STEP_CENTRAL_WINDOW_WO_AUTO_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
     {
         vol.Optional(CONF_WINDOW_DELAY, default=30): cv.positive_int,
-        vol.Optional(CONF_WINDOW_OFF_DELAY, default=30): cv.positive_int,
-        vol.Optional(CONF_WINDOW_ACTION, default=CONF_WINDOW_TURN_OFF): selector.SelectSelector(
+        vol.Optional(
+            CONF_WINDOW_ACTION, default=CONF_WINDOW_TURN_OFF
+        ): selector.SelectSelector(
             selector.SelectSelectorConfig(
                 options=CONF_WINDOW_ACTIONS,
                 translation_key="window_action",

custom_components/versatile_thermostat/const.py

@@ -73,7 +73,6 @@ CONF_DEVICE_POWER = "device_power"
 CONF_CYCLE_MIN = "cycle_min"
 CONF_PROP_FUNCTION = "proportional_function"
 CONF_WINDOW_DELAY = "window_delay"
-CONF_WINDOW_OFF_DELAY = "window_off_delay"
 CONF_MOTION_DELAY = "motion_delay"
 CONF_MOTION_OFF_DELAY = "motion_off_delay"
 CONF_MOTION_PRESET = "motion_preset"
@@ -127,9 +126,6 @@ CONF_OPENING_DEGREE_LIST = "opening_degree_entity_ids"
 CONF_CLOSING_DEGREE_LIST = "closing_degree_entity_ids"
 CONF_MIN_OPENING_DEGREES = "min_opening_degrees"
 
-CONF_VSWITCH_ON_CMD_LIST = "vswitch_on_command"
-CONF_VSWITCH_OFF_CMD_LIST = "vswitch_off_command"
-
 # Deprecated
 CONF_HEATER = "heater_entity_id"
 CONF_HEATER_2 = "heater_entity2_id"
@@ -274,7 +270,6 @@ ALL_CONF = (
         CONF_MAX_POWER_SENSOR,
         CONF_WINDOW_SENSOR,
         CONF_WINDOW_DELAY,
-        CONF_WINDOW_OFF_DELAY,
         CONF_WINDOW_AUTO_OPEN_THRESHOLD,
         CONF_WINDOW_AUTO_CLOSE_THRESHOLD,
         CONF_WINDOW_AUTO_MAX_DURATION,
@@ -565,10 +560,6 @@ class ValveRegulationMinOpeningDegreesIncorrect(HomeAssistantError):
     """Error to indicate that the minimal opening degrees is not a list of int separated by coma"""
 
 
-class VirtualSwitchConfigurationIncorrect(HomeAssistantError):
-    """Error when a virtual switch is not configured correctly"""
-
-
 class overrides:  # pylint: disable=invalid-name
     """An annotation to inform overrides"""
 

custom_components/versatile_thermostat/feature_auto_start_stop_manager.py

@@ -70,12 +70,8 @@ class FeatureAutoStartStopManager(BaseFeatureManager):
             self._auto_start_stop_level, self.name
         )
 
-        # Fix an eventual incoherent state
-        if self._vtherm.is_on and self._vtherm.hvac_off_reason == HVAC_OFF_REASON_AUTO_START_STOP:
-            self._vtherm.hvac_off_reason = None
-
     @overrides
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity"""
 
     @overrides

custom_components/versatile_thermostat/feature_motion_manager.py

@@ -86,7 +86,7 @@ class FeatureMotionManager(BaseFeatureManager):
             self._motion_state = STATE_UNKNOWN
 
     @overrides
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity"""
         if self._is_configured:
             self.stop_listening()

custom_components/versatile_thermostat/feature_power_manager.py

@@ -61,17 +61,19 @@ class FeaturePowerManager(BaseFeatureManager):
         self._is_configured = False
 
     @overrides
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity. There is nothing to listen"""
         central_power_configuration = (
             VersatileThermostatAPI.get_vtherm_api().central_power_manager.is_configured
         )
 
-        if self._use_power_feature and self._device_power and central_power_configuration:
+        if (
+            self._use_power_feature
+            and self._device_power
+            and central_power_configuration
+        ):
             self._is_configured = True
-            # Try to restore _overpowering_state from previous state
-            old_state = await self._vtherm.async_get_last_state()
-            self._overpowering_state = STATE_ON if old_state and old_state.attributes and old_state.attributes.get("overpowering_state") == STATE_ON else STATE_UNKNOWN
+            self._overpowering_state = STATE_UNKNOWN
         else:
             if self._use_power_feature:
                 if not central_power_configuration:
@@ -104,8 +106,7 @@ class FeaturePowerManager(BaseFeatureManager):
 
     async def check_power_available(self) -> bool:
         """Check if the Vtherm can be started considering overpowering.
-        Returns True if no overpowering conditions are found.
-        If True the vtherm power is written into the temporay vtherm started
+        Returns True if no overpowering conditions are found
         """
 
         vtherm_api = VersatileThermostatAPI.get_vtherm_api()
@@ -117,7 +118,6 @@ class FeaturePowerManager(BaseFeatureManager):
 
         current_power = vtherm_api.central_power_manager.current_power
         current_max_power = vtherm_api.central_power_manager.current_max_power
-        started_vtherm_total_power = vtherm_api.central_power_manager.started_vtherm_total_power
         if (
             current_power is None
             or current_max_power is None
@@ -148,7 +148,7 @@ class FeaturePowerManager(BaseFeatureManager):
                     self._device_power * self._vtherm.proportional_algorithm.on_percent,
                 )
 
-        ret = (current_power + started_vtherm_total_power + power_consumption_max) < current_max_power
+        ret = (current_power + power_consumption_max) < current_max_power
         if not ret:
             _LOGGER.info(
                 "%s - there is not enough power available power=%.3f, max_power=%.3f heater power=%.3f",
@@ -157,10 +157,6 @@ class FeaturePowerManager(BaseFeatureManager):
                 current_max_power,
                 self._device_power,
             )
-        else:
-            # Adds the current_power_max to the started vtherm total power
-            vtherm_api.central_power_manager.add_started_vtherm_total_power(power_consumption_max)
-
         return ret
 
     async def set_overpowering(self, overpowering: bool, power_consumption_max=0):

custom_components/versatile_thermostat/feature_presence_manager.py

@@ -23,7 +23,12 @@ from homeassistant.helpers.event import (
     EventStateChangedData,
 )
 
-from homeassistant.components.climate import PRESET_ACTIVITY, PRESET_BOOST, PRESET_COMFORT, PRESET_ECO
+from homeassistant.components.climate import (
+    PRESET_ACTIVITY,
+    PRESET_BOOST,
+    PRESET_COMFORT,
+    PRESET_ECO,
+)
 
 from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
 from .commons import ConfigData
@@ -62,7 +67,7 @@ class FeaturePresenceManager(BaseFeatureManager):
             self._presence_state = STATE_UNKNOWN
 
     @overrides
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity"""
         if self._is_configured:
             self.stop_listening()
@@ -141,7 +146,6 @@ class FeaturePresenceManager(BaseFeatureManager):
             PRESET_COMFORT,
             PRESET_ECO,
             PRESET_ACTIVITY,
-            PRESET_FROST_PROTECTION,
         ]:
             return old_presence_state != self._presence_state
 

custom_components/versatile_thermostat/feature_safety_manager.py

@@ -70,7 +70,7 @@ class FeatureSafetyManager(BaseFeatureManager):
             self._is_configured = True
 
     @overrides
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity"""
 
     @overrides

custom_components/versatile_thermostat/feature_window_manager.py

@@ -46,7 +46,6 @@ class FeatureWindowManager(BaseFeatureManager):
             "is_window_configured",
             "is_window_bypass",
             "window_delay_sec",
-            "window_off_delay_sec",
             "window_auto_configured",
             "window_auto_open_threshold",
             "window_auto_close_threshold",
@@ -68,7 +67,6 @@ class FeatureWindowManager(BaseFeatureManager):
         self._is_window_bypass: bool = False
         self._window_action: str = None
         self._window_delay_sec: int | None = 0
-        self._window_off_delay_sec: int | None = 0
         self._is_configured: bool = False
         self._is_window_auto_configured: bool = False
         self._window_call_cancel: callable = None
@@ -83,8 +81,6 @@ class FeatureWindowManager(BaseFeatureManager):
 
         self._window_sensor_entity_id = entry_infos.get(CONF_WINDOW_SENSOR)
         self._window_delay_sec = entry_infos.get(CONF_WINDOW_DELAY)
-        # default is the WINDOW_ON delay if not configured
-        self._window_off_delay_sec = entry_infos.get(CONF_WINDOW_OFF_DELAY, self._window_delay_sec)
 
         self._window_action = (
             entry_infos.get(CONF_WINDOW_ACTION) or CONF_WINDOW_TURN_OFF
@@ -128,7 +124,7 @@ class FeatureWindowManager(BaseFeatureManager):
             self._window_state = STATE_UNKNOWN
 
     @overrides
-    async def start_listening(self):
+    def start_listening(self):
         """Start listening the underlying entity"""
         if self._is_configured:
             self.stop_listening()
@@ -195,7 +191,7 @@ class FeatureWindowManager(BaseFeatureManager):
                     self._hass,
                     self._window_sensor_entity_id,
                     new_state.state,
-                    timedelta(seconds=delay),
+                    timedelta(seconds=self._window_delay_sec),
                 )
             except ConditionError:
                 long_enough = False
@@ -225,12 +221,13 @@ class FeatureWindowManager(BaseFeatureManager):
 
             self._vtherm.update_custom_attributes()
 
-        delay = self._window_delay_sec if new_state.state == STATE_ON else self._window_off_delay_sec
         if new_state is None or old_state is None or new_state.state == old_state.state:
             return try_window_condition
 
         self.dearm_window_timer()
-        self._window_call_cancel = async_call_later(self.hass, timedelta(seconds=delay), try_window_condition)
+        self._window_call_cancel = async_call_later(
+            self.hass, timedelta(seconds=self._window_delay_sec), try_window_condition
+        )
         # For testing purpose we need to access the inner function
         return try_window_condition
 
@@ -436,7 +433,6 @@ class FeatureWindowManager(BaseFeatureManager):
                 "is_window_bypass": self._is_window_bypass,
                 "window_sensor_entity_id": self._window_sensor_entity_id,
                 "window_delay_sec": self._window_delay_sec,
-                "window_off_delay_sec": self._window_off_delay_sec,
                 "is_window_configured": self._is_configured,
                 "is_window_auto_configured": self._is_window_auto_configured,
                 "window_auto_open_threshold": self._window_auto_open_threshold,
@@ -516,14 +512,9 @@ class FeatureWindowManager(BaseFeatureManager):
 
     @property
     def window_delay_sec(self) -> bool:
-        """Return the window on delay"""
+        """Return the motion delay"""
         return self._window_delay_sec
 
-    @property
-    def window_off_delay_sec(self) -> bool:
-        """Return the window off delay"""
-        return self._window_off_delay_sec
-
     @property
     def window_action(self) -> bool:
         """Return the window action"""

custom_components/versatile_thermostat/manifest.json

@@ -14,6 +14,6 @@
   "quality_scale": "silver",
   "requirements": [],
   "ssdp": [],
-  "version": "7.2.0",
+  "version": "7.0.0",
   "zeroconf": []
 }

custom_components/versatile_thermostat/sensor.py

@@ -303,10 +303,6 @@ class ValveOpenPercentSensor(VersatileThermostatBaseEntity, SensorEntity):
         """Called when my climate have change"""
         # _LOGGER.debug("%s - climate state change", self._attr_unique_id)
 
-        if not self.my_climate or not hasattr(self.my_climate, "valve_open_percent"):
-            _LOGGER.warning("%s - my_climate not found or no valve_open_percent property found. This could be normal at startup. Ignore the underlying device change.", self)
-            return
-
         old_state = self._attr_native_value
         self._attr_native_value = self.my_climate.valve_open_percent
         if old_state != self._attr_native_value:

custom_components/versatile_thermostat/strings.json

@@ -82,9 +82,7 @@
           "auto_regulation_periode_min": "Regulation minimum period",
           "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
           "inverse_switch_command": "Inverse switch command",
-          "auto_fan_mode": "Auto fan mode",
-          "vswitch_on_command": "Optional turn on commands",
-          "vswitch_off_command": "Optional turn off commands"
+          "auto_fan_mode": "Auto fan mode"
         },
         "data_description": {
           "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
@@ -96,9 +94,7 @@
           "auto_regulation_periode_min": "Duration in minutes between two regulation update",
           "auto_regulation_use_device_temp": "Use the eventual internal temperature sensor of the underlying to speedup the self-regulation",
           "inverse_switch_command": "For switch with pilot wire and diode you may need to inverse the command",
-          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary",
-          "vswitch_on_command": "A list of turn on command in the form: action:parameter. Example: select_option:comfort. See README for more examples",
-          "vswitch_off_command": "A list of turn on command in the form: action:parameter. Example: select_option:frost. See README for more examples"
+          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary"
         }
       },
       "tpi": {
@@ -127,8 +123,7 @@
         "description": "Open window management.\nYou can also configure automatic window open detection based on temperature decrease",
         "data": {
           "window_sensor_entity_id": "Window sensor entity id",
-          "window_delay": "Window sensor 'on' delay (seconds)",
-          "window_off_delay": "Window sensor 'off' delay (seconds)",
+          "window_delay": "Window sensor delay (seconds)",
           "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
           "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
           "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
@@ -137,8 +132,7 @@
         },
         "data_description": {
           "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
-          "window_delay": "The delay in seconds before sensor 'on' detection is taken into account",
-          "window_off_delay": "The delay in seconds before sensor 'off' detection is taken into account. Leave it empty to use the same value as window on delay",
+          "window_delay": "The delay in seconds before sensor detection is taken into account",
           "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
           "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
           "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
@@ -234,11 +228,11 @@
           "min_opening_degrees": "Min opening degrees"
         },
         "data_description": {
-          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
-          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "min_opening_degrees": "Opening degree minimum value for each underlying device, comma separated. Default to 0. Example: 20, 25, 30"
+          "min_opening_degrees": "A comma seperated list of minimal opening degrees. Default to 0. Example: 20, 25, 30"
         }
       }
     },
@@ -334,9 +328,7 @@
           "auto_regulation_periode_min": "Regulation minimum period",
           "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
           "inverse_switch_command": "Inverse switch command",
-          "auto_fan_mode": "Auto fan mode",
-          "vswitch_on_command": "Optional turn on commands",
-          "vswitch_off_command": "Optional turn off commands"
+          "auto_fan_mode": "Auto fan mode"
         },
         "data_description": {
           "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
@@ -348,9 +340,7 @@
           "auto_regulation_periode_min": "Duration in minutes between two regulation update",
           "auto_regulation_use_device_temp": "Use the eventual internal temperature sensor of the underlying to speedup the self-regulation",
           "inverse_switch_command": "For switch with pilot wire and diode you may need to invert the command",
-          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary",
-          "vswitch_on_command": "A list of turn on command in the form: action:parameter. Example: select_option:comfort. See README for more examples",
-          "vswitch_off_command": "A list of turn on command in the form: action:parameter. Example: select_option:frost. See README for more examples"
+          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary"
         }
       },
       "tpi": {
@@ -379,8 +369,7 @@
         "description": "Open window management.\nYou can also configure automatic window open detection based on temperature decrease",
         "data": {
           "window_sensor_entity_id": "Window sensor entity id",
-          "window_delay": "Window sensor 'on' delay (seconds)",
-          "window_off_delay": "Window sensor 'off' delay (seconds)",
+          "window_delay": "Window sensor delay (seconds)",
           "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
           "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
           "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
@@ -389,8 +378,8 @@
         },
         "data_description": {
           "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
-          "window_delay": "The delay in seconds before sensor 'on' detection is taken into account",
-          "window_off_delay": "The delay in seconds before sensor 'off' detection is taken into account. Leave it empty to use the same value as window on delay",
+          "window_delay": "The delay in seconds before sensor detection is taken into account",
+          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
           "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
           "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
           "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
@@ -485,11 +474,11 @@
           "min_opening_degrees": "Min opening degrees"
         },
         "data_description": {
-          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
-          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "min_opening_degrees": "Opening degree minimum value for each underlying device, comma separated. Default to 0. Example: 20, 25, 30"
+          "min_opening_degrees": "A comma seperated list of minimal opening degrees. Default to 0. Example: 20, 25, 30"
         }
       }
     },

custom_components/versatile_thermostat/thermostat_climate.py

@@ -3,7 +3,7 @@
 import logging
 from datetime import timedelta, datetime
 
-from homeassistant.const import STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.const import STATE_ON
 from homeassistant.core import Event, HomeAssistant, State, callback
 from homeassistant.helpers.event import (
     async_track_state_change_event,
@@ -614,7 +614,7 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
             return
 
         # Find the underlying which have change
-        under: UnderlyingClimate = self.find_underlying_by_entity_id(new_state.entity_id)
+        under = self.find_underlying_by_entity_id(new_state.entity_id)
 
         if not under:
             _LOGGER.warning(
@@ -626,16 +626,6 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
         new_hvac_mode = new_state.state
 
         old_state = event.data.get("old_state")
-
-        # Issue #829 - refresh underlying command if it comes back to life
-        if old_state is not None and new_state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN) and old_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
-            _LOGGER.warning("%s - underlying %s come back to life. New state=%s, old_state=%s. Will refresh its status", self, under.entity_id, new_state.state, old_state.state)
-            # Force hvac_mode and target temperature
-            await under.set_hvac_mode(self.hvac_mode)
-            await self._send_regulated_temperature(force=True)
-
-            return
-
         old_hvac_action = (
             old_state.attributes.get("hvac_action")
             if old_state and old_state.attributes
@@ -843,8 +833,7 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
             and under.last_sent_temperature is not None
         ):
             _LOGGER.debug(
-                "%s - Do temperature check. under.last_sent_temperature is %s, new_target_temp is %s",
-                self,
+                "Do temperature check. under.last_sent_temperature is %s, new_target_temp is %s",
                 under.last_sent_temperature,
                 new_target_temp,
             )
@@ -1104,7 +1093,7 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
     @overrides
     async def async_set_humidity(self, humidity: int):
         """Set new target humidity."""
-        _LOGGER.info("%s - Set humidity: %s", self, humidity)
+        _LOGGER.info("%s - Set fan mode: %s", self, humidity)
         if humidity is None:
             return
         for under in self._underlyings:
@@ -1115,7 +1104,7 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
     @overrides
     async def async_set_swing_mode(self, swing_mode):
         """Set new target swing operation."""
-        _LOGGER.info("%s - Set swing mode: %s", self, swing_mode)
+        _LOGGER.info("%s - Set fan mode: %s", self, swing_mode)
         if swing_mode is None:
             return
         for under in self._underlyings:

custom_components/versatile_thermostat/thermostat_climate_valve.py

@@ -255,13 +255,6 @@ class ThermostatOverClimateValve(ThermostatOverClimate):
                     self._attr_min_temp,
                 )
 
-        self._last_regulation_change = self.now
-        self.reset_last_change_time_from_vtherm()
-
-        _LOGGER.debug(
-            "%s - last_regulation_change is now: %s and last_change_from_vtherm is now: %s", self, self._last_regulation_change, self._last_change_time_from_vtherm
-        )  # pylint: disable=protected-access
-
         for under in self._underlyings_valve_regulation:
             await under.set_valve_open_percent()
 
@@ -270,6 +263,20 @@ class ThermostatOverClimateValve(ThermostatOverClimate):
         """True if the Thermostat is regulated by valve"""
         return True
 
+    @overrides
+    @property
+    def power_percent(self) -> float | None:
+        """Get the current on_percent value"""
+        if self._prop_algorithm:
+            return round(self._prop_algorithm.on_percent * 100, 0)
+        else:
+            return None
+
+    # @property
+    # def hvac_modes(self) -> list[HVACMode]:
+    #    """Get the hvac_modes"""
+    #    return self._hvac_list
+
     @property
     def valve_open_percent(self) -> int:
         """Gives the percentage of valve needed"""

custom_components/versatile_thermostat/thermostat_switch.py

@@ -14,8 +14,6 @@ from .const import (
     CONF_UNDERLYING_LIST,
     CONF_HEATER_KEEP_ALIVE,
     CONF_INVERSE_SWITCH,
-    CONF_VSWITCH_ON_CMD_LIST,
-    CONF_VSWITCH_OFF_CMD_LIST,
     overrides,
 )
 
@@ -28,31 +26,29 @@ _LOGGER = logging.getLogger(__name__)
 class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
     """Representation of a base class for a Versatile Thermostat over a switch."""
 
-    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(  # pylint: disable=protected-access
-        frozenset(
-            {
-                "is_over_switch",
-                "is_inversed",
-                "underlying_entities",
-                "on_time_sec",
-                "off_time_sec",
-                "cycle_min",
-                "function",
-                "tpi_coef_int",
-                "tpi_coef_ext",
-                "power_percent",
-                "calculated_on_percent",
-                "vswitch_on_commands",
-                "vswitch_off_commands",
-            }
+    _entity_component_unrecorded_attributes = (
+        BaseThermostat._entity_component_unrecorded_attributes.union(
+            frozenset(
+                {
+                    "is_over_switch",
+                    "is_inversed",
+                    "underlying_entities",
+                    "on_time_sec",
+                    "off_time_sec",
+                    "cycle_min",
+                    "function",
+                    "tpi_coef_int",
+                    "tpi_coef_ext",
+                    "power_percent",
+                    "calculated_on_percent",
+                }
+            )
         )
     )
 
     def __init__(self, hass: HomeAssistant, unique_id, name, config_entry) -> None:
         """Initialize the thermostat over switch."""
         self._is_inversed: bool | None = None
-        self._lst_vswitch_on: list[str] = []
-        self._lst_vswitch_off: list[str] = []
         super().__init__(hass, unique_id, name, config_entry)
 
     @property
@@ -65,6 +61,15 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
         """True if the switch is inversed (for pilot wire and diode)"""
         return self._is_inversed is True
 
+    @overrides
+    @property
+    def power_percent(self) -> float | None:
+        """Get the current on_percent value"""
+        if self._prop_algorithm:
+            return round(self._prop_algorithm.on_percent * 100, 0)
+        else:
+            return None
+
     @overrides
     def post_init(self, config_entry: ConfigData):
         """Initialize the Thermostat"""
@@ -82,13 +87,9 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
         )
 
         lst_switches = config_entry.get(CONF_UNDERLYING_LIST)
-        self._lst_vswitch_on = config_entry.get(CONF_VSWITCH_ON_CMD_LIST, [])
-        self._lst_vswitch_off = config_entry.get(CONF_VSWITCH_OFF_CMD_LIST, [])
 
         delta_cycle = self._cycle_min * 60 / len(lst_switches)
         for idx, switch in enumerate(lst_switches):
-            vswitch_on = self._lst_vswitch_on[idx] if idx < len(self._lst_vswitch_on) else None
-            vswitch_off = self._lst_vswitch_off[idx] if idx < len(self._lst_vswitch_off) else None
             self._underlyings.append(
                 UnderlyingSwitch(
                     hass=self._hass,
@@ -96,8 +97,6 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
                     switch_entity_id=switch,
                     initial_delay_sec=idx * delta_cycle,
                     keep_alive_sec=config_entry.get(CONF_HEATER_KEEP_ALIVE, 0),
-                    vswitch_on=vswitch_on,
-                    vswitch_off=vswitch_off,
                 )
             )
 
@@ -154,9 +153,6 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
             "calculated_on_percent"
         ] = self._prop_algorithm.calculated_on_percent
 
-        self._attr_extra_state_attributes["vswitch_on_commands"] = self._lst_vswitch_on
-        self._attr_extra_state_attributes["vswitch_off_commands"] = self._lst_vswitch_off
-
         self.async_write_ha_state()
         _LOGGER.debug(
             "%s - Calling update_custom_attributes: %s",

custom_components/versatile_thermostat/translations/en.json

@@ -82,9 +82,7 @@
           "auto_regulation_periode_min": "Regulation minimum period",
           "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
           "inverse_switch_command": "Inverse switch command",
-          "auto_fan_mode": "Auto fan mode",
-          "vswitch_on_command": "Optional turn on commands",
-          "vswitch_off_command": "Optional turn off commands"
+          "auto_fan_mode": "Auto fan mode"
         },
         "data_description": {
           "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
@@ -96,9 +94,7 @@
           "auto_regulation_periode_min": "Duration in minutes between two regulation update",
           "auto_regulation_use_device_temp": "Use the eventual internal temperature sensor of the underlying to speedup the self-regulation",
           "inverse_switch_command": "For switch with pilot wire and diode you may need to inverse the command",
-          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary",
-          "vswitch_on_command": "A list of turn on command in the form: action:parameter. Example: select_option:comfort. See README for more examples",
-          "vswitch_off_command": "A list of turn on command in the form: action:parameter. Example: select_option:frost. See README for more examples"
+          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary"
         }
       },
       "tpi": {
@@ -127,8 +123,7 @@
         "description": "Open window management.\nYou can also configure automatic window open detection based on temperature decrease",
         "data": {
           "window_sensor_entity_id": "Window sensor entity id",
-          "window_delay": "Window sensor 'on' delay (seconds)",
-          "window_off_delay": "Window sensor 'off' delay (seconds)",
+          "window_delay": "Window sensor delay (seconds)",
           "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
           "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
           "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
@@ -137,8 +132,7 @@
         },
         "data_description": {
           "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
-          "window_delay": "The delay in seconds before sensor 'on' detection is taken into account",
-          "window_off_delay": "The delay in seconds before sensor 'off' detection is taken into account. Leave it empty to use the same value as window on delay",
+          "window_delay": "The delay in seconds before sensor detection is taken into account",
           "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
           "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
           "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
@@ -234,11 +228,11 @@
           "min_opening_degrees": "Min opening degrees"
         },
         "data_description": {
-          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
-          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "min_opening_degrees": "Opening degree minimum value for each underlying device, comma separated. Default to 0. Example: 20, 25, 30"
+          "min_opening_degrees": "A comma seperated list of minimal opening degrees. Default to 0. Example: 20, 25, 30"
         }
       }
     },
@@ -334,9 +328,7 @@
           "auto_regulation_periode_min": "Regulation minimum period",
           "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
           "inverse_switch_command": "Inverse switch command",
-          "auto_fan_mode": "Auto fan mode",
-          "vswitch_on_command": "Optional turn on commands",
-          "vswitch_off_command": "Optional turn off commands"
+          "auto_fan_mode": "Auto fan mode"
         },
         "data_description": {
           "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
@@ -348,9 +340,7 @@
           "auto_regulation_periode_min": "Duration in minutes between two regulation update",
           "auto_regulation_use_device_temp": "Use the eventual internal temperature sensor of the underlying to speedup the self-regulation",
           "inverse_switch_command": "For switch with pilot wire and diode you may need to invert the command",
-          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary",
-          "vswitch_on_command": "A list of turn on command in the form: action:parameter. Example: select_option:comfort. See README for more examples",
-          "vswitch_off_command": "A list of turn on command in the form: action:parameter. Example: select_option:frost. See README for more examples"
+          "auto_fan_mode": "Automatically activate fan when huge heating/cooling is necessary"
         }
       },
       "tpi": {
@@ -379,8 +369,7 @@
         "description": "Open window management.\nYou can also configure automatic window open detection based on temperature decrease",
         "data": {
           "window_sensor_entity_id": "Window sensor entity id",
-          "window_delay": "Window sensor 'on' delay (seconds)",
-          "window_off_delay": "Window sensor 'off' delay (seconds)",
+          "window_delay": "Window sensor delay (seconds)",
           "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
           "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
           "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
@@ -389,8 +378,8 @@
         },
         "data_description": {
           "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
-          "window_delay": "The delay in seconds before sensor 'on' detection is taken into account",
-          "window_off_delay": "The delay in seconds before sensor 'off' detection is taken into account. Leave it empty to use the same value as window on delay",
+          "window_delay": "The delay in seconds before sensor detection is taken into account",
+          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
           "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
           "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
           "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
@@ -485,11 +474,11 @@
           "min_opening_degrees": "Min opening degrees"
         },
         "data_description": {
-          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
-          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV has the entity for better regulation. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. Set it if your TRV have the entity for better regulation. There should be one per underlying climate entities",
           "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "min_opening_degrees": "Opening degree minimum value for each underlying device, comma separated. Default to 0. Example: 20, 25, 30"
+          "min_opening_degrees": "A comma seperated list of minimal opening degrees. Default to 0. Example: 20, 25, 30"
         }
       }
     },
@@ -499,8 +488,7 @@
       "window_open_detection_method": "Only one window open detection method should be used. Use either window sensor or automatic detection through temperature threshold but not both",
       "no_central_config": "You cannot check 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it.",
       "service_configuration_format": "The format of the service configuration is wrong",
-      "valve_regulation_nb_entities_incorrect": "The number of valve entities for valve regulation should be equal to the number of underlyings",
-      "min_opening_degrees_format": "A comma separated list of positive integer is expected. Example: 20, 25, 30"
+      "valve_regulation_nb_entities_incorrect": "The number of valve entities for valve regulation should be equal to the number of underlyings"
     },
     "abort": {
       "already_configured": "Device is already configured"

custom_components/versatile_thermostat/translations/fr.json

@@ -71,7 +71,7 @@
       },
       "type": {
         "title": "Entité(s) liée(s)",
-        "description": "Attributs de(s) l'entité(s) liée(s) [![?](https://img.icons8.com/color/18/help.png)](https://github.com/jmcollin78/versatile_thermostat/blob/main/documentation/fr/over-switch.md#configuration)",
+        "description": "Attributs de(s) l'entité(s) liée(s)",
         "data": {
           "underlying_entity_ids": "Les équipements à controller",
           "heater_keep_alive": "keep-alive (sec)",
@@ -82,11 +82,7 @@
           "auto_regulation_periode_min": "Période minimale de régulation",
           "auto_regulation_use_device_temp": "Compenser la température interne du sous-jacent",
           "inverse_switch_command": "Inverser la commande",
-          "auto_fan_mode": " Auto ventilation mode",
-          "on_command_text": "Personnalisation des commandes d'allumage",
-          "vswitch_on_command": "Commande d'allumage (optionnel)",
-          "off_command_text": "Personnalisation des commandes d'extinction",
-          "vswitch_off_command": "Commande d'extinction (optionnel)"
+          "auto_fan_mode": " Auto ventilation mode"
         },
         "data_description": {
           "underlying_entity_ids": "La liste des équipements qui seront controlés par ce VTherm",
@@ -98,8 +94,7 @@
           "auto_regulation_periode_min": "La durée en minutes entre deux mise à jour faites par la régulation",
           "auto_regulation_use_device_temp": "Compenser la temperature interne du sous-jacent pour accélérer l'auto-régulation",
           "inverse_switch_command": "Inverse la commande du switch pour une installation avec fil pilote et diode",
-          "auto_fan_mode": "Active la ventilation automatiquement en cas d'écart important",
-          "on_command_text": "Pour les sous-jacents de type `select` ou `climate` vous devez personnaliser les commandes."
+          "auto_fan_mode": "Active la ventilation automatiquement en cas d'écart important"
         }
       },
       "tpi": {
@@ -128,8 +123,7 @@
         "description": "Coupe le radiateur si l'ouverture est ouverte.\nLaissez l'id d'entité vide pour utiliser la détection automatique.",
         "data": {
           "window_sensor_entity_id": "Détecteur d'ouverture (entity id)",
-          "window_delay": "Délai de prise en compte à l'ouverture (secondes)",
-          "window_off_delay": "Délai de prise compte à la fermeture (secondes)",
+          "window_delay": "Délai avant extinction (secondes)",
           "window_auto_open_threshold": "Seuil haut de chute de température pour la détection automatique (en °/heure)",
           "window_auto_close_threshold": "Seuil bas de chute de température pour la fin de détection automatique (en °/heure)",
           "window_auto_max_duration": "Durée maximum d'une extinction automatique (en min)",
@@ -138,8 +132,7 @@
         },
         "data_description": {
           "window_sensor_entity_id": "Laissez vide si vous n'avez de détecteur et pour utiliser la détection automatique",
-          "window_delay": "Le délai (en secondes) avant que le changement du détecteur soit pris en compte lors de la détection d'une ouverture",
-          "window_off_delay": "Le délai (en secondes) avant que le changement du détecteur soit pris en compte lors de la détection d'une fermeture. Laissez vide pour utiliser le même délai à l'ouveture et à la fermeture",
+          "window_delay": "Le délai (en secondes) avant que le changement du détecteur soit pris en compte",
           "window_auto_open_threshold": "Valeur recommandée: entre 3 et 10. Laissez vide si vous n'utilisez pas la détection automatique",
           "window_auto_close_threshold": "Valeur recommandée: 0. Laissez vide si vous n'utilisez pas la détection automatique",
           "window_auto_max_duration": "Valeur recommandée: 60 (1 heure). Laissez vide si vous n'utilisez pas la détection automatique",
@@ -160,7 +153,7 @@
         },
         "data_description": {
           "motion_sensor_entity_id": "Id d'entité du détecteur de mouvement",
-          "motion_delay": "Délai avant activation lorsqu'un mouvement est détecté (secondes)",
+          "motion_delay": "Délai avant activation lorsqu'un mouvement est détecté (secondss)",
           "motion_off_delai": "Délai avant désactivation lorsqu'aucun mouvement n'est détecté (secondes)",
           "motion_preset": "Preset à utiliser si mouvement détecté",
           "no_motion_preset": "Preset à utiliser si pas de mouvement détecté",
@@ -205,7 +198,7 @@
           "use_advanced_central_config": "Utiliser la configuration centrale avancée"
         },
         "data_description": {
-          "minimal_activation_delay": "Délai en secondes en-dessous duquel l'équipement ne sera pas activé",
+          "minimal_activation_delay": "Délai en seondes en-dessous duquel l'équipement ne sera pas activé",
           "safety_delay_min": "Délai maximal autorisé en minutes entre 2 mesures de températures. Au-dessus de ce délai, le thermostat se mettra en position de sécurité",
           "safety_min_on_percent": "Seuil minimal de pourcentage de chauffage en-dessous duquel le préréglage sécurité ne sera jamais activé",
           "safety_default_on_percent": "Valeur par défaut pour le pourcentage de chauffage en mode sécurité. Mettre 0 pour éteindre le radiateur en mode sécurité",
@@ -324,7 +317,7 @@
       },
       "type": {
         "title": "Entité(s) liée(s) - {name}",
-        "description": "Attributs de(s) l'entité(s) liée(s) [![?](https://img.icons8.com/color/18/help.png)](https://github.com/jmcollin78/versatile_thermostat/blob/main/documentation/fr/over-switch.md#configuration)",
+        "description": "Attributs de(s) l'entité(s) liée(s)",
         "data": {
           "underlying_entity_ids": "Les équipements à controller",
           "heater_keep_alive": "keep-alive (sec)",
@@ -335,11 +328,7 @@
           "auto_regulation_periode_min": "Période minimale de régulation",
           "auto_regulation_use_device_temp": "Compenser la température interne du sous-jacent",
           "inverse_switch_command": "Inverser la commande",
-          "auto_fan_mode": " Auto ventilation mode",
-          "on_command_text": "Personnalisation des commandes d'allumage",
-          "vswitch_on_command": "Commande d'allumage (optionnel)",
-          "off_command_text": "Personnalisation des commandes d'extinction",
-          "vswitch_off_command": "Commande d'extinction (optionnel)"
+          "auto_fan_mode": " Auto ventilation mode"
         },
         "data_description": {
           "underlying_entity_ids": "La liste des équipements qui seront controlés par ce VTherm",
@@ -351,8 +340,7 @@
           "auto_regulation_periode_min": "La durée en minutes entre deux mise à jour faites par la régulation",
           "auto_regulation_use_device_temp": "Compenser la temperature interne du sous-jacent pour accélérer l'auto-régulation",
           "inverse_switch_command": "Inverse la commande du switch pour une installation avec fil pilote et diode",
-          "auto_fan_mode": "Active la ventilation automatiquement en cas d'écart important",
-          "on_command_text": "Pour les sous-jacents de type `select` ou `climate`"
+          "auto_fan_mode": "Active la ventilation automatiquement en cas d'écart important"
         }
       },
       "tpi": {
@@ -376,7 +364,6 @@
         "data": {
           "window_sensor_entity_id": "Détecteur d'ouverture (entity id)",
           "window_delay": "Délai avant extinction (secondes)",
-          "window_off_delay": "Délai de prise compte à la fermeture (secondes)",
           "window_auto_open_threshold": "Seuil haut de chute de température pour la détection automatique (en °/heure)",
           "window_auto_close_threshold": "Seuil bas de chute de température pour la fin de détection automatique (en °/heure)",
           "window_auto_max_duration": "Durée maximum d'une extinction automatique (en min)",
@@ -386,7 +373,6 @@
         "data_description": {
           "window_sensor_entity_id": "Laissez vide si vous n'avez de détecteur et pour utiliser la détection automatique",
           "window_delay": "Le délai (en secondes) avant que le changement du détecteur soit pris en compte",
-          "window_off_delay": "Le délai (en secondes) avant que le changement du détecteur soit pris en compte lors de la détection d'une fermeture. Laissez vide pour utiliser le même délai à l'ouveture et à la fermeture",
           "window_auto_open_threshold": "Valeur recommandée: entre 3 et 10. Laissez vide si vous n'utilisez pas la détection automatique",
           "window_auto_close_threshold": "Valeur recommandée: 0. Laissez vide si vous n'utilisez pas la détection automatique",
           "window_auto_max_duration": "Valeur recommandée: 60 (1 heure). Laissez vide si vous n'utilisez pas la détection automatique",
@@ -497,8 +483,7 @@
       "no_central_config": "Vous ne pouvez pas cocher 'Utiliser la configuration centrale' car aucune configuration centrale n'a été trouvée. Vous devez créer un Versatile Thermostat de type 'Central Configuration' pour pouvoir l'utiliser.",
       "service_configuration_format": "Mauvais format de la configuration du service",
       "valve_regulation_nb_entities_incorrect": "Le nombre d'entités pour la régulation par vanne doit être égal au nombre d'entité sous-jacentes",
-      "min_opening_degrees_format": "Une liste d'entiers positifs séparés par des ',' est attendu. Exemple : 20, 25, 30",
-      "vswitch_configuration_incorrect": "La configuration de la personnalisation des commandes est incorrecte. Elle est obligatoire pour les sous-jacents non switch et le format doit être 'service_name[/attribut:valeur]'. Plus d'informations dans le README."
+      "min_opening_degrees_format": "Une liste d'entiers positifs séparés par des ',' est attendu. Exemple : 20, 25, 30"
     },
     "abort": {
       "already_configured": "Le device est déjà configuré"
@@ -510,7 +495,7 @@
         "thermostat_central_config": "Configuration centrale",
         "thermostat_over_switch": "Thermostat sur un switch",
         "thermostat_over_climate": "Thermostat sur un autre thermostat",
-        "thermostat_over_valve": "Thermostat sur une vanne"
+        "thermostat_over_valve": "Thermostat sur une valve"
       }
     },
     "auto_regulation_mode": {

custom_components/versatile_thermostat/underlyings.py

@@ -2,12 +2,10 @@
 
 """ Underlying entities classes """
 import logging
-import re
-from typing import Any, Dict, Tuple
-
+from typing import Any
 from enum import StrEnum
 
-from homeassistant.const import ATTR_ENTITY_ID, STATE_ON, STATE_OFF, STATE_UNAVAILABLE
+from homeassistant.const import ATTR_ENTITY_ID, STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import State
 
 from homeassistant.exceptions import ServiceNotFound
@@ -197,22 +195,21 @@ class UnderlyingEntity:
         self._cancel_cycle()
         await self.turn_off()
 
-    async def check_overpowering(self) -> bool:
-        """Check that a underlying can be turned on, else
-        activate the overpowering state of the VTherm associated.
-        Returns True if the check is ok (no overpowering needed)"""
-        if not await self._thermostat.power_manager.check_power_available():
-            _LOGGER.debug("%s - overpowering is detected", self)
-            await self._thermostat.power_manager.set_overpowering(True)
-            return False
-        return True
-
 
 class UnderlyingSwitch(UnderlyingEntity):
     """Represent a underlying switch"""
 
+    _initialDelaySec: int
+    _on_time_sec: int
+    _off_time_sec: int
+
     def __init__(
-        self, hass: HomeAssistant, thermostat: Any, switch_entity_id: str, initial_delay_sec: int, keep_alive_sec: float, vswitch_on: str = None, vswitch_off: str = None
+        self,
+        hass: HomeAssistant,
+        thermostat: Any,
+        switch_entity_id: str,
+        initial_delay_sec: int,
+        keep_alive_sec: float,
     ) -> None:
         """Initialize the underlying switch"""
 
@@ -228,14 +225,6 @@ class UnderlyingSwitch(UnderlyingEntity):
         self._on_time_sec = 0
         self._off_time_sec = 0
         self._keep_alive = IntervalCaller(hass, keep_alive_sec)
-        self._vswitch_on = vswitch_on
-        self._vswitch_off = vswitch_off
-        self._domain = self._entity_id.split(".")[0]
-        # build command
-        command, data, state_on = self.build_command(use_on=True)
-        self._on_command = {"command": command, "data": data, "state": state_on}
-        command, data, state_off = self.build_command(use_on=False)
-        self._off_command = {"command": command, "data": data, "state": state_off}
 
     @property
     def initial_delay_sec(self):
@@ -276,11 +265,10 @@ class UnderlyingSwitch(UnderlyingEntity):
     @property
     def is_device_active(self):
         """If the toggleable device is currently active."""
-        # real_state = self._hass.states.is_state(self._entity_id, STATE_ON)
-        # return (self.is_inversed and not real_state) or (
-        #    not self.is_inversed and real_state
-        # )
-        return self._hass.states.is_state(self._entity_id, self._on_command.get("state"))
+        real_state = self._hass.states.is_state(self._entity_id, STATE_ON)
+        return (self.is_inversed and not real_state) or (
+            not self.is_inversed and real_state
+        )
 
     async def _keep_alive_callback(self):
         """Keep alive: Turn on if already turned on, turn off if already turned off."""
@@ -307,44 +295,18 @@ class UnderlyingSwitch(UnderlyingEntity):
                 )
             await (self.turn_on() if self.is_device_active else self.turn_off())
 
-    def build_command(self, use_on: bool) -> Tuple[str, Dict[str, str]]:
-        """Build a command and returns a command and a dict as data"""
-
-        value = None
-        data = {ATTR_ENTITY_ID: self._entity_id}
-        vswitch = self._vswitch_on if use_on and not self.is_inversed else self._vswitch_off
-        if vswitch:
-            pattern = r"^(?P<command>[^/]+)(?:/(?P<argument>[^:]+)(?::(?P<value>.*))?)?$"
-            match = re.match(pattern, vswitch)
-
-            if match:
-                # Extraire les groupes nommés
-                command = match.group("command")
-                argument = match.group("argument")
-                value = match.group("value")
-                data.update({argument: value})
-            else:
-                raise ValueError(f"Invalid input format: {vswitch}")
-
-        else:
-            command = SERVICE_TURN_ON if use_on and not self.is_inversed else SERVICE_TURN_OFF
-            value = STATE_ON if use_on and not self.is_inversed else STATE_OFF
-
-        return command, data, value
-
+    # @overrides this breaks some unit tests TypeError: object MagicMock can't be used in 'await' expression
     async def turn_off(self):
         """Turn heater toggleable device off."""
         self._keep_alive.cancel()  # Cancel early to avoid a turn_on/turn_off race condition
         _LOGGER.debug("%s - Stopping underlying entity %s", self, self._entity_id)
-
-        command = self._off_command.get("command")
-        data = self._off_command.get("data")
-
+        command = SERVICE_TURN_OFF if not self.is_inversed else SERVICE_TURN_ON
+        domain = self._entity_id.split(".")[0]
         # This may fails if called after shutdown
         try:
             try:
-                _LOGGER.debug("%s - Sending command %s with data=%s", self, command, data)
-                await self._hass.services.async_call(self._domain, command, data)
+                data = {ATTR_ENTITY_ID: self._entity_id}
+                await self._hass.services.async_call(domain, command, data)
                 self._keep_alive.set_async_action(self._keep_alive_callback)
             except Exception:
                 self._keep_alive.cancel()
@@ -356,18 +318,13 @@ class UnderlyingSwitch(UnderlyingEntity):
         """Turn heater toggleable device on."""
         self._keep_alive.cancel()  # Cancel early to avoid a turn_on/turn_off race condition
         _LOGGER.debug("%s - Starting underlying entity %s", self, self._entity_id)
-
-        if not await self.check_overpowering():
-            return False
-
-        command = self._on_command.get("command")
-        data = self._on_command.get("data")
+        command = SERVICE_TURN_ON if not self.is_inversed else SERVICE_TURN_OFF
+        domain = self._entity_id.split(".")[0]
         try:
             try:
-                _LOGGER.debug("%s - Sending command %s with data=%s", self, command, data)
-                await self._hass.services.async_call(self._domain, command, data)
+                data = {ATTR_ENTITY_ID: self._entity_id}
+                await self._hass.services.async_call(domain, command, data)
                 self._keep_alive.set_async_action(self._keep_alive_callback)
-                return True
             except Exception:
                 self._keep_alive.cancel()
                 raise
@@ -457,6 +414,10 @@ class UnderlyingSwitch(UnderlyingEntity):
                 await self.turn_off()
             return
 
+        # if await self._thermostat.power_manager.check_overpowering():
+        #     _LOGGER.debug("%s - End of cycle (3)", self)
+        #     return
+
         # safety mode could have change the on_time percent
         await self._thermostat.safety_manager.refresh_state()
         time = self._on_time_sec
@@ -471,8 +432,7 @@ class UnderlyingSwitch(UnderlyingEntity):
                 time // 60,
                 time % 60,
             )
-            if not await self.turn_on():
-                return
+            await self.turn_on()
         else:
             _LOGGER.debug("%s - No action on heater cause duration is 0", self)
         self._async_cancel_cycle = self.call_later(
@@ -597,10 +557,6 @@ class UnderlyingClimate(UnderlyingEntity):
             )
             return False
 
-        # When turning on a climate, check that power is available
-        if hvac_mode in (HVACMode.HEAT, HVACMode.COOL) and not await self.check_overpowering():
-            return False
-
         data = {ATTR_ENTITY_ID: self._entity_id, "hvac_mode": hvac_mode}
         await self._hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -639,7 +595,7 @@ class UnderlyingClimate(UnderlyingEntity):
 
     async def set_humidity(self, humidity: int):
         """Set new target humidity."""
-        _LOGGER.info("%s - Set humidity: %s", self, humidity)
+        _LOGGER.info("%s - Set fan mode: %s", self, humidity)
         if not self.is_initialized:
             return
         data = {
@@ -655,7 +611,7 @@ class UnderlyingClimate(UnderlyingEntity):
 
     async def set_swing_mode(self, swing_mode):
         """Set new target swing operation."""
-        _LOGGER.info("%s - Set swing mode: %s", self, swing_mode)
+        _LOGGER.info("%s - Set fan mode: %s", self, swing_mode)
         if not self.is_initialized:
             return
         data = {
@@ -676,23 +632,22 @@ class UnderlyingClimate(UnderlyingEntity):
 
         # Issue 508 we have to take care of service set_temperature or set_range
         target_temp = self.cap_sent_value(temperature)
-        data = {
-            ATTR_ENTITY_ID: self._entity_id,
-        }
-
-        _LOGGER.info("%s - Set setpoint temperature to: %s", self, target_temp)
-
-        # Issue 807 add TARGET_TEMPERATURE only if in the features
-        if ClimateEntityFeature.TARGET_TEMPERATURE_RANGE in self._underlying_climate.supported_features:
-            data.update(
-                {
-                    "target_temp_high": target_temp,
-                    "target_temp_low": target_temp,
-                }
-            )
-
-        if ClimateEntityFeature.TARGET_TEMPERATURE in self._underlying_climate.supported_features:
-            data["temperature"] = target_temp
+        if (
+            ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+            in self._underlying_climate.supported_features
+        ):
+            data = {
+                ATTR_ENTITY_ID: self._entity_id,
+                "target_temp_high": target_temp,
+                "target_temp_low": target_temp,
+                # issue 518 - we should send also the target temperature, even in TARGET RANGE
+                "temperature": target_temp,
+            }
+        else:
+            data = {
+                ATTR_ENTITY_ID: self._entity_id,
+                "temperature": target_temp,
+            }
 
         await self._hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -701,7 +656,6 @@ class UnderlyingClimate(UnderlyingEntity):
         )
 
         self._last_sent_temperature = target_temp
-        _LOGGER.debug("%s - Last_sent_temperature is now: %s", self, self._last_sent_temperature)
 
     @property
     def last_sent_temperature(self) -> float | None:
@@ -1132,17 +1086,10 @@ class UnderlyingValveRegulation(UnderlyingValve):
             )
             return
 
-        # Caclulate percent_open
-        if self._percent_open >= 1:
-            self._percent_open = round(
-                self._min_opening_degree
-                + (self._percent_open
-                   * (100 - self._min_opening_degree) / 100)
-                )
-        else:
-            self._percent_open = 0
-
         # Send opening_degree
+        if 0 < self._percent_open < self._min_opening_degree:
+            self._percent_open = self._min_opening_degree
+
         await super().send_percent_open()
 
         # Send closing_degree if set

custom_components/versatile_thermostat/vtherm_api.py

@@ -188,7 +188,7 @@ class VersatileThermostatAPI(dict):
 
         # start listening for the central power manager if not only one vtherm reload
         if not entry_id:
-            await self.central_power_manager.start_listening()
+            self.central_power_manager.start_listening()
 
     async def init_vtherm_preset_with_central(self):
         """Init all VTherm presets when the VTherm uses central temperature"""

documentation/en/base-attributes.md

@@ -15,7 +15,7 @@ Provide the mandatory main attributes. These attributes are common to all VTherm
    1. For `over_switch`: VTherm will turn the radiator on/off, modulating the proportion of time it is on,
    2. For `over_valve`: VTherm will calculate a new valve opening level and send it if it has changed,
    3. For `over_climate`: The cycle performs basic controls and recalculates the self-regulation coefficients. The cycle may result in a new setpoint sent to underlying devices or a valve opening adjustment in the case of a controllable TRV.
-5. The equipment's power, which will activate power and energy consumption sensors for the device. If multiple devices are linked to the same VTherm, specify the total maximum power of all devices here. The power unit is not important here. What is important is that all _VTherm_ and all power sensors have the same unit (see: Power shedding feature),
+5. The equipment's power, which will activate power and energy consumption sensors for the device. If multiple devices are linked to the same VTherm, specify the total maximum power of all devices here,
 6. The option to use additional parameters from centralized configuration:
    1. Outdoor temperature sensor,
    2. Minimum/maximum temperature and temperature step size,
@@ -42,4 +42,4 @@ Choose the features you want to use for this VTherm:
 > ![Tip](images/tips.png) _*Notes*_
 > 1. The list of available functions adapts to your VTherm type.
 > 2. When you enable a function, a new menu entry is added to configure it.
-> 3. You cannot validate the creation of a VTherm if all parameters for all enabled functions have not been configured.
+> 3. You cannot validate the creation of a VTherm if all parameters for all enabled functions have not been configured.

documentation/en/creation.md

@@ -49,7 +49,7 @@ When your device is controlled by a `climate` entity in Home Assistant and you o
 
 This type also includes advanced self-regulation features to adjust the setpoint sent to the underlying device, helping to achieve the target temperature faster and mitigating poor internal regulation. For example, if the device's internal thermometer is too close to the heating element, it may incorrectly assume the room is warm while the setpoint is far from being achieved in other areas.
 
-Since version 6.8, this VTherm type can also regulate directly by controlling the valve. Ideal for controllable TRVs, as Sonoff TRVZB, this type is recommended if you have such devices.
+Since version 6.8, this VTherm type can also regulate directly by controlling the valve. Ideal for controllable TRVs, this type is recommended if you have such devices.
 
 The underlying entities for this VTherm type are exclusively `climate`.
 

documentation/en/feature-auto-start-stop.md

@@ -33,8 +33,6 @@ Once the function is configured, you will now have a new `switch` type entity th
 
 Check the box to allow auto-start and auto-stop, and leave it unchecked to disable the feature.
 
-Note: The auto-start/stop function will only turn a _VTherm_ back on if it was turned off by this function. This prevents unwanted or unexpected activations. Naturally, the off state is preserved even after a Home Assistant restart.
-
 > ![Tip](images/tips.png) _*Notes*_
 > 1. The detection algorithm is described [here](algorithms.md#auto-startstop-algorithm).
 > 2. Some appliances (boilers, underfloor heating, _PAC_, etc.) may not like being started/stopped too frequently. If that's the case, it might be better to disable the function when you know the appliance will be used. For example, I disable this feature during the day when presence is detected because I know my _PAC_ will turn on often. I enable auto-start/stop at night or when no one is home, as the setpoint is lowered and it rarely triggers.

documentation/en/feature-power.md

@@ -1,51 +1,46 @@
 # Power Management - Load Shedding
 
 - [Power Management - Load Shedding](#power-management---load-shedding)
-    - [Example Use Case:](#example-use-case)
-  - [Configuring Power Management](#configuring-power-management)
+  - [Configure Power Management](#configure-power-management)
 
-This feature allows you to regulate the electrical consumption of your heaters. Known as load shedding, it lets you limit the electrical consumption of your heating equipment if overconsumption conditions are detected.
-You will need a **sensor for the total instantaneous power consumption** of your home and a **sensor for the maximum allowed power**.
+This feature allows you to regulate the electricity consumption of your heaters. Known as load shedding, this feature enables you to limit the electrical consumption of your heating device if overcapacity conditions are detected.
+You will need a **sensor for the total instantaneous power consumption** of your home, as well as a **sensor for the maximum allowed power**.
 
-The behavior of this feature is as follows:
-1. When a new measurement of the home's power consumption or the maximum allowed power is received,
-2. If the maximum power is exceeded, the central command will shed the load of all active devices starting with those closest to the setpoint. This continues until enough _VTherms_ are shed,
-3. If there is available power reserve and some _VTherms_ are shed, the central command will re-enable as many devices as possible, starting with those furthest from the setpoint (at the time they were shed).
-4. When a _VTherm_ starts, a check is performed to determine if the declared power is available. If not, the _VTherm_ is put into shed mode.
+The behavior of this feature is basic:
+1. when the _VTherm_ is about to turn on a device,
+2. it compares the last known value of the power consumption sensor with the last value of the maximum allowed power. If there is a remaining margin greater than or equal to the declared power of the _VTherm_'s devices, then the _VTherm_ and its devices will be turned on. Otherwise, they will remain off until the next cycle.
 
-**WARNING:** This is **not a safety feature** but an optimization function to manage consumption at the expense of some heating degradation. Overconsumption is still possible depending on the frequency of your consumption sensor updates and the actual power used by your equipment. Always maintain a safety margin.
+WARNING: This very basic operation **is not a safety function** but more of an optimization feature to manage consumption at the cost of heating performance. Overloads may occur depending on the frequency of updates from your consumption sensors, and the actual power used by your devices. Therefore, you must always maintain a safety margin.
 
-### Example Use Case:
-1. You have an electric meter limited to 11 kW,
-2. You occasionally charge an electric vehicle at 5 kW,
-3. This leaves 6 kW for everything else, including heating,
-4. You have 1 kW of other active devices,
-5. You declare a sensor (`input_number`) for the maximum allowed power at 9 kW (= 11 kW - reserved power for other devices - safety margin).
+Typical use case:
+1. you have an electricity meter limited to 11 kW,
+2. you occasionally charge an electric vehicle at 5 kW,
+3. that leaves 6 kW for everything else, including heating,
+4. you have 1 kW of other equipment running,
+5. you have declared a sensor (`input_number`) for the maximum allowed power at 9 kW (= 11 kW - the reserve for other devices - margin)
 
-If the vehicle is charging, the total consumed power is 6 kW (5 + 1), and a _VTherm_ will only turn on if its declared power is a maximum of 3 kW (9 kW - 6 kW).
-If the vehicle is charging and another _VTherm_ of 2 kW is on, the total consumed power is 8 kW (5 + 1 + 2), and a _VTherm_ will only turn on if its declared power is a maximum of 1 kW (9 kW - 8 kW). Otherwise, it will skip its turn (cycle).
-If the vehicle is not charging, the total consumed power is 1 kW, and a _VTherm_ will only turn on if its declared power is a maximum of 8 kW (9 kW - 1 kW).
+If the vehicle is charging, the total power consumed is 6 kW (5+1), and a _VTherm_ will only turn on if its declared power is 3 kW max (9 kW - 6 kW).
+If the vehicle is charging and another _VTherm_ of 2 kW is running, the total power consumed is 8 kW (5+1+2), and a _VTherm_ will only turn on if its declared power is 1 kW max (9 kW - 8 kW). Otherwise, it will wait until the next cycle.
 
-## Configuring Power Management
+If the vehicle is not charging, the total power consumed is 1 kW, and a _VTherm_ will only turn on if its declared power is 8 kW max (9 kW - 1 kW).
 
-In the centralized configuration, if you have selected the `With power detection` feature, configure it as follows:
+## Configure Power Management
+
+If you have chosen the `With power detection` feature, configure it as follows:
 
 ![image](images/config-power.png)
 
-1. The entity ID of the **sensor for total instantaneous power consumption** of your home,
-2. The entity ID of the **sensor for maximum allowed power**,
-3. The temperature to apply if load shedding is activated.
+1. the entity ID of the **instantaneous power consumption sensor** for your home,
+2. the entity ID of the **maximum allowed power sensor**,
+3. the temperature to apply if load shedding is activated.
 
-Ensure that all power values use the same units (e.g., kW or W).
-Having a **sensor for maximum allowed power** allows you to modify the maximum power dynamically using a scheduler or automation.
-
-Note that due to centralized load-shedding, it is not possible to override the consumption and maximum consumption sensors on individual _VTherms_. This configuration must be done in the centralized settings. See [Centralized Configuration](./creation.md#centralized-configuration).
+Note that all power values must have the same units (kW or W, for example).
+Having a **maximum allowed power sensor** allows you to adjust the maximum power over time using a scheduler or automation.
 
 > ![Tip](images/tips.png) _*Notes*_
 >
-> 1. During load shedding, the heater is set to the preset named `power`. This is a hidden preset that cannot be manually selected.
-> 2. Always maintain a margin, as the maximum power can briefly be exceeded while waiting for the next cycle's calculation or due to uncontrolled devices.
-> 3. If you do not wish to use this feature, uncheck it in the 'Features' menu.
-> 4. If a single _VTherm_ controls multiple devices, the **declared heating power consumption** should correspond to the total power of all devices.
-> 5. If you use the Versatile Thermostat UI card (see [here](additions.md#better-with-the-versatile-thermostat-ui-card)), load shedding is represented as follows: ![load shedding](images/power-exceeded-icon.png).
-> 6. There may be a delay of up to 20 seconds between receiving a new value from the power consumption sensor and triggering load shedding for _VTherms_. This delay prevents overloading Home Assistant if your consumption updates are very frequent.
+> 1. In case of load shedding, the radiator is set to the preset named `power`. This is a hidden preset, and you cannot select it manually.
+> 2. Always keep a margin, as the maximum power may briefly be exceeded while waiting for the next cycle calculation, or due to unregulated equipment.
+> 3. If you don't want to use this feature, uncheck it in the 'Functions' menu.
+> 4. If a _VTherm_ controls multiple devices, the **electrical consumption of your heating** must match the sum of the powers.
+> 5. If you are using the Versatile Thermostat UI card (see [here](additions.md#much-better-with-the-versatile-thermostat-ui-card)), load shedding is represented as follows: ![load shedding](images/power-exceeded-icon.png).

documentation/en/feature-presets.md

@@ -5,7 +5,7 @@
 
 ## Configure Pre-configured Temperatures
 
-The preset mode allows you to pre-configure the target temperature. Used in conjunction with Scheduler (see [scheduler](additions.md#the-scheduler-component)), you'll have a powerful and simple way to optimize the temperature relative to the electricity consumption in your home. The managed presets are as follows:
+The preset mode allows you to pre-configure the target temperature. Used in conjunction with Scheduler (see [scheduler](additions#the-scheduler-component)), you'll have a powerful and simple way to optimize the temperature relative to the electricity consumption in your home. The managed presets are as follows:
  - **Eco**: the device is in energy-saving mode
  - **Comfort**: the device is in comfort mode
  - **Boost**: the device fully opens all valves

documentation/en/over-climate.md

@@ -25,8 +25,7 @@ The installation should look like this:
 
 ## Configuration
 
-First, configure the main settings common to all _VTherms_ (see [main settings](base-attributes.md)).
-Then, click on the "Underlying Entities" option from the menu, and you will see this configuration page:
+Click on the "Underlying Entities" option from the menu, and you will see this configuration page:
 
 ![image](images/config-linked-entity2.png)
 
@@ -60,8 +59,6 @@ Of course, your underlying equipment must have ventilation, and it must be contr
 
 ### Compensating for the Internal Temperature of the Underlying Equipment
 
-Warning: This option must not be used with direct valve control regulation if a calibration entity has been provided.
-
 Sometimes, the internal thermometer of the underlying equipment (TRV, air conditioner, etc.) is inaccurate to the point that self-regulation is insufficient. This happens when the internal thermometer is placed too close to the heat source. The internal temperature rises much faster than the room temperature, leading to regulation failures.
 Example:
 1. Room temperature is 18°, setpoint is 20°.
@@ -101,4 +98,4 @@ When this entity is 'On', all temperature or state changes made directly on the
 Be careful, if you use this feature, your equipment is now controlled in two ways: _VTherm_ and directly by you. The commands might be contradictory, which could lead to confusion about the equipment's state. _VTherm_ is equipped with a delay mechanism that prevents loops: the user gives a setpoint, which is captured by _VTherm_ and changes the setpoint, ... This delay may cause the change made directly on the equipment to be ignored if these changes are too close together in time.
 
 Some equipment (like Daikin, for example) changes state by itself. If the checkbox is checked, it may turn off the _VTherm_ when that's not what you intended.
-That's why it's better not to use it. It generates a lot of confusion and many support requests.
+That's why it's better not to use it. It generates a lot of confusion and many support requests.

documentation/en/over-switch.md

@@ -26,8 +26,7 @@ The installation should look like this:
 
 ## Configuration
 
-First, configure the main settings common to all _VTherms_ (see [main settings](base-attributes.md)).
-Then, click on the "Underlying Entities" option from the menu, and you will see this configuration page:
+Click on the "Underlying Entities" option from the menu, and you will see this configuration page:
 
 ![image](images/config-linked-entity.png)
 

documentation/en/over-valve.md

@@ -21,8 +21,7 @@ The installation should be similar to the `over_switch` VTherm setup, except tha
 
 ## Configuration
 
-First, configure the main settings common to all _VTherms_ (see [main settings](base-attributes.md)).
-Then, click on the "Underlying Entities" option from the menu, and you will see this configuration page, you should add the `number` entities that will be controlled by VTherm. Only `number` or `input_number` entities are accepted.
+Click on the "Underlying Entities" option from the menu, and you will see this configuration page, you should add the `number` entities that will be controlled by VTherm. Only `number` or `input_number` entities are accepted.
 
 ![image](images/config-linked-entity3.png)
 

documentation/en/presentation.md

@@ -40,5 +40,4 @@ Some TRV type thermostats are known to be incompatible with Versatile Thermostat
 5. TRVs like Aqara SRTS-A01 and MOES TV01-ZB, which lack the `hvac_action` state feedback to determine whether they are heating or not. Therefore, state feedback is inaccurate, but the rest seems functional.
 6. Airwell air conditioners with the "Midea AC LAN" integration. If two VTherm commands are too close together, the air conditioner stops itself.
 7. Climates based on the Overkiz integration do not work. It seems impossible to turn off or even change the temperature on these systems.
-8. Heating systems based on Netatmo perform poorly. Netatmo schedules conflict with _VTherm_ programming. Netatmo devices constantly revert to `Auto` mode, which is poorly managed with _VTherm_. In this mode, _VTherm_ cannot determine whether the system is heating or cooling, making it impossible to select the correct algorithm. Some users have managed to make it work using a virtual switch between _VTherm_ and the underlying system, but stability is not guaranteed. An example is provided in the [troubleshooting](troubleshooting.md) section.
 

documentation/en/releases.md

@@ -2,9 +2,6 @@
 
 ![New](images/new-icon.png)
 
-> * **Release 7.1**:
->   - Redesign of the load-shedding function (power management). Load-shedding is now handled centrally (previously, each _VTherm_ was autonomous). This allows for much more efficient management and prioritization of load-shedding on devices that are close to the setpoint. Note that you must have a centralized configuration with power management enabled for this to work. More info [here](./feature-power.md).
-
 > * **Release 6.8**:
 >   - Added a new regulation method for `over_climate` type Versatile Thermostats. This method, called 'Direct Valve Control', allows direct control of a TRV valve and possibly an offset to calibrate the internal thermometer of your TRV. This new method has been tested with Sonoff TRVZB and extended to other TRV types where the valve can be directly controlled via `number` entities. More information [here](over-climate.md#lauto-régulation) and [here](self-regulation.md#auto-régulation-par-contrôle-direct-de-la-vanne).
 

documentation/en/self-regulation.md

@@ -31,15 +31,13 @@ This allows you to configure the valve control entities:
 You need to provide:
 1. As many valve opening control entities as there are underlying devices, and in the same order. These parameters are mandatory.
 2. As many temperature calibration entities as there are underlying devices, and in the same order. These parameters are optional; they must either all be provided or none.
-3. As many valve closure control entities as there are underlying devices, and in the same order. These parameters are optional; they must either all be provided or none. For Sonoff TRVZB, you should not configure this entity. See the note below.
-4. A list of minimum opening values ​​for the valve when it needs to be opened. This field is a list of integers. If the valve needs to be opened, it will be opened at a minimum of this opening value, else it will be set to 0 (to ensure the valve is closed). This allows enough water to pass through when it needs to be opened.
+3. As many valve closure control entities as there are underlying devices, and in the same order. These parameters are optional; they must either all be provided or none.
+4. A list of minimum opening values ​​for the valve when it needs to be opened. This field is a list of integers. If the valve needs to be opened, it will be opened at a minimum of this opening value. This allows enough water to pass through when it needs to be opened.
 
 The opening rate calculation algorithm is based on the _TPI_ algorithm described [here](algorithms.md). This is the same algorithm used for _VTherms_ `over_switch` and `over_valve`.
 
 If a valve closure rate entity is configured, it will be set to 100 minus the opening rate to force the valve into a particular state.
 
-Note: for Sonoff TRVZB you should not configure the "closing degree" parameter. This leads to a bug in the TRV and the `hvac_action` is no more working.
-
 ### Other self-regulation
 
 In the second case, Versatile Thermostat calculates an offset based on the following information:
@@ -152,4 +150,4 @@ To apply the changes, you must either **restart Home Assistant completely** or j
 
 ## Summary of the Auto-Regulation Algorithm
 
-A summary of the auto-regulation algorithm is described [here](algorithms.md#the-auto-regulation-algorithm-without-valve-control)
+A summary of the auto-regulation algorithm is described [here](algorithms.md#the-auto-regulation-algorithm-without-valve-control)

documentation/en/troubleshooting.md

@@ -4,7 +4,6 @@
 - [Troubleshooting](#troubleshooting)
   - [Using a Heatzy](#using-a-heatzy)
   - [Using a radiator with a pilot wire (Nodon SIN-4-FP-21)](#using-a-radiator-with-a-pilot-wire-nodon-sin-4-fp-21)
-  - [Using a Netatmo System](#using-a-netatmo-system)
   - [Only the first radiator heats](#only-the-first-radiator-heats)
   - [The radiator heats even though the setpoint temperature is exceeded, or it does not heat when the room temperature is well below the setpoint](#the-radiator-heats-even-though-the-setpoint-temperature-is-exceeded-or-it-does-not-heat-when-the-room-temperature-is-well-below-the-setpoint)
     - [Type `over_switch` or `over_valve`](#type-over_switch-or-over_valve)
@@ -17,7 +16,6 @@
   - [Using a Group of People as a Presence Sensor](#using-a-group-of-people-as-a-presence-sensor)
   - [Enable Logs for the Versatile Thermostat](#enable-logs-for-the-versatile-thermostat)
   - [VTherm does not track setpoint changes made directly on the underlying device (`over_climate`)](#vtherm-does-not-track-setpoint-changes-made-directly-on-the-underlying-device-over_climate)
-  - [VTherm Automatically Switches to 'Cooling' or 'Heating' Mode](#vtherm-automatically-switches-to-cooling-or-heating-mode)
 
 
 ## Using a Heatzy
@@ -87,17 +85,6 @@ Example:
 
 Another more complex example is [here](https://github.com/jmcollin78/versatile_thermostat/discussions/431#discussioncomment-11393065)
 
-## Using a Netatmo System
-
-The system based on Netatmo TRVs does not work well with _VTherm_. You can find a discussion about the specific behavior of Netatmo systems (in French) here: [https://forum.hacf.fr/t/vannes-netatmo-et-vtherm/56063](https://forum.hacf.fr/t/vannes-netatmo-et-vtherm/56063).
-
-However, some users have successfully integrated _VTherm_ with Netatmo by incorporating a virtual switch between _VTherm_ and the Netatmo `climate` entity, as follows:
-
-```
-TODO
-```
-
-
 ## Only the first radiator heats
 
 In `over_switch` mode, if multiple radiators are configured for the same VTherm, the heating will be triggered sequentially to smooth out the consumption peaks as much as possible.
@@ -226,10 +213,4 @@ Be careful, in debug mode, Versatile Thermostat is very verbose and can quickly
 
 ## VTherm does not track setpoint changes made directly on the underlying device (`over_climate`)
 
-See the details of this feature [here](over-climate.md#track-underlying-temperature-changes).
-
-## VTherm Automatically Switches to 'Cooling' or 'Heating' Mode
-
-Some reversible heat pumps have modes that allow the heat pump to decide whether to heat or cool. These modes are labeled as 'Auto' or 'Heat_cool' depending on the brand. These two modes should not be used with _VTherm_ because _VTherm_'s algorithms require explicit knowledge of whether the system is in heating or cooling mode, which these modes do not provide.
-
-You should only use the following modes: `Heat`, `Cool`, `Off`, or optionally `Fan` (although `Fan` has no practical purpose with _VTherm_).
+See the details of this feature [here](over-climate.md#track-underlying-temperature-changes).

documentation/fr/additions.md

@@ -5,7 +5,6 @@
   - [Composant Scheduler !](#composant-scheduler-)
   - [Courbes de régulattion avec Plotly](#courbes-de-régulattion-avec-plotly)
   - [Les notification avec l'AappDaemon NOTIFIER](#les-notification-avec-laappdaemon-notifier)
-  - [Une très belle carte (merci @Jeffodilo)](#une-très-belle-carte-merci-jeffodilo)
 
 
 ## Versatile Thermostat UI Card
@@ -214,275 +213,4 @@ action:
 mode: queued
 max: 30
 ```
-</details>
-
-## Une très belle carte (merci @Jeffodilo)
-
-@Jeffodilo a réalisé et partagé le code d'une très belle carte adaptée au TRV :
-
-![carte Jeffodilo](images/card-trv-jeffodilo.png)
-
-Cette carte n’utilise pas card_mod, elle utilise les cartes custom assez courante suivantes
-On garde une partie de l’interface UI, sauf pour l’horizontale de la 2ème ligne
-- custom:vertical-stack-in-card
-- custom:stack-in-card
-- custom:mini-graph-card
-- custom:mushroom-template-card
-- custom:button-card
-
-L'original est ici (En Français): [forum HACF](https://forum.hacf.fr/t/carte-mise-en-forme-vanne-avec-thermostant-versatile/56132)
-
-Evidemment, vous devez l'adapter à votre code.
-
-Le code:
-
-<details>
-
-```yaml
-type: vertical-stack
-cards:
-  - type: heading
-    icon: mdi:bed-double
-    heading: Parents
-    heading_style: title
-  - type: custom:vertical-stack-in-card
-    cards:
-      - type: custom:mini-graph-card
-        entities:
-          - entity: sensor.sonde_parents_temperature
-            name: Température
-            state_adaptive_color: true
-          - entity: climate.valve_parents
-            name: Temp
-            attribute: current_temperature
-            unit: °C
-            state_adaptive_color: true
-            show_graph: false
-            show_state: true
-        hour24: true
-        hours_to_show: 24
-        points_per_hour: 2
-        font_size: 50
-        show:
-          name: false
-          icon: false
-          legend: false
-          labels: true
-          extrema: false
-        color_thresholds:
-          - color: "#33ccff"
-            value: 19
-          - color: "#00ffff"
-            value: 19.5
-          - color: "#33ffcc"
-            value: 20
-          - color: "#00ff99"
-            value: 20.5
-          - color: "#ffff99"
-            value: 21
-          - color: "#ffff33"
-            value: 21.5
-          - color: "#ff9933"
-            value: 22
-          - color: "#cc6633"
-            value: 24
-          - color: "#ff6000"
-            value: 26
-      - type: custom:stack-in-card
-        mode: horizontal
-        cards:
-          - type: custom:mushroom-template-card
-            secondary: ""
-            layout: horizontal
-            tap_action:
-              action: more-info
-            entity: sensor.sonde_parents_temperature
-            fill_container: false
-            multiline_secondary: false
-            primary: >-
-              {% if is_state_attr('climate.versatile_parents','hvac_action',
-              'idle') %}
-               🗜️ {{ states('number.valve_parents_valve_opening_degree', with_unit=True,)}} |🔋{{ states('sensor.valve_parents_battery') }} % | Inactif
-              {% elif  is_state_attr('climate.versatile_parents','hvac_action',
-              'heating') %}
-               🗜️ {{ states('number.valve_parents_valve_opening_degree', with_unit=True,)}} |🔋{{ states('sensor.valve_parents_battery') }} % | Chauffe
-              {% else %} 🗜️ {{
-              states('number.valve_parents_valve_opening_degree',
-              with_unit=True,)}} | 🔋{{ states('sensor.valve_parents_battery')
-              }} % | Off {% endif %}
-            icon: ""
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                name: Conf.
-                entity: climate.versatile_parents
-                show_state: false
-                show_icon: true
-                show_name: false
-                icon: mdi:fire
-                size: 80%
-                styles:
-                  icon:
-                    - color: |
-                        [[[
-                          if (states['climate.versatile_parents']) {
-                          if (states['climate.versatile_parents'].attributes.preset_mode == 'comfort')
-                            return 'darkorange';
-                          else
-                            return 'white'; }
-                        ]]]
-                  name:
-                    - color: white
-                    - font-size: 60%
-                  card:
-                    - height: 40px
-                    - width: 30px
-                tap_action:
-                  action: perform-action
-                  perform_action: climate.set_preset_mode
-                  target:
-                    entity_id:
-                      - climate.versatile_parents
-                  data:
-                    preset_mode: comfort
-              - type: custom:button-card
-                name: Eco
-                entity: climate.versatile_parents
-                show_state: false
-                show_icon: true
-                show_name: false
-                icon: mdi:leaf
-                size: 80%
-                styles:
-                  icon:
-                    - color: |
-                        [[[
-                          if (states['climate.versatile_parents']) {
-                          if (states['climate.versatile_parents'].attributes.preset_mode == 'eco')
-                            return 'lightgreen';
-                          else
-                            return 'white'; }
-                        ]]]
-                  name:
-                    - color: white
-                    - font-size: 60%
-                  card:
-                    - height: 40px
-                    - width: 30px
-                tap_action:
-                  action: perform-action
-                  perform_action: climate.set_preset_mode
-                  target:
-                    entity_id:
-                      - climate.versatile_parents
-                  data:
-                    preset_mode: eco
-              - type: custom:button-card
-                name: Manu
-                entity: climate.versatile_parents
-                show_state: false
-                show_icon: true
-                show_name: false
-                icon: mdi:hand-back-left
-                size: 80%
-                styles:
-                  icon:
-                    - color: |
-                        [[[
-                          if (states['climate.versatile_parents']) {
-                          if (states['climate.versatile_parents'].attributes.preset_mode == 'none')
-                            return 'indianred';
-                          else
-                            return 'white'; }
-                        ]]]
-                  name:
-                    - color: white
-                    - font-size: 60%
-                  card:
-                    - height: 40px
-                    - width: 30px
-                tap_action:
-                  action: perform-action
-                  perform_action: climate.set_preset_mode
-                  target:
-                    entity_id:
-                      - climate.versatile_parents
-                  data:
-                    preset_mode: none
-              - type: custom:button-card
-                name: Abs.
-                entity: climate.versatile_parents
-                show_state: false
-                show_icon: true
-                show_name: false
-                icon: mdi:snowflake
-                size: 80%
-                styles:
-                  icon:
-                    - color: |
-                        [[[
-                          if (states['climate.versatile_parents']) {
-                          if (states['climate.versatile_parents'].attributes.preset_mode == 'frost')
-                            return 'skyblue';
-                          else
-                            return 'white'; }
-                        ]]]
-                  name:
-                    - color: white
-                    - font-size: 60%
-                  card:
-                    - height: 40px
-                    - width: 30px
-                tap_action:
-                  action: perform-action
-                  perform_action: climate.set_preset_mode
-                  target:
-                    entity_id:
-                      - climate.versatile_parents
-                  data:
-                    preset_mode: frost
-              - type: custom:button-card
-                name: Boost
-                entity: climate.versatile_parents
-                show_state: false
-                show_icon: true
-                show_name: false
-                icon: mdi:rocket-launch
-                size: 80%
-                styles:
-                  icon:
-                    - color: |
-                        [[[
-                          if (states['climate.versatile_parents']) {
-                          if (states['climate.versatile_parents'].attributes.preset_mode == 'boost')
-                            return 'red';
-                          else
-                            return 'white'; }
-                        ]]]
-                  name:
-                    - color: white
-                    - font-size: 60%
-                  card:
-                    - height: 40px
-                    - width: 30px
-                tap_action:
-                  action: perform-action
-                  perform_action: climate.set_preset_mode
-                  target:
-                    entity_id:
-                      - climate.versatile_parents
-                  data:
-                    preset_mode: boost
-      - type: custom:mushroom-climate-card
-        entity: climate.versatile_parents
-        show_temperature_control: true
-        hvac_modes: []
-        tap_action:
-          action: more-info
-        primary_info: state
-        icon: mdi:radiator
-        secondary_info: last-updated
-        fill_container: false
-        layout: horizontal
-```
 </details>

documentation/fr/base-attributes.md

@@ -15,7 +15,7 @@ Donnez les principaux attributs obligatoires. Ces attributs sont communs à tous
    1. `over_switch` : VTherm allumera/éteindra le radiateur en modulant la proportion de temps allumé,
    2. `over_valve` : VTherm calculera une nouvelle ouverture de la vanne et lui enverra si elle a changée,
    3. `over_climate` : le cycle permet d'effectuer les contrôles de base et recalcule les coefficients de l'auto-régulation. Le cycle peut déboucher sur une nouvelle consigne envoyée au sous-jacents ou sur une modification d'ouverture de la vanne dans le cas d'un _TRV_ dont la vanne est commandable.
-7. une puissance de l'équipement ce qui va activer les capteurs de puissance et énergie consommée par l'appareil. Si plusieurs équipements sont reliés au même VTherm, il faut indiquer ici le total des puissances max des équipements. L'unité n'est pas importante. Ce qui est important c'est toutes les puissances de tous les _VTherms_ soient dans la même unité ainsi que les éventuels capteurs de puissance (cf. la fonction de délestage),
+7. une puissance de l'équipement ce qui va activer les capteurs de puissance et énergie consommée par l'appareil. Si plusieurs équipements sont reliés au même VTherm, il faut indiquer ici le total des puissances max des équipements,
 8.  la possibilité d'utiliser des paramètres complémentaires venant de la configuration centralisée :
     1.  capteur de température extérieure,
     2.  température minimale / maximale et pas de température

documentation/fr/creation.md

@@ -50,7 +50,7 @@ Les entités sous-jacentes sont donc des `switchs` ou des `input_boolean`.
 Lorsque votre équipement est contrôlé par une entité de type `climate` dans Home Assistant et que vous n'avez que ça à disposition, vous devez utiliser ce type de VTherm. Dans ce cas, le VTherm va simplement commander la température de consigne du `climate` sous-jacent.
 Ce type est aussi équipé de fonction d' auto-régulations avancées permettant de moduler la consigne donnée aux sous-jacent pour atteindre plus vite la consigne et de s'affranchir de la régulation interne de ces équipements qui est parfois mauvaise. C'est le cas, si le thermomètre interne de l'équipement est trop proche du corps de chauffe. L'équipement peut croire qu'il fait chaud alors qu'au bout de la pièce, la consigne n'est pas du tout atteinte.
 
-Depuis la version 6.8, ce type de VTherm permet aussi de réguler avec une action directe sur la vanne. Idéal pour les _TRV_ pour lesquels la vanne est commandable, comme les Sonoff TRVZB, ce type est recommandé si vous êtes équipés.
+Depuis la version 6.8, ce type de VTherm permet aussi de réguler avec une action directe sur la vanne. Idéal pour les _TRV_ pour lesquels la vanne est commandable, ce type est recommandé si vous êtes équipés.
 
 Les entités sous-jacentes de ce type de VTherm sont donc des `climate` exclusivement.
 

documentation/fr/feature-auto-start-stop.md

@@ -34,8 +34,6 @@ Une fois la fonction paramétrée, vous aurez maintenant une nouvelle entité de
 
 Cochez la pour autoriser le démarrage et extinction automatique et laissez là décocher si vous voulez désactiver la fonction auto-start/stop.
 
-A noter : la fonction auto-start/stop ne rallumera un _VTherm_ que si celui-ci a été éteint par cette fonction. Ca évite des allumages intempestifs non désirés. Evidement l'état d'extinction est résistant à un redémarrage de Home Assistant.
-
 
 > ![Astuce](images/tips.png) _*Notes*_
 > 1. L'algorithme de détection est décrit [ici](algorithms.md#lalgorithme-de-la-fonction-dauto-startstop).

documentation/fr/feature-power.md

@@ -6,13 +6,11 @@
 Cette fonction vous permet de réguler la consommation électrique de vos radiateurs. Connue sous le nom de délestage, cette fonction vous permet de limiter la consommation électrique de votre appareil de chauffage si des conditions de surpuissance sont détectées.
 Vous aurez besoin d'un **capteur de la puissance totale instantanée consommée** de votre logement ainsi que d'un **capteur donnant la puissance maximale autorisée**.
 
-Le comportement de cette fonction est le suivant :
-1. lorsqu'une nouvelle mesure de la puissance consommée du logement ou de la puissance maximale autorisée est reçue,
-2. si la puissance max est dépassée, la commande centrale va mettre en délestage tous les équipements actifs en commençant par ceux qui sont le plus près de la consigne. Il fait ça jusqu'à ce que suffisament de _VTherm_ soient délestés,
-3. si une réserve de puissance est disponible et que des _VTherms_ sont délestés, alors la commande centrale va délester autant d'équipements que possible en commençant par les plus loin de la consigne (au moment où il a été mis en délestage),
-4. au démarrage d'un _VTherm_, une vérification est effectuée pour savoir si la puissance déclarée est disponible. Si non, le _VTherm_ est passé en délestage.
+Le comportement de cette fonction est basique :
+1. lorsque le _VTherm_ va allumer un équipement,
+2. il compare la dernière valeur connue du capteur de puissance consommée avec la dernière valeur de la puissance maximale autorisée. Si il reste une marge supérieure égale à la puissance déclarée des équipements du _VTherm_ alors le VTherm et ses équipements seront allumés. Sinon ils resteront éteints jusqu'au prochain cycle.
 
-ATTENTION: ce fonctionnement **n'est pas une fonction de sécurité** mais plus une fonction permettant une optimisation de la consommation au prix d'une dégradation du chauffage. Des dépassements sont possibles selon la fréquence de remontée de vos capteurs de consommation, la puissance réellement utilisée par votre équipements. Vous devez donc toujours garder une marge de sécurité.
+ATTENTION: ce fonctionnement très basique **n'est pas une fonction de sécurité** mais plus une fonction permettant une optimisation de la consommation au prix d'une dégradation du chauffage. Des dépassements sont possibles selon la fréquence de remontée de vos capteurs de consommation, la puissance réellement utilisée par votre équipements. Vous devez donc toujours garder une marge de sécurité.
 
 Cas d'usage type:
 1. vous avez un compteur électrique limité à 11 kW,
@@ -28,7 +26,7 @@ Si le vehicle n'est pas en charge, la puissance totale consommé est de 1 kW, un
 
 ## Configurer la gestion de la puissance
 
-Dans la configuration centralisée, si vous avez choisi la fonctionnalité `Avec détection de la puissance`, vous la configurez de la façon suivante :
+Si vous avez choisi la fonctionnalité `Avec détection de la puissance`, vous la configurez de la façon suivante :
 
 ![image](images/config-power.png)
 
@@ -39,13 +37,10 @@ Dans la configuration centralisée, si vous avez choisi la fonctionnalité `Avec
 Notez que toutes les valeurs de puissance doivent avoir les mêmes unités (kW ou W par exemple).
 Le fait d'avoir un **capteur de puissance maximale autorisée**, vous permet de modifier la puissance maximale au fil du temps à l'aide d'un planificateur ou d'une automatisation.
 
-A noter, dû à la centralisation du délestage, il n'est pas possible de sur-charger les capteurs de consommation et de consommation maximale sur les _VTherms_. Cette configuration se fait forcément dans la configuration centralisée. Cf. [Configuration centralisée](./creation.md#configuration-centralisée)
-
 > ![Astuce](images/tips.png) _*Notes*_
 >
 > 1. En cas de délestage, le radiateur est réglé sur le préréglage nommé `power`. Il s'agit d'un préréglage caché, vous ne pouvez pas le sélectionner manuellement.
 > 2. Gardez toujours une marge, car la puissance max peut être brièvement dépassée en attendant le calcul du prochain cycle typiquement ou par des équipements non régulés.
 > 3. Si vous ne souhaitez pas utiliser cette fonctionnalité, décochez la dans le menu 'Fonctions'.
 > 4. Si une _VTherm_ controlez plusieurs équipements, la **consommation électrique de votre chauffage** renseigné doit correspondre à la somme des puissances.
-> 5. Si vous utilisez la carte Verstatile Thermostat UI (cf. [ici](additions.md#bien-mieux-avec-le-versatile-thermostat-ui-card)), le délestage est représenté comme suit : ![délestage](images/power-exceeded-icon.png),
-> 6. Un délai pouvant aller jusqu'à 20 sec est possible entre la réception d'une nouvelle valeur du capteur de puissance consommée et la mise en délestage de _VTherm_. Ce délai évite de trop solliciter Home Assistant si vous avez des remontées rapides de votre puissance consommée.
+> 5. Si vous utilisez la carte Verstatile Thermostat UI (cf. [ici](additions.md#bien-mieux-avec-le-versatile-thermostat-ui-card)), le délestage est représenté comme suit : ![délestage](images/power-exceeded-icon.png).

documentation/fr/feature-presets.md

@@ -6,7 +6,7 @@
 
 ## Configurer les températures préréglées
 
-Le mode préréglé (preset) vous permet de préconfigurer la température ciblée. Utilisé en conjonction avec Scheduler (voir [scheduler](additions.md#composant-scheduler-)) vous aurez un moyen puissant et simple d'optimiser la température par rapport à la consommation électrique de votre maison. Les préréglages gérés sont les suivants :
+Le mode préréglé (preset) vous permet de préconfigurer la température ciblée. Utilisé en conjonction avec Scheduler (voir [scheduler](additions#composant-scheduler-)) vous aurez un moyen puissant et simple d'optimiser la température par rapport à la consommation électrique de votre maison. Les préréglages gérés sont les suivants :
  - **Eco** : l'appareil est en mode d'économie d'énergie
  - **Confort** : l'appareil est en mode confort
  - **Boost** : l'appareil tourne toutes les vannes à fond

documentation/fr/over-climate.md

@@ -26,8 +26,7 @@ L'installation doit ressembler à ça :
 
 ## Configuration
 
-Configurez d'abord les paramètres principaux et communs à tous les _VTherm_ (cf. [paramètres principaux](base-attributes.md)).
-Cliquez ensuite sur l'option de menu "Sous-jacents" et vous allez avoir cette page de configuration :
+Cliquer sur l'option de menu "Sous-jacents" et vous allez avoir cette page de configuration :
 
 ![image](images/config-linked-entity2.png)
 
@@ -40,7 +39,7 @@ Il est possible de choisir un thermostat `over_climate` qui commande une climati
 
 ### L'auto-régulation
 
-En mode `over_climate`, le device utilise son propre algorithme de régulation : il s'allume / s'éteint et se met en pause tout seul en fonction de la consigne transmise par le VTherm à travers son entité `climate`. Il utilise pour ça son thermomètre interne et la consigne reçue.
+En mode `over_cliamte`, le device utilise son propre algorithme de régulation : il s'allume / s'éteint et se met en pause tout seul en fonction de la consigne transmise par le VTherm à travers son entité `climate`. Il utilise pour ça son thermomètre interne et la consigne reçue.
 
 Selon l'équipement cette régulation interne peut être plus ou moins bonne. Ca dépend beaucoup de la qualité de l'équipement, du fonctionnement de son thermomètre interne et de son algorithme interne. Pour améliorer les équipements qui régule mal, VTherm propose de tricher un peu sur la consigne qui lui est envoyée en augmentant ou diminuant celle-ci en fonction cette fois de la température de la pièce mesurée par VTherm et non plus de la température interne.
 
@@ -63,8 +62,6 @@ Une fois l'écart de température redevenu faible, la ventilation se mettra dans
 
 ### Compenser la température interne du sous-jacent
 
-Attention : cette option ne doit pas être utilisée avec une régulation par contrôle direct de la vanne si une entité de calibrage a été fournie.
-
 Quelque fois, il arrive que le thermomètre interne du sous-jacent (TRV, climatisation, ...) soit tellement faux que l' auto-régulation ne suffise pas à réguler.
 Cela arrive lorsque le thermomètre interne est trop près de la source de chaleur. La température interne monte alors beaucoup plus vite que la température de la pièce, ce qui génère des défauts dans la régulation.
 Exemple :
@@ -105,4 +102,4 @@ Lorsque cette entité est 'On', tous les changements de température ou d'état
 Attention, si vous utilisez cette fonction, votre équipement est maintenant contrôlé par 2 moyens : _VTherm_ et par vous même directement. Les ordres peuvent être contradictoires et cela peut induire une incompréhension sur l'état de l'équipement. _VTherm_ est équipé d'un mécanisme de temporisation qui évite les boucles : l'utilisateur donne une consigne qui est captée par _VTherm_ qui change la consigne, ... Cette temporisation peut faire que le changement fait directement sur l'équipement est ignoré si ces changements sont trop rapprochés dans le temps.
 
 Certains équipements (Daikin par exemple), changent d'état tout seul. Si la case est cochée, cela peut éteindre le _VTherm_ alors que ce n'est pas ce que vous souhaitiez.
-C'est pour ça qu'il est préférable de ne pas l'utiliser. Cela génère beaucoup d'incompréhensions et de nombreuses demandes de support.
+C'est pour ça qu'il est préférable de ne pas l'utiliser. Cela génère beaucoup d'incompréhensions et de nombreuses demandes de support.

documentation/fr/over-switch.md

@@ -7,7 +7,6 @@
     - [Le keep-alive](#le-keep-alive)
     - [Le mode AC](#le-mode-ac)
     - [L'inversion de la commande](#linversion-de-la-commande)
-    - [La personnalisation des commandes](#la-personnalisation-des-commandes)
 
 ## Pré-requis
 
@@ -18,23 +17,20 @@ L'installation doit ressembler à ça :
 1. L'utilisateur ou une automatisation ou le Sheduler programme une consigne (setpoint) par le biais d'un pre-réglage ou directement d'une température,
 2. régulièrement le thermomètre intérieur (2) ou extérieur (2b) envoie la température mesurée. Le thermomètre interieur doit être placé à une place pertinente pour le ressenti de l'utilisateur : idéalement au milieu du lieu de vie. Evitez de le mettre trop près d'une fenêtre ou trop proche du radiateur,
 3. avec les valeurs de consigne, les différentes températures et des paramètres de l'algorithme TPI (cf. [TPI](algorithms.md#lalgorithme-tpi)), VTherm va calculer un pourcentage de temps d'allumage,
-4. et va régulièrement commander l'allumage et l'extinction du ou des entités `switch` (ou `select` ou `climate`) sous-jacentes,
-5. ces entités sous-jacentes vont alors commander l'équipement physique
+4. et va régulièrement commander l'allumage et l'extinction du ou des entités `switch` sous-jacentes,
+5. ces entités switchs sous-jacentes vont alors commander le switch physique
 6. la commande du switch physique allumera ou éteindra le radiateur.
 
 > Le pourcentage d'allumage est recalculé à chaque cycle et c'est ce qui permet de réguler la température de la pièce.
 
 ## Configuration
 
-Configurez d'abord les paramètres principaux et communs à tous les _VTherm_ (cf. [paramètres principaux](base-attributes.md)).
-Ensuite cliquez sur l'option de menu "Sous-jacents" et vous allez avoir cette page de configuration :
+Cliquer sur l'option de menu "Sous-jacents" et vous allez avoir cette page de configuration :
 
 ![image](images/config-linked-entity.png)
 
 ### les sous-jacents
-Dans la "liste des équipements à contrôler" vous mettez les switchs qui vont être controllés par le VTherm. Seuls les entités de type `switch` ou `input_boolean` ou `select` ou `input_select` ou `climate` sont acceptées.
-
-Si un des sous-jacents n'est pas un `switch` alors la personnalisation des commandes est obligatoires. Par défaut pour les `switch` les commandes sont les commandes classique d'allumage / extinction du switch (`turn_on`, `turn_off`)
+Dans la "liste des équipements à contrôler" vous mettez les switchs qui vont être controllés par le VTherm. Seuls les entités de type `switch` ou `input_boolean` sont acceptées.
 
 L'algorithme à utiliser est aujourd'hui limité à TPI est disponible. Voir [algorithme](#algorithme).
 Si plusieurs entités de type sont configurées, la thermostat décale les activations afin de minimiser le nombre de switch actif à un instant t. Ca permet une meilleure répartition de la puissance puisque chaque radiateur va s'allumer à son tour.
@@ -57,37 +53,3 @@ Il est possible de choisir un thermostat over switch qui commande une climatisat
 
 Si votre équipement est commandé par un fil pilote avec un diode, vous aurez certainement besoin de cocher la case "Inverser la case". Elle permet de mettre le switch à `On` lorsqu'on doit étiendre l'équipement et à `Off` lorsqu'on doit l'allumer. Les temps de cycle sont donc inversés avec cette option.
 
-### La personnalisation des commandes
-
-Cette section de configuration permet de personnaliser les commandes d'allumage et d'extinction envoyée à l'équipement sous-jacent,
-Ces commandes sont obligatoires si un des sous-jacents n'est pas un `switch` (pour les `switchs` les commandes d'allumage/extinction classiques sont utilisées).
-
-Pour personnaliser les commande, cliquez sur `Ajouter` en bas de page sur les commandes d'allumage et sur les commandes d'extinction :
-
-![virtual switch](images/config-vswitch1.png)
-
-et donner la commande d'allumage et d'exinction avec le format `commande[/attribut[:valeur]]`.
-Les commandes possibles dépendent du type de sous-jacents :
-
-| type de sous-jacent         | commandes d'allumage possibles        | commandes d'extinction possibles    | S'applique à                   |
-| --------------------------- | ------------------------------------- | ----------------------------------- | ------------------------------ |
-| `switch` ou `input_boolean` | `turn_on`                             | `turn_off`                          | tous les switchs               |
-| `select` ou `input_select`  | `select_option/option:comfort`        | `set_option/option:frost`           | Nodon SIN-4-FP-21 et assimilés |
-| `climate` (hvac_mode)       | `set_hvac_mode/hvac_mode:heat`        | `set_hvac_mode/hvac_mode:off`       | eCosy (via Tuya Local)         |
-| `climate` (preset)          | `set_preset_mode/preset_mode:comfort` | `set_preset_mode/preset_mode:frost` | Heatzy                         |
-
-Evidemment, tous ces exemples peuvent être adaptés à votre cas.
-
-Exemple pour un Nodon SIN-4-FP-21 :
-![virtual switch Nodon](images/config-vswitch2.png)
-
-Cliquez sur valider pour accepter les modifications.
-
-Si l'erreur suivante se produit :
-
-> La configuration de la personnalisation des commandes est incorrecte. Elle est obligatoire pour les sous-jacents non switch et le format doit être 'service_name[/attribut:valeur]'. Plus d'informations dans le README.
-
-Cela signifie que une des commandes saisies est invalide. Les règles à respecter sont les suivantes :
-1. chaque commande doit avoir le format `commande[/attribut[:valeur]]` (ex: `select_option/option:comfort` ou `turn_on`) sans blanc et sans caractères spéciaux sauf '_',
-2. il doit y avoir autant de commandes qu'il y a de sous-jacents déclarés sauf si tous les sous-jacents sont des `switchs` auquel cas il n'est pas nécessaire de paramétrer les commandes,
-3. si plusieurs sous-jacents sont configurés, les commandes doivent être dans le même ordre. Le nombre de commandes d'allumage doit être égal au nombre de commandes d'extinction et de sous-jacents (dans l'ordre donc). Il est possible de mettre des sous-jacents de type différent. À partir du moment où un sous-jacent n'est pas un `switch`, il faut paramétrer toutes les commandes de tous les sous-jacents y compris des éventuels switchs.

documentation/fr/over-valve.md

@@ -22,12 +22,11 @@ L'installation doit ressembler à celle pour le VTherm `over_switch` sauf que l'
 
 ## Configuration
 
-Configurez d'abord les paramètres principaux et communs à tous les _VTherm_ (cf. [paramètres principaux](base-attributes.md)).
-Ensuite cliquez sur l'option de menu "Sous-jacents" et vous allez avoir cette page de configuration. Vous mettez les entités `numnber` ou `input_number`qui vont être controllés par le VTherm :
+Cliquer sur l'option de menu "Sous-jacents" et vous allez avoir cette page de configuration. Vous mettez les entités `numnber` ou `input_number`qui vont être controllés par le VTherm :
 
 ![image](images/config-linked-entity3.png)
 
 L'algorithme à utiliser est aujourd'hui limité à TPI est disponible. Voir [algorithme](#algorithme).
 
-Il est possible de choisir un thermostat `over-valve` qui commande une climatisation en cochant la case "AC Mode". Dans ce cas, seul le mode refroidissement sera visible.
+Il est possible de choisir un thermostat over valve qui commande une climatisation en cochant la case "AC Mode". Dans ce cas, seul le mode refroidissement sera visible.
 

documentation/fr/presentation.md

@@ -5,8 +5,8 @@ Ce thermostat peut piloter 3 types d'équipements :
    2. une sonde de température pour la pièce (ou un input_number),
    3. un capteur de température externe (pensez à l'intégration météo si vous n'en avez pas)
 2. un autre thermostat qui a ses propres modes de fonctionnement (nommé ```thermostat_over_climate```). Pour ce type de thermostat la configuration minimale nécessite :
-   1. un équipement - comme une climatisation, une vanne thermostatique - qui est pilotée par sa propre entity de type ```climate```,
-3. un équipement qui peut prendre une valeur de 0 à 100% (nommée ```thermostat_over_valve```). A 0 le chauffage est coupé, 100% il est ouvert à fond. Ce type permet de piloter une vanne thermostatique (cf. TRV Shelly) qui expose une entité de type `number.` permetttant de piloter directement l'ouverture de la vanne. Versatile Thermostat régule la température de la pièce en jouant sur le pourcentage d'ouverture, à l'aide des capteurs de température intérieur et extérieur en utilisant l'algorithme TPI décrit ci-dessous.
+   1. un équipement - comme une climatisation, une valve thermostatique - qui est pilotée par sa propre entity de type ```climate```,
+3. un équipement qui peut prendre une valeur de 0 à 100% (nommée ```thermostat_over_valve```). A 0 le chauffage est coupé, 100% il est ouvert à fond. Ce type permet de piloter une valve thermostatique (cf. valve Shelly) qui expose une entité de type `number.` permetttant de piloter directement l'ouverture de la vanne. Versatile Thermostat régule la température de la pièce en jouant sur le pourcentage d'ouverture, à l'aide des capteurs de température intérieur et extérieur en utilisant l'algorithme TPI décrit ci-dessous.
 
 Le type `over_climate` vous permet d'ajouter à votre équipement existant toutes les fonctionnalités apportées par VersatileThermostat. L'entité `climate` VersatileThermostat contrôlera votre entité climate sous-jacente, l'éteindra si les fenêtres sont ouvertes, la fera passer en mode Eco si personne n'est présent, etc. Voir [ici] (#pourquoi-un-nouveau-thermostat-implémentation). Pour ce type de thermostat, tous les cycles de chauffage sont contrôlés par l'entité climate sous-jacente et non par le thermostat polyvalent lui-même. Une fonction facultative d'auto-régulation permet au Versatile Thermostat d'ajuster la température donnée en consigne au sous-jacent afin d'atteindre la consigne.
 
@@ -18,7 +18,7 @@ Ce composant nommé __Versatile thermostat__ gère les cas d'utilisation suivant
 - Configuration via l'interface graphique d'intégration standard (à l'aide du flux Config Entry),
 - Utilisations complètes du **mode préréglages**,
 - Désactiver le mode préréglé lorsque la température est **définie manuellement** sur un thermostat,
-- Éteindre/allumer un thermostat ou changer de preset lorsqu'une **porte ou des fenêtres sont ouvertes/fermées** après un certain délai,
+- Éteindre/allumer un thermostat ou chager de preset lorsqu'une **porte ou des fenêtres sont ouvertes/fermées** après un certain délai,
 - Changer de preset lorsqu'une **activité est détectée** ou non dans une pièce pendant un temps défini,
 - Utiliser un algorithme **TPI (Time Proportional Interval)** grâce à l'algorithme [[Argonaute](https://forum.hacf.fr/u/argonaute/summary)] ,
 - Ajouter une **gestion de délestage** ou une régulation pour ne pas dépasser une puissance totale définie. Lorsque la puissance maximale est dépassée, un préréglage caché de « puissance » est défini sur l'entité climatique. Lorsque la puissance passe en dessous du maximum, le préréglage précédent est restauré.
@@ -33,12 +33,11 @@ Toutes ces fonctions sont configurables de façon centralisée ou individuelle e
 
 ## Incompatibilités
 Certains thermostat de type TRV sont réputés incompatibles avec le Versatile Thermostat. C'est le cas des vannes suivantes :
-1. les vannes POPP de Danfoss avec retour de température. Il est impossible d'éteindre cette vanne et elle s'auto-régule d'elle-même causant des conflits avec le _VTherm_,
+1. les vannes POPP de Danfoss avec retour de température. Il est impossible d'éteindre cette vanne et elle s'auto-régule d'elle-même causant des conflits avec le VTherm,
 2. Les thermostats « Homematic » (et éventuellement Homematic IP) sont connus pour rencontrer des problèmes avec le Versatile Thermostat en raison des limitations du protocole RF sous-jacent. Ce problème se produit particulièrement lorsque vous essayez de contrôler plusieurs thermostats Homematic à la fois dans une seule instance de VTherm. Afin de réduire la charge du cycle de service, vous pouvez par ex. regroupez les thermostats avec des procédures spécifiques à Homematic (par exemple en utilisant un thermostat mural) et laissez Versatile Thermostat contrôler uniquement le thermostat mural directement. Une autre option consiste à contrôler un seul thermostat et à propager les changements de mode CVC et de température par un automatisme,
 3. les thermostats de type Heatzy qui ne supportent pas les commandes de type set_temperature
 4. les thermostats de type Rointe ont tendance a se réveiller tout seul. Le reste fonctionne normalement.
 5. les TRV de type Aqara SRTS-A01 et MOES TV01-ZB qui n'ont pas le retour d'état `hvac_action` permettant de savoir si elle chauffe ou pas. Donc les retours d'état sont faussés, le reste à l'air fonctionnel.
 6. La clim Airwell avec l'intégration "Midea AC LAN". Si 2 commandes de VTherm sont trop rapprochées, la clim s'arrête d'elle même.
 7. Les climates basés sur l'intégration Overkiz ne fonctionnent pas. Il parait impossible d'éteindre ni même de changer la température sur ces systèmes.
-8. Les systèmes de chauffage basés sur Netatmo fonctionnent mal. Les plannings Netatmo viennent en concurrence de la programmation _VTherm_. Les sous-jacents Netatmo repasse en mode `Auto` tout le temps et ce mode est très mal géré avec _VTherm_ qui ne peut pas savoir si le sysème chauffe ou refroidit et donc quel algorithme choisir. Certains ont quand même réussi à le faire fonctionner avec un switch virtuel entre le _VTherm_ et le sous-jacent mais sans garantie de stabilité. Un exemple est donné dans la section [dépannage](troubleshooting.md)
 

documentation/fr/releases.md

@@ -2,9 +2,6 @@
 
 ![Nouveau](images/new-icon.png)
 
-> * **Release 7.1**:
->   - Refonte de la fonction de délestage (gestion de la puissance). Le délestage est maintenant géré de façon centralisé (auparavent chaque _VTherm_ était autonome). Cela permet une gestion bien plus efficace et de prioriser le délestage sur les équipements qui sont proches de la consigne. Attention, vous devez impérativement avoir une configuration centralisée avec gestion de la puissance pour que cela fonctionne. Plus d'infos [ici](./feature-power.md)
-
 > * **Release 6.8**:
 >   - Ajout d'une nouvelle méthode de régulation pour les Versatile Thermostat de type `over_climate`. Cette méthode nommée 'Contrôle direct de la vanne' permet de contrôler directement la vanne d'un TRV et éventuellement un décalage pour calibrer le thermomètre interne de votre TRV. Cette nouvelle méthode a été testée avec des Sonoff TRVZB et généralisée pour d'autre type de TRV pour lesquels la vanne est directement commandable via des entités de type `number`. Plus d'informations [ici](over-climate.md#lauto-régulation) et [ici](self-regulation.md#auto-régulation-par-contrôle-direct-de-la-vanne).
 
@@ -27,7 +24,7 @@
 
 > * **Release 5.3** : Ajout d'une fonction de pilotage d'une chaudière centrale [#234](https://github.com/jmcollin78/versatile_thermostat/issues/234) - plus d'infos ici: [Le contrôle d'une chaudière centrale](#le-contrôle-dune-chaudière-centrale). Ajout de la possibilité de désactiver le mode sécurité pour le thermomètre extérieur [#343](https://github.com/jmcollin78/versatile_thermostat/issues/343)
 > * **Release 5.2** : Ajout d'un `central_mode` permettant de piloter tous les VTherms de façon centralisée [#158](https://github.com/jmcollin78/versatile_thermostat/issues/158).
-> * **Release 5.1** : Limitation des valeurs envoyées aux vannes et au température envoyées au climate sous-jacent.
+> * **Release 5.1** : Limitation des valeurs envoyées aux valves et au température envoyées au climate sous-jacent.
 > * **Release 5.0** : Ajout d'une configuration centrale permettant de mettre en commun les attributs qui peuvent l'être [#239](https://github.com/jmcollin78/versatile_thermostat/issues/239).
 > * **Release 4.3** : Ajout d'un mode auto-fan pour le type `over_climate` permettant d'activer la ventilation si l'écart de température est important [#223](https://github.com/jmcollin78/versatile_thermostat/issues/223).
 > * **Release 4.2** : Le calcul de la pente de la courbe de température se fait maintenant en °/heure et non plus en °/min [#242](https://github.com/jmcollin78/versatile_thermostat/issues/242). Correction de la détection automatique des ouvertures par l'ajout d'un lissage de la courbe de température .

documentation/fr/self-regulation.md

@@ -32,15 +32,13 @@ Elle permet de configurer les entités de contrôle de la vanne :
 Vous devez donner :
 1. autant d'entités de contrôle d'ouverture de la vanne qu'il y a de sous-jacents et dans le même odre. Ces paramètres sont obligatoires,
 2. autant d'entités de calibrage du décalage de température qu'il y a de sous-jacents et dans le même ordre. Ces paramètres sont facultatifs ; ils doivent être tous founis ou aucun,
-3. autant d'entités de de contrôile du taux de fermture qu'il y a de sous-jacents et dans le même ordre. Ces paramètres sont facultatifs ; ils doivent être tous founis ou aucun. Pour les Sonoff TRVZB, ils ne doivent pas être fournis,
-4. une liste de valeurs minimales d'ouverture de la vanne lorsqu'elle doit être ouverte. Ce champ est une liste d'entier. Si la vanne doit être ouverte, elle le sera au minimum avec cette valeur d'ouverture, sinon elle sera totalement close (0). Cela permet de laisser passer suffisamment d'eau lorsqu'elle doit être ouverte mais garde la fermeeture complète si il n'y a pas besoin de chauffer.
+3. autant d'entités de de contrôile du taux de fermture qu'il y a de sous-jacents et dans le même ordre. Ces paramètres sont facultatifs ; ils doivent être tous founis ou aucun,
+4. une liste de valeurs minimales d'ouverture de la vanne lorsqu'elle doit être ouverte. Ce champ est une liste d'entier. Si la vanne doit être ouverte, elle le sera au minimum avec cette valeur d'ouverture. Cela permet de laisser passer suffisamment d'eau lorsqu'elle doit être ouverte.
 
 L'algorithme de calcul du taux d'ouverture est basé sur le _TPI_ qui est décrit [ici](algorithms.md). C'est le même algorithme qui est utilisé pour les _VTherm_ `over_switch` et `over_valve`.
 
 Si une entité de type taux de fermeture de la vanne est configurée, il sera positionné avec la valeur 100 - taux d'ouverture pour forcer la vanne dans un état.
 
-Note: pour les Sonoff TRVZB, vous ne devez pas configurer les "closing degree". Cela rend inopérant le `hvac_action` qui est utilisé par _VTherm_ et qui indique que l'équipement est en chauffe.
-
 ### autres auto-régulation
 
 Dans ce deuxième cas, le Versatile Thermostat calcule un décalage basé sur les informations suivantes :
@@ -152,4 +150,4 @@ Pour que les modifications soient prises en compte, il faut soit **relancer tota
 
 ## Synthèse de l'algorithme d'auto-régulation
 
-Une synthèse de l'algorithme d'auto-régulation est décrite [ici](algorithms.md#lalgorithme-dauto-régulation-sans-contrôle-de-la-vanne)
+Une synthèse de l'algorithme d'auto-régulation est décrite [ici](algorithms.md#lalgorithme-dauto-régulation-sans-contrôle-de-la-vanne)

documentation/fr/troubleshooting.md

@@ -4,7 +4,6 @@
 - [Dépannages](#dépannages)
   - [Utilisation d'un Heatzy](#utilisation-dun-heatzy)
   - [Utilisation d'un radiateur avec un fil pilote (Nodon SIN-4-FP-21)](#utilisation-dun-radiateur-avec-un-fil-pilote-nodon-sin-4-fp-21)
-  - [Utilisation d'un système Netatmo](#utilisation-dun-système-netatmo)
   - [Seul le premier radiateur chauffe](#seul-le-premier-radiateur-chauffe)
   - [Le radiateur chauffe alors que la température de consigne est dépassée ou ne chauffe pas alors que la température de la pièce est bien en-dessous de la consigne](#le-radiateur-chauffe-alors-que-la-température-de-consigne-est-dépassée-ou-ne-chauffe-pas-alors-que-la-température-de-la-pièce-est-bien-en-dessous-de-la-consigne)
     - [Type `over_switch` ou `over_valve`](#type-over_switch-ou-over_valve)
@@ -85,15 +84,6 @@ Exemple :
 ```
 Un exemple plus complet est [ici](https://github.com/jmcollin78/versatile_thermostat/discussions/431#discussioncomment-11393065)
 
-## Utilisation d'un système Netatmo
-Le système à base de TRV Netatmo fonctionne mal avec _VTherm_. Vous avez ici une discussion sur le fonctionnement particulier des systèmes Netatmo (en Français) : https://forum.hacf.fr/t/vannes-netatmo-et-vtherm/56063
-Cependant certains ont réussi une intégration _VTerm_ Netatmo en intégrant un switch virtuel entre _VTherm_ et le `climate` Netatmo suivant :
-```
-TODO add virtual switch code
-```
-
-
-
 ## Seul le premier radiateur chauffe
 
 En mode `over_switch` si plusieurs radiateurs sont configurés pour un même VTherm, l'alllumage va se faire de façon séquentiel pour lisser au plus possible les pics de consommation.
@@ -220,9 +210,4 @@ Attention, en mode debug Versatile Thermostat est très verbeux et peut vite ral
 
 ## VTherm ne suit pas les changements de consigne faits directement depuis le sous-jacents (`over_climate`)
 
-Voir le détail de cette fonction [ici](over-climate.md#suivre-les-changements-de-température-du-sous-jacent).
-
-## VTherm passe tout seul en mode 'clim' ou en mode 'chauffage'
-
-Certaine _PAC_ réversibles ont des modes qui permettent de laisser le choix à la _PAC_ de chauffer ou de réfroidir. Ces modes sont 'Auto' or 'Heat_cool' selon les marques. Ces 2 modes ne doivent pas être utilisés avec _VTherm_ car les algorithmes de _VTherm_ ont besoin de savoir si ils sont en mode chauffe ou refroidissement ce que ne permettent pas ces modes.
-Vous devez donc utiliser uniquement les modes : `Heat`, `Cool`, `Off` ou `Fan` éventuellement (bien que fan n'a aucun sens avec _Vtherm)
+Voir le détail de cette fonction [ici](over-climate.md#suivre-les-changements-de-température-du-sous-jacent).

hacs.json

@@ -3,5 +3,5 @@
     "content_in_root": false,
     "render_readme": true,
     "hide_default_branch": false,
-    "homeassistant": "2025.1.2"
+    "homeassistant": "2024.12.4"
 }

requirements_dev.txt

@@ -1 +1 @@
-homeassistant==2025.1.2
+homeassistant==2024.12.3

tests/commons.py

@@ -59,6 +59,8 @@ from .const import (  # pylint: disable=unused-import
     MOCK_TH_OVER_CLIMATE_TYPE_AC_CONFIG,
     MOCK_TH_OVER_CLIMATE_TYPE_NOT_REGULATED_CONFIG,
     MOCK_TH_OVER_SWITCH_TPI_CONFIG,
+    MOCK_PRESETS_CONFIG,
+    MOCK_PRESETS_AC_CONFIG,
     MOCK_WINDOW_CONFIG,
     MOCK_MOTION_CONFIG,
     MOCK_POWER_CONFIG,
@@ -87,6 +89,7 @@ FULL_SWITCH_CONFIG = (
     | MOCK_TH_OVER_SWITCH_CENTRAL_MAIN_CONFIG
     | MOCK_TH_OVER_SWITCH_TYPE_CONFIG
     | MOCK_TH_OVER_SWITCH_TPI_CONFIG
+    | MOCK_PRESETS_CONFIG
     | MOCK_FULL_FEATURES
     | MOCK_WINDOW_CONFIG
     | MOCK_MOTION_CONFIG
@@ -101,6 +104,7 @@ FULL_SWITCH_AC_CONFIG = (
     | MOCK_TH_OVER_SWITCH_CENTRAL_MAIN_CONFIG
     | MOCK_TH_OVER_SWITCH_AC_TYPE_CONFIG
     | MOCK_TH_OVER_SWITCH_TPI_CONFIG
+    | MOCK_PRESETS_AC_CONFIG
     | MOCK_FULL_FEATURES
     | MOCK_WINDOW_CONFIG
     | MOCK_MOTION_CONFIG
@@ -110,7 +114,12 @@ FULL_SWITCH_AC_CONFIG = (
 )
 
 PARTIAL_CLIMATE_CONFIG = (
-    MOCK_TH_OVER_CLIMATE_USER_CONFIG | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG | MOCK_ADVANCED_CONFIG
+    MOCK_TH_OVER_CLIMATE_USER_CONFIG
+    | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG
+    | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG
+    | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG
+    | MOCK_PRESETS_CONFIG
+    | MOCK_ADVANCED_CONFIG
 )
 
 PARTIAL_CLIMATE_CONFIG_USE_DEVICE_TEMP = (
@@ -118,6 +127,7 @@ PARTIAL_CLIMATE_CONFIG_USE_DEVICE_TEMP = (
     | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG
     | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG
     | MOCK_TH_OVER_CLIMATE_TYPE_USE_DEVICE_TEMP_CONFIG
+    | MOCK_PRESETS_CONFIG
     | MOCK_ADVANCED_CONFIG
 )
 
@@ -126,17 +136,24 @@ PARTIAL_CLIMATE_NOT_REGULATED_CONFIG = (
     | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG
     | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG
     | MOCK_TH_OVER_CLIMATE_TYPE_NOT_REGULATED_CONFIG
+    | MOCK_PRESETS_CONFIG
     | MOCK_ADVANCED_CONFIG
 )
 
 PARTIAL_CLIMATE_AC_CONFIG = (
-    MOCK_TH_OVER_CLIMATE_USER_CONFIG | MOCK_TH_OVER_CLIMATE_TYPE_AC_CONFIG | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG | MOCK_ADVANCED_CONFIG
+    MOCK_TH_OVER_CLIMATE_USER_CONFIG
+    | MOCK_TH_OVER_CLIMATE_TYPE_AC_CONFIG
+    | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG
+    | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG
+    | MOCK_PRESETS_CONFIG
+    | MOCK_ADVANCED_CONFIG
 )
 
 FULL_4SWITCH_CONFIG = (
     MOCK_TH_OVER_4SWITCH_USER_CONFIG
     | MOCK_TH_OVER_4SWITCH_TYPE_CONFIG
     | MOCK_TH_OVER_SWITCH_TPI_CONFIG
+    | MOCK_PRESETS_CONFIG
     | MOCK_WINDOW_CONFIG
     | MOCK_MOTION_CONFIG
     | MOCK_POWER_CONFIG
@@ -168,7 +185,6 @@ FULL_CENTRAL_CONFIG = {
     "comfort_ac_away_temp": 0,
     "boost_ac_away_temp": 30.7,
     CONF_WINDOW_DELAY: 15,
-    CONF_WINDOW_OFF_DELAY: 30,
     CONF_WINDOW_AUTO_OPEN_THRESHOLD: 4,
     CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 1,
     CONF_WINDOW_AUTO_MAX_DURATION: 31,
@@ -735,7 +751,6 @@ async def send_power_change_event(entity: BaseThermostat, new_power, date, sleep
     )
     vtherm_api = VersatileThermostatAPI.get_vtherm_api()
     await vtherm_api.central_power_manager._power_sensor_changed(power_event)
-    await vtherm_api.central_power_manager._do_immediate_shedding()
     if sleep:
         await entity.hass.async_block_till_done()
 
@@ -763,7 +778,6 @@ async def send_max_power_change_event(
     )
     vtherm_api = VersatileThermostatAPI.get_vtherm_api()
     await vtherm_api.central_power_manager._max_power_sensor_changed(power_event)
-    await vtherm_api.central_power_manager._do_immediate_shedding()
     if sleep:
         await entity.hass.async_block_till_done()
 
@@ -1023,16 +1037,6 @@ default_temperatures_ac_away = {
     "boost_ac_away": 23.1,
 }
 
-default_temperatures_ac = {
-    "frost": 7.0,
-    "eco": 17.0,
-    "comfort": 19.0,
-    "boost": 21.0,
-    "eco_ac": 27.0,
-    "comfort_ac": 25.0,
-    "boost_ac": 23.0,
-}
-
 default_temperatures_away = {
     "frost": 7.0,
     "eco": 17.0,

tests/const.py

@@ -140,6 +140,25 @@ MOCK_TH_OVER_CLIMATE_TYPE_AC_CONFIG = {
     CONF_AUTO_REGULATION_PERIOD_MIN: 1,
 }
 
+# TODO remove this later
+MOCK_PRESETS_CONFIG = {
+    PRESET_FROST_PROTECTION + PRESET_TEMP_SUFFIX: 7,
+    PRESET_ECO + PRESET_TEMP_SUFFIX: 16,
+    PRESET_COMFORT + PRESET_TEMP_SUFFIX: 17,
+    PRESET_BOOST + PRESET_TEMP_SUFFIX: 18,
+}
+
+# TODO remove this later
+MOCK_PRESETS_AC_CONFIG = {
+    PRESET_FROST_PROTECTION + PRESET_TEMP_SUFFIX: 7,
+    PRESET_ECO + PRESET_TEMP_SUFFIX: 17,
+    PRESET_COMFORT + PRESET_TEMP_SUFFIX: 19,
+    PRESET_BOOST + PRESET_TEMP_SUFFIX: 20,
+    PRESET_ECO + PRESET_AC_SUFFIX + PRESET_TEMP_SUFFIX: 25,
+    PRESET_COMFORT + PRESET_AC_SUFFIX + PRESET_TEMP_SUFFIX: 23,
+    PRESET_BOOST + PRESET_AC_SUFFIX + PRESET_TEMP_SUFFIX: 21,
+}
+
 MOCK_WINDOW_CONFIG = {
     CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
     # Not used normally only for tests to avoid rewrite all tests
@@ -165,16 +184,12 @@ MOCK_MOTION_CONFIG = {
     CONF_NO_MOTION_PRESET: PRESET_ECO,
 }
 
-MOCK_CENTRAL_POWER_CONFIG = {
+MOCK_POWER_CONFIG = {
     CONF_POWER_SENSOR: "sensor.power_sensor",
     CONF_MAX_POWER_SENSOR: "sensor.power_max_sensor",
     CONF_PRESET_POWER: 10,
 }
 
-MOCK_POWER_CONFIG = {
-    CONF_PRESET_POWER: 10,
-}
-
 MOCK_PRESENCE_CONFIG = {
     CONF_PRESENCE_SENSOR: "person.presence_sensor",
 }

tests/test_binary_sensors.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import, unused-wildcard-import, unused-argument, line-too-long, protected-access
 
 """ Test the normal start of a Thermostat """
-from unittest.mock import patch, PropertyMock
+from unittest.mock import patch
 from datetime import timedelta, datetime
 
 from homeassistant.core import HomeAssistant
@@ -172,17 +172,16 @@ async def test_overpowering_binary_sensors(
     # Send power mesurement
     side_effects = SideEffects(
         {
-            "sensor.the_power_sensor": State("sensor.the_power_sensor", 150),
-            "sensor.the_max_power_sensor": State("sensor.the_max_power_sensor", 100),
+            "sensor.the_power_sensor": State("sensor.the_power_sensor", 100),
+            "sensor.the_max_power_sensor": State("sensor.the_max_power_sensor", 150),
         },
         State("unknown.entity_id", "unknown"),
     )
     # fmt:off
-    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
-        patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=True):
+    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()):
     # fmt: on
-        await send_power_change_event(entity, 150, now)
-        await send_max_power_change_event(entity, 100, now)
+        await send_power_change_event(entity, 100, now)
+        await send_max_power_change_event(entity, 150, now)
 
         assert entity.power_manager.is_overpowering_detected is True
         assert entity.power_manager.overpowering_state is STATE_ON
@@ -192,13 +191,13 @@ async def test_overpowering_binary_sensors(
         assert overpowering_binary_sensor.state == STATE_ON
 
     # set max power to a low value
-    side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 251))
+    side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 201))
     # fmt:off
     with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()):
     # fmt: on
         now = now + timedelta(seconds=30)
         VersatileThermostatAPI.get_vtherm_api()._set_now(now)
-        await send_max_power_change_event(entity, 251, now)
+        await send_max_power_change_event(entity, 201, now)
         assert entity.power_manager.is_overpowering_detected is False
         assert entity.power_manager.overpowering_state is STATE_OFF
         # Simulate the event reception

tests/test_bugs.py

@@ -348,7 +348,7 @@ async def test_bug_407(
         await entity.async_set_preset_mode(PRESET_COMFORT)
         assert entity.hvac_mode is HVACMode.HEAT
         assert entity.preset_mode is PRESET_COMFORT
-        assert entity.power_manager.overpowering_state is STATE_UNKNOWN
+        assert entity.power_manager.overpowering_state is STATE_OFF
         assert entity.target_temperature == 18
         # waits that the heater starts
         await hass.async_block_till_done()
@@ -398,9 +398,7 @@ async def test_bug_407(
         assert entity.target_temperature == 19
         assert mock_service_call.call_count >= 1
 
-    # 3. Evenif heater is stopped (is_device_active==False) and power is over max, then overpowering should be started
-    # due to check before start heating
-    side_effects.add_or_update_side_effect("sensor.the_power_sensor", State("sensor.the_power_sensor", 150))
+    # 3. if heater is stopped (is_device_active==False), then overpowering should be started
     with patch(
         "homeassistant.core.ServiceRegistry.async_call"
     ) as mock_service_call, patch(
@@ -414,13 +412,13 @@ async def test_bug_407(
         now = now + timedelta(seconds=30)
         VersatileThermostatAPI.get_vtherm_api()._set_now(now)
 
-        # change preset to Comfort
+        # change preset to Boost
         await entity.async_set_preset_mode(PRESET_COMFORT)
-        # waits the eventual heater starts
+        # waits that the heater starts
         await asyncio.sleep(0.1)
 
-        # simulate a refresh for central power (not necessary because it is checked before start)
-        # await do_central_power_refresh(hass)
+        # simulate a refresh for central power (not necessary)
+        await do_central_power_refresh(hass)
 
         assert entity.power_manager.is_overpowering_detected is True
         assert entity.hvac_mode is HVACMode.HEAT
@@ -482,6 +480,8 @@ async def test_bug_500_3(hass: HomeAssistant, init_vtherm_api) -> None:
         CONF_USE_WINDOW_CENTRAL_CONFIG: False,
         CONF_WINDOW_SENSOR: "sensor.theWindowSensor",
         CONF_USE_POWER_CENTRAL_CONFIG: False,
+        CONF_POWER_SENSOR: "sensor.thePowerSensor",
+        CONF_MAX_POWER_SENSOR: "sensor.theMaxPowerSensor",
         CONF_USE_PRESENCE_CENTRAL_CONFIG: False,
         CONF_PRESENCE_SENSOR: "sensor.thePresenceSensor",
         CONF_USE_MOTION_FEATURE: True,  # motion sensor need to be checked AND a motion sensor set
@@ -491,7 +491,7 @@ async def test_bug_500_3(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 False
+    assert flow._infos[CONF_USE_POWER_FEATURE] is True
     assert flow._infos[CONF_USE_PRESENCE_FEATURE] is True
     assert flow._infos[CONF_USE_MOTION_FEATURE] is True
 

tests/test_central_config.py

@@ -452,7 +452,7 @@ async def test_over_switch_with_central_config_but_no_central_config(
         DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == FlowResultType.FORM
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == SOURCE_USER
 
     result = await hass.config_entries.flow.async_configure(

tests/test_central_power_manager.py

@@ -1,6 +1,5 @@
 # pylint: disable=protected-access, unused-argument, line-too-long
 """ Test the Central Power management """
-import asyncio
 from unittest.mock import patch, AsyncMock, MagicMock, PropertyMock
 from datetime import datetime, timedelta
 import logging
@@ -11,14 +10,6 @@ from custom_components.versatile_thermostat.feature_power_manager import (
 from custom_components.versatile_thermostat.central_feature_power_manager import (
     CentralFeaturePowerManager,
 )
-
-from custom_components.versatile_thermostat.thermostat_switch import (
-    ThermostatOverSwitch,
-)
-from custom_components.versatile_thermostat.thermostat_climate import (
-    ThermostatOverClimate,
-)
-
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 logging.getLogger().setLevel(logging.DEBUG)
@@ -68,7 +59,7 @@ async def test_central_power_manager_init(
     assert central_power_manager.power_temperature == power_temp
 
     # 3. start listening
-    await central_power_manager.start_listening()
+    central_power_manager.start_listening()
     assert len(central_power_manager._active_listener) == (2 if is_configured else 0)
 
     # 4. stop listening
@@ -282,7 +273,7 @@ async def test_central_power_manageer_find_vtherms(
 @pytest.mark.parametrize(
     "current_power, current_max_power, vtherm_configs, expected_results",
     [
-        # simple nominal test (initialize overpowering state in VTherm)
+        # simple nominal test (no shedding)
         (
             1000,
             5000,
@@ -295,80 +286,139 @@ async def test_central_power_manageer_find_vtherms(
                     "nb_underlying_entities": 1,
                     "on_percent": 0,
                     "is_overpowering_detected": False,
-                    "overpowering_state": STATE_UNKNOWN,
                 },
-                {
-                    "name": "vtherm2",
-                    "device_power": 10000,
-                    "is_device_active": True,
-                    "is_over_climate": False,
-                    "nb_underlying_entities": 4,
-                    "on_percent": 100,
-                    "is_overpowering_detected": False,
-                    "overpowering_state": STATE_UNKNOWN,
-                },
-                {
-                    "name": "vtherm3",
-                    "device_power": 5000,
-                    "is_device_active": True,
-                    "is_over_climate": True,
-                    "is_overpowering_detected": False,
-                    "overpowering_state": STATE_UNKNOWN,
-                },
-                {"name": "vtherm4", "device_power": 1000, "is_device_active": True, "is_over_climate": True, "is_overpowering_detected": False, "overpowering_state": STATE_OFF},
             ],
-            # init vtherm1 to False
-            {"vtherm3": False, "vtherm2": False, "vtherm1": False},
+            {"vtherm1": False},
         ),
-        # Un-shedding only (will be taken in reverse order)
+        # Simple trivial shedding
         (
             1000,
             2000,
             [
-                # should be not unshedded (too much power will be added)
+                # should be overpowering
                 {
                     "name": "vtherm1",
+                    "device_power": 1100,
+                    "is_device_active": False,
+                    "is_over_climate": False,
+                    "nb_underlying_entities": 1,
+                    "on_percent": 1,
+                    "is_overpowering_detected": False,
+                },
+                # should be overpowering with many underlmying entities
+                {
+                    "name": "vtherm2",
+                    "device_power": 4000,
+                    "is_device_active": False,
+                    "is_over_climate": False,
+                    "nb_underlying_entities": 4,
+                    "on_percent": 0.1,
+                    "is_overpowering_detected": False,
+                },
+                # over_climate should be overpowering
+                {
+                    "name": "vtherm3",
+                    "device_power": 1000,
+                    "is_device_active": False,
+                    "is_over_climate": True,
+                    "is_overpowering_detected": False,
+                },
+                # should pass but because will be also overpowering because previous was overpowering
+                {
+                    "name": "vtherm4",
+                    "device_power": 800,
+                    "is_device_active": False,
+                    "is_over_climate": False,
+                    "nb_underlying_entities": 1,
+                    "on_percent": 1,
+                    "is_overpowering_detected": False,
+                },
+            ],
+            {"vtherm1": True, "vtherm2": True, "vtherm3": True, "vtherm4": True},
+        ),
+        # More complex shedding
+        (
+            1000,
+            2000,
+            [
+                # already overpowering (non change)
+                {
+                    "name": "vtherm1",
+                    "device_power": 1100,
+                    "is_device_active": False,
+                    "is_over_climate": False,
+                    "nb_underlying_entities": 1,
+                    "on_percent": 1,
+                    "is_overpowering_detected": True,
+                },
+                # already overpowering and already active (can be un overpowered)
+                {
+                    "name": "vtherm2",
+                    "device_power": 1100,
+                    "is_device_active": True,
+                    "is_over_climate": True,
+                    "is_overpowering_detected": True,
+                },
+                # should terminate the overpowering
+                {
+                    "name": "vtherm3",
                     "device_power": 800,
                     "is_device_active": False,
                     "is_over_climate": False,
                     "nb_underlying_entities": 1,
                     "on_percent": 1,
                     "is_overpowering_detected": True,
-                    "overpowering_state": STATE_ON,
                 },
-                # already stay unshedded cause already unshedded
-                {
-                    "name": "vtherm2",
-                    "device_power": 100,
-                    "is_device_active": True,
-                    "is_over_climate": True,
-                    "is_overpowering_detected": False,
-                    "overpowering_state": STATE_OFF,
-                },
-                # should be unshedded
-                {
-                    "name": "vtherm3",
-                    "device_power": 200,
-                    "is_device_active": False,
-                    "is_over_climate": True,
-                    "is_overpowering_detected": True,
-                    "overpowering_state": STATE_ON,
-                },
-                # should be unshedded
+                # should terminate the overpowering and active
                 {
                     "name": "vtherm4",
-                    "device_power": 300,
-                    "is_device_active": False,
+                    "device_power": 3800,
+                    "is_device_active": True,
                     "is_over_climate": False,
                     "nb_underlying_entities": 1,
                     "on_percent": 1,
                     "is_overpowering_detected": True,
-                    "overpowering_state": STATE_ON,
                 },
             ],
-            {"vtherm4": False, "vtherm3": False},
+            {"vtherm2": False, "vtherm3": False, "vtherm4": False},
         ),
-        # Shedding
+        # More complex shedding
+        (
+            1000,
+            2000,
+            [
+                # already overpowering (non change)
+                {
+                    "name": "vtherm1",
+                    "device_power": 1100,
+                    "is_device_active": True,
+                    "is_over_climate": False,
+                    "nb_underlying_entities": 1,
+                    "on_percent": 1,
+                    "is_overpowering_detected": True,
+                },
+                # should be overpowering
+                {
+                    "name": "vtherm2",
+                    "device_power": 1800,
+                    "is_device_active": False,
+                    "is_over_climate": True,
+                    "is_overpowering_detected": False,
+                },
+                # should terminate the overpowering and active but just before is overpowering
+                {
+                    "name": "vtherm3",
+                    "device_power": 100,
+                    "is_device_active": True,
+                    "is_over_climate": False,
+                    "nb_underlying_entities": 1,
+                    "on_percent": 1,
+                    "is_overpowering_detected": False,
+                },
+            ],
+            {"vtherm1": False, "vtherm2": True, "vtherm3": True},
+        ),
+        # Sheeding only current_power > max_power (need to gain 1000 )
         (
             2000,
             1000,
@@ -382,31 +432,36 @@ async def test_central_power_manageer_find_vtherms(
                     "nb_underlying_entities": 1,
                     "on_percent": 1,
                     "is_overpowering_detected": False,
-                    "overpowering_state": STATE_OFF,
                 },
-                # should be overpowering with many underlmying entities
+                # should be overpowering but is already
                 {
                     "name": "vtherm2",
-                    "device_power": 400,
+                    "device_power": 600,
                     "is_device_active": True,
                     "is_over_climate": False,
                     "nb_underlying_entities": 4,
                     "on_percent": 0.1,
-                    "is_overpowering_detected": False,
-                    "overpowering_state": STATE_UNKNOWN,
+                    "is_overpowering_detected": True,
                 },
-                # over_climate should be overpowering
+                # over_climate should be not overpowering (device not active)
                 {
                     "name": "vtherm3",
-                    "device_power": 100,
+                    "device_power": 690,
+                    "is_device_active": False,
+                    "is_over_climate": True,
+                    "is_overpowering_detected": False,
+                },
+                # over_climate should be overpowering (device active and not already overpowering)
+                {
+                    "name": "vtherm4",
+                    "device_power": 690,
                     "is_device_active": True,
                     "is_over_climate": True,
                     "is_overpowering_detected": False,
-                    "overpowering_state": STATE_OFF,
                 },
-                # should pass cause not active
+                # should not overpower (keep as is)
                 {
-                    "name": "vtherm4",
+                    "name": "vtherm5",
                     "device_power": 800,
                     "is_device_active": False,
                     "is_over_climate": False,
@@ -414,39 +469,8 @@ async def test_central_power_manageer_find_vtherms(
                     "on_percent": 1,
                     "is_overpowering_detected": False,
                 },
-                # should be not overpowering (already overpowering)
-                {
-                    "name": "vtherm5",
-                    "device_power": 400,
-                    "is_device_active": True,
-                    "is_over_climate": False,
-                    "nb_underlying_entities": 4,
-                    "on_percent": 0.1,
-                    "is_overpowering_detected": True,
-                    "overpowering_state": STATE_ON,
-                },
-                # should be overpowering with many underluying entities
-                {
-                    "name": "vtherm6",
-                    "device_power": 400,
-                    "is_device_active": True,
-                    "is_over_climate": False,
-                    "nb_underlying_entities": 4,
-                    "on_percent": 0.1,
-                    "is_overpowering_detected": False,
-                    "overpowering_state": STATE_UNKNOWN,
-                },
-                # should not be overpowering (we have enough)
-                {
-                    "name": "vtherm7",
-                    "device_power": 1000,
-                    "is_device_active": True,
-                    "is_over_climate": True,
-                    "is_overpowering_detected": False,
-                    "overpowering_state": STATE_UNKNOWN,
-                },
             ],
-            {"vtherm1": True, "vtherm2": True, "vtherm3": True, "vtherm6": True},
+            {"vtherm1": True, "vtherm4": True},
         ),
     ],
 )
@@ -477,10 +501,7 @@ async def test_central_power_manageer_calculate_shedding(
         vtherm.nb_underlying_entities = vtherm_config.get("nb_underlying_entities")
         if not vtherm_config.get("is_over_climate"):
             vtherm.proportional_algorithm = MagicMock()
-            vtherm.on_percent = vtherm.proportional_algorithm.on_percent = vtherm_config.get("on_percent")
-        else:
-            vtherm.on_percent = None
-            vtherm.proportional_algorithm = None
+            vtherm.proportional_algorithm.on_percent = vtherm_config.get("on_percent")
 
         vtherm.power_manager = MagicMock(spec=FeaturePowerManager)
         vtherm.power_manager._vtherm = vtherm
@@ -489,7 +510,6 @@ async def test_central_power_manageer_calculate_shedding(
             "is_overpowering_detected"
         )
         vtherm.power_manager.device_power = vtherm_config.get("device_power")
-        vtherm.power_manager.overpowering_state = vtherm_config.get("overpowering_state")
 
         async def mock_set_overpowering(
             overpowering, power_consumption_max=0, v=vtherm
@@ -551,7 +571,7 @@ async def test_central_power_manager_power_event(
     assert central_power_manager.power_temperature == 13
 
     # 3. start listening (not really useful but don't eat bread)
-    await central_power_manager.start_listening()
+    central_power_manager.start_listening()
     assert len(central_power_manager._active_listener) == 2
 
     now: datetime = NowClass.get_now(hass)
@@ -580,9 +600,6 @@ async def test_central_power_manager_power_event(
                 "old_state": State("sensor.power_entity_id", STATE_UNAVAILABLE),
             }))
 
-        if nb_call > 0:
-            await central_power_manager._do_immediate_shedding()
-
         expected_power = power if isinstance(power, (int, float)) else -999
         assert central_power_manager.current_power == expected_power
         assert mock_calculate_shedding.call_count == nb_call
@@ -604,11 +621,8 @@ async def test_central_power_manager_power_event(
                 "old_state": State("sensor.power_entity_id", STATE_UNAVAILABLE),
             }))
 
-        if nb_call > 0:
-            await central_power_manager._do_immediate_shedding()
-
         assert central_power_manager.current_power == expected_power
-        assert mock_calculate_shedding.call_count == nb_call
+        assert mock_calculate_shedding.call_count == (nb_call if dsecs >= 20 else 0)
 
 
 @pytest.mark.parametrize(
@@ -649,7 +663,7 @@ async def test_central_power_manager_max_power_event(
     assert central_power_manager.power_temperature == 13
 
     # 3. start listening (not really useful but don't eat bread)
-    await central_power_manager.start_listening()
+    central_power_manager.start_listening()
     assert len(central_power_manager._active_listener) == 2
 
     now: datetime = NowClass.get_now(hass)
@@ -680,9 +694,6 @@ async def test_central_power_manager_max_power_event(
                 "old_state": State("sensor.max_power_entity_id", STATE_UNAVAILABLE),
             }))
 
-        if nb_call > 0:
-            await central_power_manager._do_immediate_shedding()
-
         expected_power = max_power if isinstance(max_power, (int, float)) else -999
         assert central_power_manager.current_max_power == expected_power
         assert mock_calculate_shedding.call_count == nb_call
@@ -704,155 +715,5 @@ async def test_central_power_manager_max_power_event(
                 "old_state": State("sensor.max_power_entity_id", STATE_UNAVAILABLE),
             }))
 
-        if nb_call > 0:
-            await central_power_manager._do_immediate_shedding()
-
         assert central_power_manager.current_max_power == expected_power
-        assert mock_calculate_shedding.call_count == nb_call
-
-
-async def test_central_power_manager_start_vtherm_power(hass: HomeAssistant, skip_hass_states_is_state, init_central_power_manager):
-    """Tests the central power start VTherm power. The objective is to starts VTherm until the power max is exceeded"""
-
-    temps = {
-        "eco": 17,
-        "comfort": 18,
-        "boost": 19,
-    }
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverSwitchMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverSwitchMockName",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 15,
-            CONF_TEMP_MAX: 30,
-            CONF_USE_WINDOW_FEATURE: False,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: True,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_UNDERLYING_LIST: ["switch.mock_switch"],
-            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
-            CONF_TPI_COEF_INT: 0.3,
-            CONF_TPI_COEF_EXT: 0.01,
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SAFETY_DELAY_MIN: 5,
-            CONF_SAFETY_MIN_ON_PERCENT: 0.3,
-            CONF_DEVICE_POWER: 1000,
-            CONF_PRESET_POWER: 12,
-        },
-    )
-
-    entity: ThermostatOverSwitch = await create_thermostat(hass, entry, "climate.theoverswitchmockname", temps)
-    assert entity
-
-    now: datetime = NowClass.get_now(hass)
-    VersatileThermostatAPI.get_vtherm_api()._set_now(now)
-
-    central_power_manager = VersatileThermostatAPI.get_vtherm_api().central_power_manager
-    assert central_power_manager
-
-    side_effects = SideEffects(
-        {
-            "sensor.the_power_sensor": State("sensor.the_power_sensor", 1000),
-            "sensor.the_max_power_sensor": State("sensor.the_max_power_sensor", 2100),
-        },
-        State("unknown.entity_id", "unknown"),
-    )
-
-    # 1. Make the heater heats
-    # fmt: off
-    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
-         patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=False):
-    # fmt: on
-        # make the heater heats
-        await send_power_change_event(entity, 1000, now)
-        await send_max_power_change_event(entity, 2100, now)
-
-        await send_temperature_change_event(entity, 15, now)
-        await send_ext_temperature_change_event(entity, 1, now)
-
-        await entity.async_set_preset_mode(PRESET_BOOST)
-        assert entity.preset_mode is PRESET_BOOST
-        assert entity.power_manager.overpowering_state is STATE_UNKNOWN
-        assert entity.target_temperature == 19
-        await hass.async_block_till_done()
-
-        await entity.async_set_hvac_mode(HVACMode.HEAT)
-        assert entity.hvac_mode is HVACMode.HEAT
-
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.1)
-
-        # the power of Vtherm should have been added
-        assert central_power_manager.started_vtherm_total_power == 1000
-
-    # 2. Check that another heater cannot heat
-    entry2 = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName2",
-        unique_id="uniqueId2",
-        data={
-            CONF_NAME: "TheOverClimateMockName2",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 15,
-            CONF_TEMP_MAX: 30,
-            CONF_USE_WINDOW_FEATURE: False,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: True,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_UNDERLYING_LIST: ["switch.mock_climate"],
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SAFETY_DELAY_MIN: 5,
-            CONF_SAFETY_MIN_ON_PERCENT: 0.3,
-            CONF_DEVICE_POWER: 150,
-            CONF_PRESET_POWER: 12,
-        },
-    )
-
-    entity2: ThermostatOverClimate = await create_thermostat(hass, entry2, "climate.theoverclimatemockname2", temps)
-    assert entity2
-
-    fake_underlying_climate = MockClimate(
-        hass=hass,
-        unique_id="mockUniqueId",
-        name="MockClimateName",
-    )
-
-    # fmt: off
-    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
-         patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=False), \
-         patch("custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",return_value=fake_underlying_climate):
-    # fmt: on
-        # make the heater heats
-        await entity2.async_set_preset_mode(PRESET_COMFORT)
-        assert entity2.preset_mode is PRESET_COMFORT
-        assert entity2.power_manager.overpowering_state is STATE_UNKNOWN
-        assert entity2.target_temperature == 18
-        await entity2.async_set_hvac_mode(HVACMode.HEAT)
-        assert entity2.hvac_mode is HVACMode.HEAT
-
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.1)
-
-        # the power of Vtherm should have not been added (cause it has not started) and the entity2 should be shedding
-        assert central_power_manager.started_vtherm_total_power == 1000
-
-
-        assert entity2.power_manager.overpowering_state is STATE_ON
-
-    # 3. sends a new power sensor event
-    await send_max_power_change_event(entity, 2150, now)
-    # No change
-    assert central_power_manager.started_vtherm_total_power == 1000
-
-    await send_power_change_event(entity, 1010, now)
-    assert central_power_manager.started_vtherm_total_power == 0
+        assert mock_calculate_shedding.call_count == (nb_call if dsecs >= 20 else 0)

tests/test_config_flow.py

@@ -287,7 +287,6 @@ async def test_user_config_flow_over_switch(
             CONF_USE_POWER_FEATURE: True,
             CONF_USE_PRESENCE_FEATURE: True,
             CONF_USE_CENTRAL_BOILER_FEATURE: False,
-            CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_NONE,
         }
     )
     assert result["result"]
@@ -493,7 +492,9 @@ async def test_user_config_flow_over_climate(
     )
     assert result["type"] == FlowResultType.CREATE_ENTRY
     assert result.get("errors") is None
-    assert result["data"] == MOCK_TH_OVER_CLIMATE_USER_CONFIG | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG | {
+    assert result[
+        "data"
+    ] == MOCK_TH_OVER_CLIMATE_USER_CONFIG | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG | {
         CONF_MINIMAL_ACTIVATION_DELAY: 10,
         CONF_SAFETY_DELAY_MIN: 5,
         CONF_SAFETY_MIN_ON_PERCENT: 0.4,
@@ -516,7 +517,6 @@ async def test_user_config_flow_over_climate(
         CONF_USED_BY_CENTRAL_BOILER: False,
         CONF_USE_CENTRAL_MODE: False,
         CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_STRONG,
-        CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_NONE,
     }
     assert result["result"]
     assert result["result"].domain == DOMAIN
@@ -1378,7 +1378,6 @@ async def test_user_config_flow_over_switch_bug_552_tpi(
             CONF_USE_POWER_FEATURE: False,
             CONF_USE_PRESENCE_FEATURE: False,
             CONF_USE_CENTRAL_BOILER_FEATURE: False,
-            CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_NONE,
         }
     )
     assert result["result"]
@@ -1682,7 +1681,9 @@ async def test_user_config_flow_over_climate_valve(
     )
     assert result["type"] == FlowResultType.CREATE_ENTRY
     assert result.get("errors") is None
-    assert result["data"] == MOCK_TH_OVER_CLIMATE_USER_CONFIG | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG | {
+    assert result[
+        "data"
+    ] == MOCK_TH_OVER_CLIMATE_USER_CONFIG | MOCK_TH_OVER_CLIMATE_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG | {
         CONF_MINIMAL_ACTIVATION_DELAY: 10,
         CONF_SAFETY_DELAY_MIN: 5,
         CONF_SAFETY_MIN_ON_PERCENT: 0.4,
@@ -1716,7 +1717,6 @@ async def test_user_config_flow_over_climate_valve(
         CONF_TPI_COEF_INT: 0.3,
         CONF_TPI_COEF_EXT: 0.1,
         CONF_MIN_OPENING_DEGREES: "10, 20,0",
-        CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_NONE,
     }
     assert result["result"]
     assert result["result"].domain == DOMAIN

tests/test_motion.py

@@ -90,7 +90,7 @@ async def test_motion_feature_manager_refresh(
     assert custom_attributes["motion_off_delay_sec"] == 30
 
     # 3. start listening
-    await motion_manager.start_listening()
+    motion_manager.start_listening()
     assert motion_manager.is_configured is True
     assert motion_manager.motion_state == STATE_UNKNOWN
     assert motion_manager.is_motion_detected is False
@@ -198,7 +198,7 @@ async def test_motion_feature_manager_event(
             CONF_NO_MOTION_PRESET: PRESET_ECO,
         }
     )
-    await motion_manager.start_listening()
+    motion_manager.start_listening()
 
     # 2. test _motion_sensor_changed with the parametrized
     # fmt: off
@@ -347,17 +347,22 @@ async def test_motion_management_time_not_enough(
         assert entity.presence_state == STATE_ON
 
     # 2. starts detecting motion with time not enough
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=False
     ) as mock_condition, patch(
         "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF),
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF
+        ),
     ):
         event_timestamp = now - timedelta(minutes=4)
         try_condition = await send_motion_change_event(
@@ -382,11 +387,14 @@ async def test_motion_management_time_not_enough(
         assert mock_send_event.call_count == 0
 
     # starts detecting motion with time enough this time
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -407,17 +415,22 @@ async def test_motion_management_time_not_enough(
         assert entity.presence_state == STATE_ON
 
     # stop detecting motion with off delay too low
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ) as mock_device_active, patch(
         "homeassistant.helpers.condition.state", return_value=False
     ) as mock_condition, patch(
         "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF),
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF
+        ),
     ):
         event_timestamp = now - timedelta(minutes=2)
         try_condition = await send_motion_change_event(
@@ -441,11 +454,14 @@ async def test_motion_management_time_not_enough(
         assert mock_send_event.call_count == 0
 
     # stop detecting motion with off delay enough long
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ) as mock_device_active, patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -546,11 +562,14 @@ async def test_motion_management_time_enough_and_presence(
         assert entity.presence_state == "on"
 
     # starts detecting motion
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -571,11 +590,14 @@ async def test_motion_management_time_enough_and_presence(
         assert mock_send_event.call_count == 0
 
     # stop detecting motion with confirmation of stop
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -671,11 +693,14 @@ async def test_motion_management_time_enough_and_not_presence(
         assert entity.presence_state == STATE_OFF
 
     # starts detecting motion
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -697,11 +722,14 @@ async def test_motion_management_time_enough_and_not_presence(
         assert mock_send_event.call_count == 0
 
     # stop detecting motion with confirmation of stop
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -798,11 +826,14 @@ async def test_motion_management_with_stop_during_condition(
         assert entity.presence_state == STATE_OFF
 
     # starts detecting motion
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ), patch(
         "homeassistant.helpers.condition.state", return_value=True
@@ -928,11 +959,12 @@ async def test_motion_management_with_stop_during_condition_last_state_on(
     # 1. starts detecting motion but the sensor is off
     with patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ), patch("homeassistant.helpers.condition.state", return_value=False), patch(
         "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF),
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF
+        ),
     ):
         event_timestamp = now - timedelta(minutes=5)
         try_condition1 = await send_motion_change_event(
@@ -950,11 +982,12 @@ async def test_motion_management_with_stop_during_condition_last_state_on(
     # 2. starts detecting motion but the sensor is on
     with patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ), patch("homeassistant.helpers.condition.state", return_value=False), patch(
         "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="binary_sensor.mock_motion_sensor", state=STATE_ON),
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_ON
+        ),
     ):
         event_timestamp = now - timedelta(minutes=5)
         try_condition1 = await send_motion_change_event(

tests/test_multiple_switch.py

@@ -2,7 +2,7 @@
 
 """ Test the Multiple switch management """
 import asyncio
-from unittest.mock import patch, call, ANY, PropertyMock
+from unittest.mock import patch, call, ANY
 from datetime import datetime, timedelta
 import logging
 
@@ -84,11 +84,14 @@ async def test_one_switch_cycle(
         assert mock_is_state.call_count == 1
 
     # Set temperature to a low level
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ) as mock_device_active, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.call_later",
@@ -104,8 +107,7 @@ async def test_one_switch_cycle(
         # assert mock_heater_on.call_count == 1
         assert mock_heater_on.call_count == 0
         # There is no check if active
-        # don't work with PropertyMock
-        # assert mock_device_active.call_count == 0
+        assert mock_device_active.call_count == 0
 
         # 4 calls dispatched along the cycle
         assert mock_call_later.call_count == 1
@@ -117,11 +119,14 @@ async def test_one_switch_cycle(
 
     # Set a temperature at middle level
     event_timestamp = now - timedelta(minutes=4)
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ) as mock_device_active:
         await send_temperature_change_event(entity, 18, event_timestamp)
@@ -136,11 +141,14 @@ async def test_one_switch_cycle(
 
     # Set another temperature at middle level
     event_timestamp = now - timedelta(minutes=3)
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ) as mock_device_active:
         await send_temperature_change_event(entity, 18.1, event_timestamp)
@@ -168,11 +176,14 @@ async def test_one_switch_cycle(
 
     # Simulate the end of heater on cycle
     event_timestamp = now - timedelta(minutes=3)
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ) as mock_device_active:
         await entity.underlying_entity(
@@ -190,11 +201,14 @@ async def test_one_switch_cycle(
 
     # Simulate the start of heater on cycle
     event_timestamp = now - timedelta(minutes=3)
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ) as mock_device_active:
         await entity.underlying_entity(
@@ -292,11 +306,14 @@ async def test_multiple_switchs(
         )
 
     # Set temperature to a low level
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ) as mock_device_active, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.call_later",
@@ -312,8 +329,7 @@ async def test_multiple_switchs(
         # assert mock_heater_on.call_count == 1
         assert mock_heater_on.call_count == 0
         # There is no check if active
-        # don't work with PropertyMock
-        # assert mock_device_active.call_count == 0
+        assert mock_device_active.call_count == 0
 
         # 4 calls dispatched along the cycle
         assert mock_call_later.call_count == 4
@@ -328,11 +344,14 @@ async def test_multiple_switchs(
 
     # Set a temperature at middle level
     event_timestamp = now - timedelta(minutes=4)
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ) as mock_device_active:
         await send_temperature_change_event(entity, 18, event_timestamp)
@@ -793,20 +812,21 @@ async def test_multiple_switch_power_management(
         assert entity.power_manager.overpowering_state is STATE_OFF
 
     # 2. Send power max mesurement too low and HVACMode is on
-        side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 49))
+        side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 74))
 
-        #fmt: off
-        with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, \
-            patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on") as mock_heater_on, \
-            patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, \
-            patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=True):
-        #fmt: on
+        with patch(
+            "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+        ) as mock_send_event, patch(
+            "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+        ) as mock_heater_on, patch(
+            "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+        ) as mock_heater_off:
             now = now + timedelta(seconds=30)
             VersatileThermostatAPI.get_vtherm_api()._set_now(now)
 
             assert entity.power_percent > 0
             # 100 of the device / 4 -> 25, current power 50 so max is 75
-            await send_max_power_change_event(entity, 49, datetime.now())
+            await send_max_power_change_event(entity, 74, datetime.now())
             assert entity.power_manager.is_overpowering_detected is True
             # All configuration is complete and power is > power_max we switch to POWER preset
             assert entity.preset_mode is PRESET_POWER
@@ -823,7 +843,7 @@ async def test_multiple_switch_power_management(
                             "type": "start",
                             "current_power": 50,
                             "device_power": 100,
-                            "current_max_power": 49,
+                            "current_max_power": 74,
                             "current_power_consumption": 100,
                         },
                     ),

tests/test_overclimate.py

@@ -212,13 +212,6 @@ async def test_underlying_change_follow(
     tz = get_tz(hass)  # pylint: disable=invalid-name
     now: datetime = datetime.now(tz=tz)
 
-    temps = {
-        PRESET_FROST_PROTECTION: 7,
-        PRESET_ECO: 16,
-        PRESET_COMFORT: 17,
-        PRESET_BOOST: 18,
-    }
-
     entry = MockConfigEntry(
         domain=DOMAIN,
         title="TheOverClimateMockName",
@@ -239,7 +232,7 @@ async def test_underlying_change_follow(
     ) as mock_find_climate, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname", temps)
+        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname")
 
         assert entity
         assert entity.name == "TheOverClimateMockName"
@@ -361,13 +354,6 @@ async def test_underlying_change_not_follow(
     tz = get_tz(hass)  # pylint: disable=invalid-name
     now: datetime = datetime.now(tz=tz)
 
-    temps = {
-        PRESET_FROST_PROTECTION: 7,
-        PRESET_ECO: 16,
-        PRESET_COMFORT: 17,
-        PRESET_BOOST: 18,
-    }
-
     entry = MockConfigEntry(
         domain=DOMAIN,
         title="TheOverClimateMockName",
@@ -388,7 +374,7 @@ async def test_underlying_change_not_follow(
     ) as mock_find_climate, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname", temps)
+        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname")
 
         assert entity
 
@@ -580,6 +566,7 @@ async def test_bug_508(
                         # "temperature": 17.5,
                         "target_temp_high": 10,
                         "target_temp_low": 10,
+                        "temperature": 10,
                     },
                 ),
             ]
@@ -603,6 +590,7 @@ async def test_bug_508(
                         "entity_id": "climate.mock_climate",
                         "target_temp_high": 31,
                         "target_temp_low": 31,
+                        "temperature": 31,
                     },
                 ),
             ]
@@ -738,13 +726,6 @@ async def test_ignore_temp_outside_minmax_range(
     tz = get_tz(hass)  # pylint: disable=invalid-name
     now: datetime = datetime.now(tz=tz)
 
-    temps = {
-        PRESET_FROST_PROTECTION: 7,
-        PRESET_ECO: 16,
-        PRESET_COMFORT: 17,
-        PRESET_BOOST: 18,
-    }
-
     entry = MockConfigEntry(
         domain=DOMAIN,
         title="TheOverClimateMockName",
@@ -765,7 +746,7 @@ async def test_ignore_temp_outside_minmax_range(
     ) as mock_find_climate, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname", temps)
+        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname")
 
         assert entity
 
@@ -1233,111 +1214,3 @@ async def test_manual_hvac_off_should_take_the_lead_over_auto_start_stop(
         assert vtherm.hvac_off_reason == HVAC_OFF_REASON_MANUAL
         assert vtherm._saved_hvac_mode == HVACMode.OFF
         assert mock_send_event.call_count == 0  # nothing have change
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_underlying_from_comes_back_to_life(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-    skip_turn_on_off_heater,
-    skip_send_event,
-):
-    """Test that when a underlying climate comes back to life (from unkwown or unavailable) the last state is send"""
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverClimateMockName",
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 15,
-            CONF_TEMP_MAX: 30,
-            CONF_USE_WINDOW_FEATURE: False,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_AUTO_START_STOP_FEATURE: False,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_UNDERLYING_LIST: ["climate.mock_climate"],
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SAFETY_DELAY_MIN: 5,
-            CONF_SAFETY_MIN_ON_PERCENT: 0.3,
-            CONF_AUTO_FAN_MODE: CONF_AUTO_FAN_NONE,
-            CONF_AC_MODE: True,
-        },  # 5 minutes security delay
-    )
-
-    # Underlying is in HEAT mode but should be shutdown at startup
-    fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {}, HVACMode.COOL, HVACAction.COOLING)
-
-    # 1. initialize the vtherm in COOL with Boost
-    # fmt: off
-    with patch("custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",return_value=fake_underlying_climate) as mock_find_climate:
-    # fmt: on
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname", temps=default_temperatures_ac)
-
-        assert entity
-        assert entity.name == "TheOverClimateMockName"
-        assert entity.is_over_climate is True
-
-        # Set hvac_mode to COOL
-        await entity.async_set_hvac_mode(HVACMode.COOL)
-        await entity.async_set_preset_mode(PRESET_BOOST)
-
-        # it is very hot today
-        await send_temperature_change_event(entity, 27, now, False)
-        await send_ext_temperature_change_event(entity, 35, now, False)
-        await hass.async_block_till_done()
-
-        assert entity.hvac_mode is HVACMode.COOL
-        # because in MockClimate HVACAction is HEATING if hvac_mode is not set
-        assert entity.hvac_action is HVACAction.COOLING
-        assert entity.preset_mode is PRESET_BOOST
-        assert entity.target_temperature == 23
-
-
-    # 2. send under state event comes back from life
-    # fmt: off
-    with patch("custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode") as mock_underlying_set_hvac_mode, \
-        patch("custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_temperature") as mock_underlying_set_temperature:
-    # fmt: on
-        now  = now + timedelta(minutes=2)
-        # 2. Change the target temp of underlying thermostat at now -> the event will be disgarded because to fast (to avoid loop cf issue 121)
-        await send_climate_change_event_with_temperature(
-            entity,
-            HVACMode.HEAT,
-            STATE_UNKNOWN,
-            HVACAction.OFF,
-            STATE_UNKNOWN,
-            now,
-            entity.min_temp + 1,
-            True,
-            "climate.mock_climate",  # the underlying climate entity id
-        )
-
-        assert mock_underlying_set_hvac_mode.call_count == 1
-        mock_underlying_set_hvac_mode.assert_has_calls(
-            [
-                call.set_hvac_mode(HVACMode.COOL),
-            ]
-        )
-
-        assert mock_underlying_set_temperature.call_count == 1
-        mock_underlying_set_temperature.assert_has_calls(
-            [
-                call.set_temperature(23, 30, 15),
-            ]
-        )
-
-
-        # Nothing should have changed
-        assert entity.target_temperature == 23
-        assert entity.preset_mode is PRESET_BOOST
-        assert entity.hvac_mode is HVACMode.COOL

tests/test_overclimate_valve.py

@@ -627,11 +627,11 @@ async def test_over_climate_valve_multi_min_opening_degrees(
         assert mock_service_call.call_count == 6
         mock_service_call.assert_has_calls([
             # min is 60
-            call(domain='number', service='set_value', service_data={'value': 68}, target={'entity_id': 'number.mock_opening_degree1'}),
-            call(domain='number', service='set_value', service_data={'value': 32}, target={'entity_id': 'number.mock_closing_degree1'}),
+            call(domain='number', service='set_value', service_data={'value': 60}, target={'entity_id': 'number.mock_opening_degree1'}),
+            call(domain='number', service='set_value', service_data={'value': 40}, target={'entity_id': 'number.mock_closing_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 3.0}, target={'entity_id': 'number.mock_offset_calibration1'}),
-            call(domain='number', service='set_value', service_data={'value': 76}, target={'entity_id': 'number.mock_opening_degree2'}),
-            call(domain='number', service='set_value', service_data={'value': 24}, target={'entity_id': 'number.mock_closing_degree2'}),
+            call(domain='number', service='set_value', service_data={'value': 70}, target={'entity_id': 'number.mock_opening_degree2'}),
+            call(domain='number', service='set_value', service_data={'value': 30}, target={'entity_id': 'number.mock_closing_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 12}, target={'entity_id': 'number.mock_offset_calibration2'})
             ]
         )

tests/test_power.py

@@ -98,7 +98,7 @@ async def test_power_feature_manager(
         }
     )
 
-    await power_manager.start_listening()
+    power_manager.start_listening()
 
     assert power_manager.is_configured is True
     assert power_manager.overpowering_state == STATE_UNKNOWN
@@ -117,7 +117,7 @@ async def test_power_feature_manager(
     assert custom_attributes["current_max_power"] is None
 
     # 3. start listening
-    await power_manager.start_listening()
+    power_manager.start_listening()
     assert power_manager.is_configured is True
     assert power_manager.overpowering_state == STATE_UNKNOWN
 
@@ -199,7 +199,7 @@ async def test_power_feature_manager_set_overpowering(
         }
     )
 
-    await power_manager.start_listening()
+    power_manager.start_listening()
 
     assert power_manager.is_configured is True
     assert power_manager.overpowering_state == STATE_UNKNOWN
@@ -517,18 +517,17 @@ async def test_power_management_hvac_on(
         assert entity.power_manager.overpowering_state is STATE_OFF
 
     # Send power max mesurement too low and HVACMode is on
-    side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 49))
+    side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 149))
     # fmt:off
     with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
         patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, \
         patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on") as mock_heater_on, \
-        patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, \
-        patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=True):
+        patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off:
     # fmt: on
         now = now + timedelta(seconds=30)
         VersatileThermostatAPI.get_vtherm_api()._set_now(now)
 
-        await send_max_power_change_event(entity, 49, now)
+        await send_max_power_change_event(entity, 149, datetime.now())
         assert entity.power_manager.is_overpowering_detected is True
         # All configuration is complete and power is > power_max we switch to POWER preset
         assert entity.preset_mode is PRESET_POWER
@@ -545,7 +544,7 @@ async def test_power_management_hvac_on(
                         "type": "start",
                         "current_power": 50,
                         "device_power": 100,
-                        "current_max_power": 49,
+                        "current_max_power": 149,
                         "current_power_consumption": 100.0,
                     },
                 ),
@@ -555,9 +554,8 @@ async def test_power_management_hvac_on(
         assert mock_heater_on.call_count == 0
         assert mock_heater_off.call_count == 1
 
-    # Send power mesurement low to unset power preset
+    # Send power mesurement low to unseet power preset
     side_effects.add_or_update_side_effect("sensor.the_power_sensor", State("sensor.the_power_sensor", 48))
-    side_effects.add_or_update_side_effect("sensor.the_max_power_sensor", State("sensor.the_max_power_sensor", 149))
     # fmt:off
     with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
         patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, \
@@ -567,7 +565,7 @@ async def test_power_management_hvac_on(
         now = now + timedelta(seconds=30)
         VersatileThermostatAPI.get_vtherm_api()._set_now(now)
 
-        await send_power_change_event(entity, 48, now)
+        await send_power_change_event(entity, 48, datetime.now())
         assert entity.power_manager.is_overpowering_detected is False
         # All configuration is complete and power is < power_max, we restore previous preset
         assert entity.preset_mode is PRESET_BOOST
@@ -763,6 +761,8 @@ async def test_power_management_energy_over_climate(
                 CONF_MINIMAL_ACTIVATION_DELAY: 30,
                 CONF_SAFETY_DELAY_MIN: 5,
                 CONF_SAFETY_MIN_ON_PERCENT: 0.3,
+                CONF_POWER_SENSOR: "sensor.mock_power_sensor",
+                CONF_MAX_POWER_SENSOR: "sensor.mock_power_max_sensor",
                 CONF_DEVICE_POWER: 100,
                 CONF_PRESET_POWER: 12,
             },
@@ -825,135 +825,3 @@ async def test_power_management_energy_over_climate(
     # Test the re-increment
     entity.incremente_energy()
     assert entity.total_energy == 2 * 100 * 3.0 / 60
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_power_management_turn_off_while_shedding(hass: HomeAssistant, skip_hass_states_is_state, init_central_power_manager):
-    """Test the Power management and that we can turn off a Vtherm that
-    is in overpowering state"""
-
-    temps = {
-        "eco": 17,
-        "comfort": 18,
-        "boost": 19,
-    }
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverSwitchMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverSwitchMockName",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 15,
-            CONF_TEMP_MAX: 30,
-            CONF_USE_WINDOW_FEATURE: False,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: True,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_UNDERLYING_LIST: ["switch.mock_switch"],
-            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
-            CONF_TPI_COEF_INT: 0.3,
-            CONF_TPI_COEF_EXT: 0.01,
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SAFETY_DELAY_MIN: 5,
-            CONF_SAFETY_MIN_ON_PERCENT: 0.3,
-            CONF_DEVICE_POWER: 100,
-            CONF_PRESET_POWER: 12,
-        },
-    )
-
-    entity: ThermostatOverSwitch = await create_thermostat(hass, entry, "climate.theoverswitchmockname", temps)
-    assert entity
-
-    now: datetime = NowClass.get_now(hass)
-    VersatileThermostatAPI.get_vtherm_api()._set_now(now)
-
-    tpi_algo = entity._prop_algorithm
-    assert tpi_algo
-
-    await entity.async_set_hvac_mode(HVACMode.HEAT)
-    await entity.async_set_preset_mode(PRESET_BOOST)
-    assert entity.hvac_mode is HVACMode.HEAT
-    assert entity.preset_mode is PRESET_BOOST
-    assert entity.power_manager.overpowering_state is STATE_UNKNOWN
-    assert entity.target_temperature == 19
-
-    # make the heater heats
-    await send_temperature_change_event(entity, 15, now)
-    await send_ext_temperature_change_event(entity, 1, now)
-    await hass.async_block_till_done()
-
-    assert entity.power_percent > 0
-
-    side_effects = SideEffects(
-        {
-            "sensor.the_power_sensor": State("sensor.the_power_sensor", 50),
-            "sensor.the_max_power_sensor": State("sensor.the_max_power_sensor", 49),
-        },
-        State("unknown.entity_id", "unknown"),
-    )
-    # # fmt:off
-    # with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()):
-    # # fmt: on
-    #     await send_power_change_event(entity, 50, datetime.now())
-    #     # Send power max mesurement
-    #     now = now + timedelta(seconds=30)
-    #     VersatileThermostatAPI.get_vtherm_api()._set_now(now)
-    #     await send_max_power_change_event(entity, 300, datetime.now())
-    #
-    #     assert entity.power_manager.is_overpowering_detected is False
-    #     # All configuration is complete and power is < power_max
-    #     assert entity.preset_mode is PRESET_BOOST
-    #     assert entity.power_manager.overpowering_state is STATE_OFF
-
-    # 1. Set VTherm to overpowering
-    # Send power max mesurement too low and HVACMode is on and device is active
-
-    #
-    #
-    # fmt:off
-    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
-        patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"), \
-        patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on") as mock_heater_on, \
-        patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, \
-        patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=True):
-    # fmt: on
-        now = now + timedelta(seconds=30)
-        VersatileThermostatAPI.get_vtherm_api()._set_now(now)
-
-        await send_max_power_change_event(entity, 49, now)
-        assert entity.power_manager.is_overpowering_detected is True
-        # All configuration is complete and power is > power_max we switch to POWER preset
-        assert entity.preset_mode is PRESET_POWER
-        assert entity.power_manager.overpowering_state is STATE_ON
-        assert entity.target_temperature == 12
-
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 1
-
-    # 2. Turn-off Vtherm
-    # fmt:off
-    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()), \
-        patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, \
-        patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on") as mock_heater_on, \
-        patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, \
-        patch("custom_components.versatile_thermostat.thermostat_switch.ThermostatOverSwitch.is_device_active", new_callable=PropertyMock, return_value=True):
-    # fmt: on
-        now = now + timedelta(seconds=30)
-        VersatileThermostatAPI.get_vtherm_api()._set_now(now)
-
-        await entity.async_set_hvac_mode(HVACMode.OFF)
-        await VersatileThermostatAPI.get_vtherm_api().central_power_manager._do_immediate_shedding()
-        await hass.async_block_till_done()
-
-        # VTherm is off and overpowering if off also
-        assert entity.hvac_mode == HVACMode.OFF
-        assert entity.power_manager.is_overpowering_detected is False
-        assert entity.preset_mode is PRESET_BOOST
-        assert entity.power_manager.overpowering_state is STATE_OFF
-        assert entity.target_temperature == 19

tests/test_presence.py

@@ -75,7 +75,7 @@ async def test_presence_feature_manager(
     assert custom_attributes["is_presence_configured"] is True
 
     # 3. start listening
-    await presence_manager.start_listening()
+    presence_manager.start_listening()
     assert presence_manager.is_configured is True
     assert presence_manager.presence_state == STATE_UNKNOWN
     assert presence_manager.is_absence_detected is False

tests/test_sensors.py

@@ -224,6 +224,8 @@ async def test_sensors_over_climate(
                 CONF_MINIMAL_ACTIVATION_DELAY: 30,
                 CONF_SAFETY_DELAY_MIN: 5,
                 CONF_SAFETY_MIN_ON_PERCENT: 0.3,
+                CONF_POWER_SENSOR: "sensor.mock_power_sensor",
+                CONF_MAX_POWER_SENSOR: "sensor.mock_power_max_sensor",
                 CONF_DEVICE_POWER: 1.5,
                 CONF_PRESET_POWER: 12,
             },

tests/test_switch_ac.py

@@ -26,23 +26,6 @@ async def test_over_switch_ac_full_start(
 ):  # pylint: disable=unused-argument
     """Test the normal full start of a thermostat in thermostat_over_switch type"""
 
-    temps = {
-        PRESET_FROST_PROTECTION: 7,
-        PRESET_ECO: 17,
-        PRESET_COMFORT: 19,
-        PRESET_BOOST: 20,
-        PRESET_ECO + PRESET_AC_SUFFIX: 25,
-        PRESET_COMFORT + PRESET_AC_SUFFIX: 23,
-        PRESET_BOOST + PRESET_AC_SUFFIX: 21,
-        PRESET_FROST_PROTECTION + PRESET_AWAY_SUFFIX: 7,
-        PRESET_ECO + PRESET_AWAY_SUFFIX: 16,
-        PRESET_COMFORT + PRESET_AWAY_SUFFIX: 17,
-        PRESET_BOOST + PRESET_AWAY_SUFFIX: 18,
-        PRESET_ECO + PRESET_AC_SUFFIX + PRESET_AWAY_SUFFIX: 27,
-        PRESET_COMFORT + PRESET_AC_SUFFIX + PRESET_AWAY_SUFFIX: 26,
-        PRESET_BOOST + PRESET_AC_SUFFIX + PRESET_AWAY_SUFFIX: 25,
-    }
-
     entry = MockConfigEntry(
         domain=DOMAIN,
         title="TheOverSwitchACMockName",
@@ -74,7 +57,21 @@ async def test_over_switch_ac_full_start(
         assert isinstance(entity, ThermostatOverSwitch)
 
         # Initialise the preset temp
-        await set_all_climate_preset_temp(hass, entity, temps, "theoverswitchmockname")
+        await set_climate_preset_temp(
+            entity, PRESET_FROST_PROTECTION + PRESET_AWAY_SUFFIX, 7
+        )
+        await set_climate_preset_temp(entity, PRESET_ECO + PRESET_AWAY_SUFFIX, 16)
+        await set_climate_preset_temp(entity, PRESET_COMFORT + PRESET_AWAY_SUFFIX, 17)
+        await set_climate_preset_temp(entity, PRESET_BOOST + PRESET_AWAY_SUFFIX, 18)
+        await set_climate_preset_temp(
+            entity, PRESET_ECO + PRESET_AC_SUFFIX + PRESET_AWAY_SUFFIX, 27
+        )
+        await set_climate_preset_temp(
+            entity, PRESET_COMFORT + PRESET_AC_SUFFIX + PRESET_AWAY_SUFFIX, 26
+        )
+        await set_climate_preset_temp(
+            entity, PRESET_BOOST + PRESET_AC_SUFFIX + PRESET_AWAY_SUFFIX, 25
+        )
 
         assert entity.name == "TheOverSwitchMockName"
         assert entity.is_over_climate is False  # pylint: disable=protected-access

tests/test_valve.py

@@ -51,6 +51,8 @@ async def test_over_valve_full_start(
             CONF_MOTION_OFF_DELAY: 30,
             CONF_MOTION_PRESET: PRESET_COMFORT,
             CONF_NO_MOTION_PRESET: PRESET_ECO,
+            CONF_POWER_SENSOR: "sensor.power_sensor",
+            CONF_MAX_POWER_SENSOR: "sensor.power_max_sensor",
             CONF_PRESENCE_SENSOR: "person.presence_sensor",
             PRESET_FROST_PROTECTION + PRESET_AWAY_SUFFIX + PRESET_TEMP_SUFFIX: 7,
             PRESET_ECO + PRESET_AWAY_SUFFIX + PRESET_TEMP_SUFFIX: 17.1,

tests/test_window.py

@@ -2039,13 +2039,16 @@ async def test_bug_66(
     assert entity.window_state is STATE_UNKNOWN
 
     # Open the window and let the thermostat shut down
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "homeassistant.helpers.condition.state", return_value=True
     ) as mock_condition, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=True,
     ):
         await send_temperature_change_event(entity, 15, now)
@@ -2064,13 +2067,16 @@ async def test_bug_66(
         assert entity.window_state == STATE_ON
 
     # Close the window but too shortly
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "homeassistant.helpers.condition.state", return_value=False
     ) as mock_condition, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ):
         event_timestamp = now + timedelta(minutes=1)
@@ -2084,13 +2090,16 @@ async def test_bug_66(
         assert entity.window_state == STATE_ON
 
     # Reopen immediatly with sufficient time
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "homeassistant.helpers.condition.state", return_value=True
     ) as mock_condition, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ):
         try_window_condition = await send_window_change_event(
@@ -2104,13 +2113,16 @@ async def test_bug_66(
         assert entity.hvac_mode == HVACMode.OFF
 
     # Close the window but with sufficient time this time
-    with patch("custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event") as mock_send_event, patch(
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch("custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off") as mock_heater_off, patch(
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
         "homeassistant.helpers.condition.state", return_value=True
     ) as mock_condition, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
         return_value=False,
     ):
         event_timestamp = now + timedelta(minutes=2)

tests/test_window_feature_manager.py

@@ -170,7 +170,7 @@ async def test_window_feature_manager_refresh_sensor_action_turn_off(
     )
 
     # 3. start listening
-    await window_manager.start_listening()
+    window_manager.start_listening()
     assert window_manager.is_configured is True
     assert window_manager.window_state == STATE_UNKNOWN
     assert window_manager.window_auto_state == STATE_UNAVAILABLE
@@ -288,7 +288,7 @@ async def test_window_feature_manager_refresh_sensor_action_frost_only(
     )
 
     # 3. start listening
-    await window_manager.start_listening()
+    window_manager.start_listening()
     assert window_manager.is_configured is True
     assert window_manager.window_state == STATE_UNKNOWN
     assert window_manager.window_auto_state == STATE_UNAVAILABLE
@@ -408,7 +408,7 @@ async def test_window_feature_manager_sensor_event_action_turn_off(
     )
 
     # 3. start listening
-    await window_manager.start_listening()
+    window_manager.start_listening()
     assert len(window_manager._active_listener) == 1
 
     # 4. test refresh with the parametrized
@@ -535,7 +535,7 @@ async def test_window_feature_manager_event_sensor_action_frost_only(
     )
 
     # 3. start listening
-    await window_manager.start_listening()
+    window_manager.start_listening()
 
     # 4. test refresh with the parametrized
     # fmt:off
@@ -660,7 +660,7 @@ async def test_window_feature_manager_window_auto(
         }
     )
     assert window_manager.is_window_auto_configured is True
-    await window_manager.start_listening()
+    window_manager.start_listening()
 
     # 2. Call manage window auto
     tz = get_tz(hass)  # pylint: disable=invalid-name