With enable + tests + hysteresis in calculation

Allow calculation even if slope is None
Change algo to take slop into account
2024-11-01 10:24:35 +00:00 · 2024-10-31 22:29:30 +00:00 · 2024-10-31 21:57:55 +00:00 · 2024-10-31 21:30:44 +00:00 · 2024-10-31 11:48:52 +00:00 · 2024-10-31 11:48:01 +00:00
23 changed files with 484 additions and 784 deletions
--- a/.github/ISSUE_TEMPLATE/issue.md
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -4,8 +4,6 @@ about: Create a report to help us improve

 ---

-> 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. -->

 <!-- Before you open a new issue, search through the existing issues to see if others have had the same problem.
--- a/README-fr.md
+++ b/README-fr.md
@@ -31,7 +31,6 @@
      - [Compensation de la température interne](#compensation-de-la-température-interne)
      - [Synthèse de l'algorithme d'auto-régulation](#synthèse-de-lalgorithme-dauto-régulation)
      - [Le mode auto-fan](#le-mode-auto-fan)
-      - [Le démarrage / arrêt automatique](#le-démarrage--arrêt-automatique)
    - [Pour un thermostat de type ```thermostat_over_valve```:](#pour-un-thermostat-de-type-thermostat_over_valve)
  - [Configurez les coefficients de l'algorithme TPI](#configurez-les-coefficients-de-lalgorithme-tpi)
  - [Configurer les températures préréglées](#configurer-les-températures-préréglées)
@@ -93,9 +92,6 @@ Ce composant personnalisé pour Home Assistant est une mise à niveau et est une


 > ![Nouveau](images/new-icon.png) _*Historique des dernières versions*_
-> * **Release 6.5** :
->   - Ajout d'une nouvelle fonction permettant l'arrêt et la relance automatique d'un VTherm `over_climate` [585](https://github.com/jmcollin78/versatile_thermostat/issues/585)
->   - Amélioration de la gestion des ouvertures au démarrage. Permet de mémoriser et de recalculer l'état d'une ouverture au redémarage de Home Assistant [504](https://github.com/jmcollin78/versatile_thermostat/issues/504)
 > * **Release 6.0** :
 >   - Ajout d'entités du domaine Number permettant de configurer les températures des presets [354](https://github.com/jmcollin78/versatile_thermostat/issues/354)
 >   - Refonte complète du menu de configuration pour supprimer les températures et utililsation d'un menu au lieu d'un tunnel de configuration [354](https://github.com/jmcollin78/versatile_thermostat/issues/354)
@@ -104,14 +100,14 @@ Ce composant personnalisé pour Home Assistant est une mise à niveau et est une
 >   - ajout de seuils de régulation pour les `over_valve` pour éviter de trop vider la batterie des TRV [#338](https://github.com/jmcollin78/versatile_thermostat/issues/338),
 >   - ajout d'une option permettant d'utiliser la température interne d'un TRV pour forcer l' auto-régulation [#348](https://github.com/jmcollin78/versatile_thermostat/issues/348),
 >   - ajout d'une fonction de keep-alive pour les VTherm `over_switch` [#345](https://github.com/jmcollin78/versatile_thermostat/issues/345)
-
-<details>
-<summary>Autres versions</summary>
-
 > * **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 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).
+
+<details>
+<summary>Autres versions</summary>
+
 > * **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 .
 > * **Release 4.1** : Ajout d'un mode de régulation **Expert** dans lequel l'utilisateur peut spécifier ses propres paramètres d'auto-régulation au lieu d'utiliser les pre-programmés [#194](https://github.com/jmcollin78/versatile_thermostat/issues/194).
@@ -514,17 +510,6 @@ Il faut évidemment que votre équipement sous-jacent soit équipée d'une venti
 Si votre équipement ne comprend pas le mode Turbo, le mode Forte` sera utilisé en remplacement.
 Une fois l'écart de température redevenu faible, la ventilation se mettra dans un mode "normal" qui dépend de votre équipement à savoir (dans l'ordre) : `Silence (mute)`, `Auto (auto)`, `Faible (low)`. La première valeur qui est possible pour votre équipement sera choisie.

-#### Le démarrage / arrêt automatique
-Cette fonction a été introduite en 6.5.0. Elle permet d'autoriser VTherm a stopper un équipement qui n'a pas besoin d'être allumé et de le redémarrer lorsque les conditions le réclame. Cette fonction est munie de 3 réglages qui permettent d'arrêter / relancer plus ou moins rapidement l'équipement.
-
-Pour l'utiliser, vous devez :
-1. Ajouter la fonction `Avec démmarrage et extinction automatique` dans le menu 'Fonctions',
-2. Paramétrer le niveau de détection dans l'option 'Allumage/extinction automatique' qui s'affiche lorsque la fonction a été activée. Vous choisissez le niveau de détection entre 'Lent', 'Moyen' et 'Rapide'. Les arrêts/relances seront plus nombreux avec le niveau 'Rapide'.
-
-Une fois paramétré, vous aurez maintenant une nouvelle entité de type `switch` qui vous permet d'autoriser ou non l'arrêt/relance automatique sans toucher à la configuration. Cette entité est disponible sur l'appareil VTherm et se nomme `switch.<name>_enable_auto_start_stop`. Cochez la pour autoriser le démarrage et extinction automatique.
-
-L'algorithme de détection est décrit [ici](https://github.com/jmcollin78/versatile_thermostat/issues/585).
-
 ### Pour un thermostat de type ```thermostat_over_valve```:
 ![image](images/config-linked-entity3.png)
 Vous pouvez choisir jusqu'à entité du domaine ```number``` ou ```ìnput_number``` qui vont commander les vannes.
@@ -926,8 +911,6 @@ context:
 | ``central_boiler_activation_service``     | Service d'activation de la chaudière                                              | -             | -                   | -            | X                        |
 | ``central_boiler_deactivation_service``   | Service de desactivation de la chaudière                                          | -             | -                   | -            | X                        |
 | ``used_by_controls_central_boiler``       | Indique si le VTherm contrôle la chaudière centrale                               | X             | X                   | X            | -                        |
-| ``use_auto_start_stop_feature``           | Indique si la fonction de démarrage/extinction automatique est activée            | -             | X                   | -            | -                        |
-| ``auto_start_stop_lvel``                  | Le niveau de détection de l'auto start/stop                                       | -             | X                   | -            | -                        |
 </details>

 # Exemples de réglage
@@ -1185,9 +1168,6 @@ Les attributs personnalisés sont les suivants :
 | ``is_controlled_by_central_mode`` | True si le VTherm peut être controlé de façon centrale                                                                                                                   |
 | ``last_central_mode``             | Le dernier mode central utilisé (None si le VTherm n'est pas controlé en central)                                                                                        |
 | ``is_used_by_central_boiler``     | Indique si le VTherm peut contrôler la chaudière centrale                                                                                                                |
-| ``auto_start_stop_enable``        | Indique si le VTherm est autorisé à s'auto démarrer/arrêter                                                                                                              |
-| ``auto_start_stop_level``         | Indique le niveau d'auto start/stop                                                                                                                                      |
-| ``hvac_off_reason``               | Indique la raison de l'arrêt (hvac_off) du VTherm. Ce peut être Window, Auto-start/stop ou Manuel                                                                        |

 # Quelques résultats

--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@
      - [Internal temperature compensation](#internal-temperature-compensation)
      - [synthesis of the self-regulation algorithm](#synthesis-of-the-self-regulation-algorithm)
      - [Auto-fan mode](#auto-fan-mode)
-      - [Automatic start/stop](#automatic-startstop)
    - [For a thermostat of type ```thermostat_over_valve```:](#for-a-thermostat-of-type-thermostat_over_valve)
  - [Configure the TPI algorithm coefficients](#configure-the-tpi-algorithm-coefficients)
  - [Configure the preset temperature](#configure-the-preset-temperature)
@@ -94,9 +93,6 @@
 This custom component for Home Assistant is an upgrade and is a complete rewrite of the component "Awesome thermostat" (see [Github](https://github.com/dadge/awesome_thermostat)) with addition of features.

 >![New](images/new-icon.png) _*Latest releases*_
-> * **Release 6.5** :
-> - Added a new function allowing the automatic shutdown and restart of a VTherm `over_climate` [585](https://github.com/jmcollin78/versatile_thermostat/issues/585)
-> - Improved management of openings at startup. Allows to memorize and recalculate the state of an opening when restarting Home Assistant [504](https://github.com/jmcollin78/versatile_thermostat/issues/504)
 > * **Release 6.0**:
 > - Added entities from the Number domain to configure preset temperatures [354](https://github.com/jmcollin78/versatile_thermostat/issues/354)
 > - Complete redesign of the configuration menu to remove temperatures and use a menu instead of a configuration tunnel [354](https://github.com/jmcollin78/versatile_thermostat/issues/354)
@@ -105,13 +101,13 @@ This custom component for Home Assistant is an upgrade and is a complete rewrite
 >   - addition of regulation thresholds for the `over_valve` to avoid draining the TRV battery too much [#338](https://github.com/jmcollin78/versatile_thermostat/issues/338),
 >   - added an option allowing the internal temperature of a TRV to be used to force self-regulation [#348](https://github.com/jmcollin78/versatile_thermostat/issues/348),
 >   - added a keep-alive function for VTherm `over_switch` [#345](https://github.com/jmcollin78/versatile_thermostat/issues/345)
-<details>
-<summary>Others releases</summary>
-
 > * **Release 5.3**: Added a central boiler control function [#234](https://github.com/jmcollin78/versatile_thermostat/issues/234) - more information here: [Controlling a central boiler](#controlling-a-central-boiler). Added the ability to disable security mode for outdoor thermometer [#343](https://github.com/jmcollin78/versatile_thermostat/issues/343)
 > * **Release 5.2**: Added a `central_mode` allowing all VTherms to be controlled centrally [#158](https://github.com/jmcollin78/versatile_thermostat/issues/158).
 > * **Release 5.1**: Limitation of the values sent to the valves and the temperature sent to the underlying climate.
 > * **Release 5.0**: Added a central configuration allowing the sharing of attributes that can be shared [#239](https://github.com/jmcollin78/versatile_thermostat/issues/239).
+<details>
+<summary>Others releases</summary>
+
 > * **Release 4.3**: Added an auto-fan mode for the `over_climate` type allowing ventilation to be activated if the temperature difference is significant [#223](https://github.com/jmcollin78/versatile_thermostat/issues/223).
 > * **Release 4.2**: The calculation of the slope of the temperature curve is now done in °/hour and no longer in °/min [#242](https://github.com/jmcollin78/versatile_thermostat/issues/242). Correction of automatic detection of openings by adding smoothing of the temperature curve.
 > * **Release 4.1**: Added an **Expert** regulation mode in which the user can specify their own auto-regulation parameters instead of using the pre-programmed ones [#194]( https://github.com/jmcollin78/versatile_thermostat/issues/194).
@@ -504,17 +500,6 @@ Obviously your underlying equipment must be equipped with ventilation and be con
 If your equipment does not include Turbo mode, Forte` mode will be used as a replacement.
 Once the temperature difference becomes low again, the ventilation will go into a "normal" mode which depends on your equipment, namely (in order): `Silence (mute)`, `Auto (auto)`, `Low (low)`. The first value that is possible for your equipment will be chosen.

-#### Automatic start/stop
-This function was introduced in 6.5.0. It allows VTherm to stop equipment that does not need to be turned on and to restart it when conditions require it. This function has 3 settings that allow the equipment to be stopped/restarted more or less quickly.
-
-To use it, you must:
-1. Add the `Use the auto start and stop feature` function in the 'Features' menu,
-2. Set the detection level in the `Auto start and stop` option that is displayed when the function has been activated. You choose the detection level between 'Slow', 'Medium' and 'Fast'. The 'Fast' level will result in more shutdowns/restarts.
-
-Once configured, you will now have a new entity of type `switch` that allows you to authorize or not the automatic shutdown/restart without touching the configuration. This entity is available on the VTherm device and is called `switch.<name>_enable_auto_start_stop`. Check it to authorize the automatic startup and shutdown.
-
-The detection algorithm is described [here](https://github.com/jmcollin78/versatile_thermostat/issues/585).
-
 ### For a thermostat of type ```thermostat_over_valve```:
 ![image](images/config-linked-entity3.png)
 You can choose up to domain entity ```number``` or ```ìnput_number``` which will control the valves.
@@ -915,8 +900,6 @@ context:
 | ``central_boiler_activation_service``     | Activation service of the boiler                                              | -             | -                   | -            | X                       |
 | ``central_boiler_deactivation_service``   | Deactivaiton service of the boiler                                            | -             | -                   | -            | X                       |
 | ``used_by_controls_central_boiler``       | Indicate if the VTherm control the central boiler                             | X             | X                   | X            | -                       |
-| ``use_auto_start_stop_feature``           | Indique si la fonction de démarrage/extinction automatique est activée        | -             | X                   | -            | -                       |
-| ``auto_start_stop_lvel``                  | Le niveau de détection de l'auto start/stop                                   | -             | X                   | -            | -                       |
 </details>

 # Tuning examples
@@ -1172,9 +1155,6 @@ Custom attributes are the following:
 | ``is_controlled_by_central_mode`` | True if the VTherm can be centrally controlled                                                                                   |
 | ``last_central_mode``             | The last central mode used (None if the VTherm is not centrally controlled)                                                      |
 | ``is_used_by_central_boiler``     | Indicate if the VTherm can control the central boiler                                                                            |
-| ``auto_start_stop_enable``        | Indicate if the VTherm is allowed to do auto start and stop                                                                      |
-| ``auto_start_stop_level``         | Give the level of auto start/stop                                                                                                |
-| ``hvac_off_reason``               | Give the reason of stop of the VTherm. This could be Window, Auto-start/stop or Manual                                           |

 # Some results

--- a/custom_components/versatile_thermostat/init.py
+++ b/custom_components/versatile_thermostat/init.py
@@ -38,22 +38,6 @@ from .const import (
    CONF_USE_CENTRAL_BOILER_FEATURE,
    CONF_POWER_SENSOR,
    CONF_PRESENCE_SENSOR,
-    CONF_UNDERLYING_LIST,
-    CONF_HEATER,
-    CONF_HEATER_2,
-    CONF_HEATER_3,
-    CONF_HEATER_4,
-    CONF_CLIMATE,
-    CONF_CLIMATE_2,
-    CONF_CLIMATE_3,
-    CONF_CLIMATE_4,
-    CONF_VALVE,
-    CONF_VALVE_2,
-    CONF_VALVE_3,
-    CONF_VALVE_4,
-    CONF_THERMOSTAT_SWITCH,
-    CONF_THERMOSTAT_CLIMATE,
-    CONF_THERMOSTAT_VALVE,
 )

 from .vtherm_api import VersatileThermostatAPI
@@ -224,9 +208,10 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry):
        )
        new = {**config_entry.data}

-        thermostat_type = config_entry.data.get(CONF_THERMOSTAT_TYPE)
-
-        if thermostat_type == CONF_THERMOSTAT_CENTRAL_CONFIG:
+        if (
+            config_entry.data.get(CONF_THERMOSTAT_TYPE)
+            == CONF_THERMOSTAT_CENTRAL_CONFIG
+        ):
            new[CONF_USE_WINDOW_FEATURE] = True
            new[CONF_USE_MOTION_FEATURE] = True
            new[CONF_USE_POWER_FEATURE] = new.get(CONF_POWER_SENSOR, None) is not None
@@ -238,50 +223,6 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry):
                "add_central_boiler_control", False
            ) or new.get(CONF_USE_CENTRAL_BOILER_FEATURE, False)

-        if config_entry.data.get(CONF_UNDERLYING_LIST, None) is None:
-            underlying_list = []
-            if thermostat_type == CONF_THERMOSTAT_SWITCH:
-                underlying_list = [
-                    config_entry.data.get(CONF_HEATER, None),
-                    config_entry.data.get(CONF_HEATER_2, None),
-                    config_entry.data.get(CONF_HEATER_3, None),
-                    config_entry.data.get(CONF_HEATER_4, None),
-                ]
-            elif thermostat_type == CONF_THERMOSTAT_CLIMATE:
-                underlying_list = [
-                    config_entry.data.get(CONF_CLIMATE, None),
-                    config_entry.data.get(CONF_CLIMATE_2, None),
-                    config_entry.data.get(CONF_CLIMATE_3, None),
-                    config_entry.data.get(CONF_CLIMATE_4, None),
-                ]
-            elif thermostat_type == CONF_THERMOSTAT_VALVE:
-                underlying_list = [
-                    config_entry.data.get(CONF_VALVE, None),
-                    config_entry.data.get(CONF_VALVE_2, None),
-                    config_entry.data.get(CONF_VALVE_3, None),
-                    config_entry.data.get(CONF_VALVE_4, None),
-                ]
-
-            new[CONF_UNDERLYING_LIST] = [
-                entity for entity in underlying_list if entity is not None
-            ]
-
-            for key in [
-                CONF_HEATER,
-                CONF_HEATER_2,
-                CONF_HEATER_3,
-                CONF_HEATER_4,
-                CONF_CLIMATE,
-                CONF_CLIMATE_2,
-                CONF_CLIMATE_3,
-                CONF_CLIMATE_4,
-                CONF_VALVE,
-                CONF_VALVE_2,
-                CONF_VALVE_3,
-                CONF_VALVE_4,
-            ]:
-                new.pop(key, None)
-
        hass.config_entries.async_update_entry(
            config_entry,
            data=new,
--- a/custom_components/versatile_thermostat/base_thermostat.py
+++ b/custom_components/versatile_thermostat/base_thermostat.py
@@ -62,7 +62,72 @@ from homeassistant.const import (
    STATE_NOT_HOME,
 )

-from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .const import (
+    DOMAIN,
+    DEVICE_MANUFACTURER,
+    CONF_POWER_SENSOR,
+    CONF_TEMP_SENSOR,
+    CONF_LAST_SEEN_TEMP_SENSOR,
+    CONF_EXTERNAL_TEMP_SENSOR,
+    CONF_MAX_POWER_SENSOR,
+    CONF_WINDOW_SENSOR,
+    CONF_WINDOW_DELAY,
+    CONF_WINDOW_AUTO_CLOSE_THRESHOLD,
+    CONF_WINDOW_AUTO_OPEN_THRESHOLD,
+    CONF_WINDOW_AUTO_MAX_DURATION,
+    CONF_MOTION_SENSOR,
+    CONF_MOTION_DELAY,
+    CONF_MOTION_OFF_DELAY,
+    CONF_MOTION_PRESET,
+    CONF_NO_MOTION_PRESET,
+    CONF_DEVICE_POWER,
+    CONF_PRESETS,
+    # CONF_PRESETS_AWAY,
+    # CONF_PRESETS_WITH_AC,
+    # CONF_PRESETS_AWAY_WITH_AC,
+    CONF_CYCLE_MIN,
+    CONF_PROP_FUNCTION,
+    CONF_TPI_COEF_INT,
+    CONF_TPI_COEF_EXT,
+    CONF_PRESENCE_SENSOR,
+    CONF_PRESET_POWER,
+    SUPPORT_FLAGS,
+    PRESET_FROST_PROTECTION,
+    PRESET_POWER,
+    PRESET_SECURITY,
+    PROPORTIONAL_FUNCTION_TPI,
+    PRESET_AWAY_SUFFIX,
+    CONF_SECURITY_DELAY_MIN,
+    CONF_SECURITY_MIN_ON_PERCENT,
+    CONF_SECURITY_DEFAULT_ON_PERCENT,
+    DEFAULT_SECURITY_MIN_ON_PERCENT,
+    DEFAULT_SECURITY_DEFAULT_ON_PERCENT,
+    CONF_MINIMAL_ACTIVATION_DELAY,
+    CONF_USE_MAIN_CENTRAL_CONFIG,
+    CONF_USE_TPI_CENTRAL_CONFIG,
+    CONF_USE_PRESETS_CENTRAL_CONFIG,
+    CONF_USE_WINDOW_CENTRAL_CONFIG,
+    CONF_USE_MOTION_CENTRAL_CONFIG,
+    CONF_USE_POWER_CENTRAL_CONFIG,
+    CONF_USE_PRESENCE_CENTRAL_CONFIG,
+    CONF_USE_ADVANCED_CENTRAL_CONFIG,
+    CONF_USE_PRESENCE_FEATURE,
+    CONF_TEMP_MAX,
+    CONF_TEMP_MIN,
+    HIDDEN_PRESETS,
+    CONF_AC_MODE,
+    EventType,
+    ATTR_MEAN_POWER_CYCLE,
+    ATTR_TOTAL_ENERGY,
+    PRESET_AC_SUFFIX,
+    DEFAULT_SHORT_EMA_PARAMS,
+    CENTRAL_MODE_AUTO,
+    CENTRAL_MODE_STOPPED,
+    CENTRAL_MODE_HEAT_ONLY,
+    CENTRAL_MODE_COOL_ONLY,
+    CENTRAL_MODE_FROST_PROTECTION,
+    send_vtherm_event,
+)

 from .config_schema import *  # pylint: disable=wildcard-import, unused-wildcard-import

@@ -239,8 +304,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):

        self._use_central_config_temperature = False

-        self._hvac_off_reason: HVAC_OFF_REASONS | None = None
-
        self.post_init(entry_infos)

    def clean_central_config_doublon(
@@ -786,24 +849,18 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            else:
                self._attr_preset_mode = PRESET_NONE

-            # Restore old hvac_off_reason
-            self._hvac_off_reason = old_state.attributes.get(HVAC_OFF_REASON_NAME, None)
-
            if old_state.state in [
                HVACMode.OFF,
                HVACMode.HEAT,
                HVACMode.COOL,
            ]:
                self._hvac_mode = old_state.state
-
-            # restpre also saved info so that window detection will work
-            self._saved_hvac_mode = old_state.attributes.get("saved_hvac_mode", None)
-            self._saved_preset_mode = old_state.attributes.get(
-                "saved_preset_mode", None
-            )
+            else:
+                if not self._hvac_mode:
+                    self._hvac_mode = HVACMode.OFF

            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
+            self._total_energy = old_total_energy if old_total_energy else 0

            self.restore_specific_previous_state(old_state)
        else:
@@ -818,14 +875,12 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            )
            self._total_energy = 0

+        self._saved_target_temp = self._target_temp
+
+        # Set default state to off
        if not self._hvac_mode:
            self._hvac_mode = HVACMode.OFF

-        if not self.is_on and self.hvac_off_reason is None:
-            self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
-
-        self._saved_target_temp = self._target_temp
-
        self.send_event(EventType.PRESET_EVENT, {"preset": self._attr_preset_mode})
        self.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": self._hvac_mode})

@@ -933,6 +988,16 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
    @property
    def hvac_mode(self) -> HVACMode | None:
        """Return current operation."""
+        # Issue #114 - returns my current hvac_mode and not the underlying hvac_mode which could be different
+        # delta will be managed by climate_state_change event.
+        # if self.is_over_climate:
+        # if one not OFF -> return it
+        # else OFF
+        #    for under in self._underlyings:
+        #        if (mode := under.hvac_mode) not in [HVACMode.OFF]
+        #            return mode
+        #    return HVACMode.OFF
+
        return self._hvac_mode

    @property
@@ -1129,13 +1194,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        """True if this VTHerm uses the central configuration temperature"""
        return self._use_central_config_temperature

-    @property
-    def hvac_off_reason(self) -> HVAC_OFF_REASONS:
-        """Returns the reason of the last switch to HVAC_OFF
-        This is useful for features that turns off the VTherm like
-        window detection or auto-start-stop"""
-        return self._hvac_off_reason
-
    def underlying_entity_id(self, index=0) -> str | None:
        """The climate_entity_id. Added for retrocompatibility reason"""
        if index < self.nb_underlying_entities:
@@ -1198,10 +1256,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):

        # Ensure we update the current operation after changing the mode
        self.reset_last_temperature_time()
-        self.reset_last_change_time()

-        if self._hvac_mode != HVACMode.OFF:
-            self.set_hvac_off_reason(None)
+        self.reset_last_change_time()

        self.update_custom_attributes()
        self.async_write_ha_state()
@@ -1705,19 +1761,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        for under in self._underlyings:
            await under.check_initial_state(self._hvac_mode)

-        # Prevent from starting a VTherm if window is open
-        if (
-            self.is_window_auto_enabled
-            and self._window_sensor_entity_id is not None
-            and self._hass.states.is_state(self._window_sensor_entity_id, STATE_ON)
-            and self.is_on
-            and self.window_action == CONF_WINDOW_TURN_OFF
-        ):
-            _LOGGER.info("%s - the window is open. Prevent starting the VTherm")
-            self._window_auto_state = True
-            self.save_hvac_mode()
-            await self.async_set_hvac_mode(HVACMode.OFF)
-
        # Starts the initial control loop (don't wait for an update of temperature)
        await self.async_control_heating(force=True)

@@ -2054,10 +2097,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            self._hvac_mode,
        )

-    def set_hvac_off_reason(self, hvac_off_reason: HVAC_OFF_REASONS):
-        """Set the reason of hvac_off"""
-        self._hvac_off_reason = hvac_off_reason
-
    async def restore_hvac_mode(self, need_control_heating=False):
        """Restore a previous hvac_mod"""
        await self.async_set_hvac_mode(self._saved_hvac_mode, need_control_heating)
@@ -2189,16 +2228,13 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            if self.window_state is not STATE_ON and not first_init:
                await self.restore_hvac_mode()
                await self.restore_preset_mode()
-            elif self.window_state is STATE_ON 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)
+
            return

        if old_central_mode == CENTRAL_MODE_AUTO and self.window_state is not STATE_ON:
            save_all()

        if new_central_mode == CENTRAL_MODE_STOPPED:
-            self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
            await self.async_set_hvac_mode(HVACMode.OFF)
            return

@@ -2206,7 +2242,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            if HVACMode.COOL in self.hvac_modes:
                await self.async_set_hvac_mode(HVACMode.COOL)
            else:
-                self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
                await self.async_set_hvac_mode(HVACMode.OFF)
            return

@@ -2214,7 +2249,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            if HVACMode.HEAT in self.hvac_modes:
                await self.async_set_hvac_mode(HVACMode.HEAT)
            else:
-                self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
                await self.async_set_hvac_mode(HVACMode.OFF)
            return

@@ -2228,7 +2262,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                    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)
            return

@@ -2408,27 +2441,17 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        """Change the window detection state.
        new_state is on if an open window have been detected or off else
        """
-        if new_state is False:
+        if not new_state:
            _LOGGER.info(
-                "%s - Window is closed. Restoring hvac_mode '%s' if stopped by window detection or temperature %s",
+                "%s - Window is closed. Restoring hvac_mode '%s' if central_mode is not STOPPED",
                self,
                self._saved_hvac_mode,
-                self._saved_target_temp,
            )
            if self._window_action in [CONF_WINDOW_FROST_TEMP, CONF_WINDOW_ECO_TEMP]:
                await self._async_internal_set_temperature(self._saved_target_temp)
-
            # default to TURN_OFF
-            elif self._window_action in [CONF_WINDOW_TURN_OFF]:
-                if (
-                    self.last_central_mode != CENTRAL_MODE_STOPPED
-                    and self.hvac_off_reason == HVAC_OFF_REASON_WINDOW_DETECTION
-                ):
-                    self.set_hvac_off_reason(None)
-                    await self.restore_hvac_mode(True)
-            elif self._window_action in [CONF_WINDOW_FAN_ONLY]:
+            elif self._window_action in [CONF_WINDOW_TURN_OFF, CONF_WINDOW_FAN_ONLY]:
                if self.last_central_mode != CENTRAL_MODE_STOPPED:
-                    self.set_hvac_off_reason(None)
                    await self.restore_hvac_mode(True)
            else:
                _LOGGER.error(
@@ -2440,12 +2463,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            _LOGGER.info(
                "%s - Window is open. Set hvac_mode to '%s'", self, HVACMode.OFF
            )
-            if self._window_action == CONF_WINDOW_TURN_OFF and not self.is_on:
-                _LOGGER.debug(
-                    "%s is already off. Forget turning off VTherm due to window detection"
-                )
-                return
-
            if self.last_central_mode in [CENTRAL_MODE_AUTO, None]:
                if self._window_action in [CONF_WINDOW_TURN_OFF, CONF_WINDOW_FAN_ONLY]:
                    self.save_hvac_mode()
@@ -2475,7 +2492,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                    self.find_preset_temp(PRESET_ECO)
                )
            else:  # default is to turn_off
-                self.set_hvac_off_reason(HVAC_OFF_REASON_WINDOW_DETECTION)
                await self.async_set_hvac_mode(HVACMode.OFF)

    async def async_control_heating(self, force=False, _=None) -> bool:
@@ -2619,7 +2635,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            "ema_temp": self._ema_temp,
            "is_used_by_central_boiler": self.is_used_by_central_boiler,
            "temperature_slope": round(self.last_temperature_slope or 0, 3),
-            "hvac_off_reason": self.hvac_off_reason,
        }

    @callback
--- a/custom_components/versatile_thermostat/config_flow.py
+++ b/custom_components/versatile_thermostat/config_flow.py
@@ -165,7 +165,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):

        # check the heater_entity_id
        for conf in [
-            CONF_UNDERLYING_LIST,
+            CONF_HEATER,
            CONF_TEMP_SENSOR,
            CONF_EXTERNAL_TEMP_SENSOR,
            CONF_WINDOW_SENSOR,
@@ -173,17 +173,15 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            CONF_POWER_SENSOR,
            CONF_MAX_POWER_SENSOR,
            CONF_PRESENCE_SENSOR,
+            CONF_CLIMATE,
        ]:
            d = data.get(conf, None)  # pylint: disable=invalid-name
-            if not isinstance(d, list):
-                d = [d]
-            for e in d:
-                if e is not None and self.hass.states.get(e) is None:
-                    _LOGGER.error(
-                        "Entity id %s doesn't have any state. We cannot use it in the Versatile Thermostat configuration",  # pylint: disable=line-too-long
-                        e,
-                    )
-                    raise UnknownEntity(conf)
+            if d is not None and self.hass.states.get(d) is None:
+                _LOGGER.error(
+                    "Entity id %s doesn't have any state. We cannot use it in the Versatile Thermostat configuration",  # pylint: disable=line-too-long
+                    d,
+                )
+                raise UnknownEntity(conf)

        # Check that only one window feature is used
        ws = self._infos.get(CONF_WINDOW_SENSOR)  # pylint: disable=invalid-name
@@ -272,8 +270,21 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            ):
                return False

-            if infos.get(CONF_UNDERLYING_LIST, None) is not None and not infos.get(
-                CONF_UNDERLYING_LIST, None
+            if (
+                infos.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_SWITCH
+                and infos.get(CONF_HEATER, None) is None
+            ):
+                return False
+
+            if (
+                infos.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_CLIMATE
+                and infos.get(CONF_CLIMATE, None) is None
+            ):
+                return False
+
+            if (
+                infos.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE
+                and infos.get(CONF_VALVE, None) is None
            ):
                return False

--- a/custom_components/versatile_thermostat/config_schema.py
+++ b/custom_components/versatile_thermostat/config_schema.py
@@ -119,10 +119,17 @@ 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], multiple=True
-            ),
+        vol.Required(CONF_HEATER): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN]),
+        ),
+        vol.Optional(CONF_HEATER_2): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN]),
+        ),
+        vol.Optional(CONF_HEATER_3): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN]),
+        ),
+        vol.Optional(CONF_HEATER_4): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN]),
        ),
        vol.Optional(CONF_HEATER_KEEP_ALIVE): cv.positive_int,
        vol.Required(CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI): vol.In(
@@ -137,8 +144,17 @@ STEP_THERMOSTAT_SWITCH = vol.Schema(  # pylint: disable=invalid-name

 STEP_THERMOSTAT_CLIMATE = vol.Schema(  # pylint: disable=invalid-name
    {
-        vol.Required(CONF_UNDERLYING_LIST): selector.EntitySelector(
-            selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN, multiple=True),
+        vol.Required(CONF_CLIMATE): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+        ),
+        vol.Optional(CONF_CLIMATE_2): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+        ),
+        vol.Optional(CONF_CLIMATE_3): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+        ),
+        vol.Optional(CONF_CLIMATE_4): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
        ),
        vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
        vol.Optional(
@@ -167,10 +183,17 @@ STEP_THERMOSTAT_CLIMATE = vol.Schema(  # pylint: disable=invalid-name

 STEP_THERMOSTAT_VALVE = vol.Schema(  # pylint: disable=invalid-name
    {
-        vol.Required(CONF_UNDERLYING_LIST): selector.EntitySelector(
-            selector.EntitySelectorConfig(
-                domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN], multiple=True
-            ),
+        vol.Required(CONF_VALVE): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]),
+        ),
+        vol.Optional(CONF_VALVE_2): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]),
+        ),
+        vol.Optional(CONF_VALVE_3): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]),
+        ),
+        vol.Optional(CONF_VALVE_4): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]),
        ),
        vol.Required(CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI): vol.In(
            [
--- a/custom_components/versatile_thermostat/const.py
+++ b/custom_components/versatile_thermostat/const.py
@@ -23,8 +23,8 @@ from .prop_algorithm import (

 _LOGGER = logging.getLogger(__name__)

-CONFIG_VERSION = 2
-CONFIG_MINOR_VERSION = 0
+CONFIG_VERSION = 1
+CONFIG_MINOR_VERSION = 2

 PRESET_TEMP_SUFFIX = "_temp"
 PRESET_AC_SUFFIX = "_ac"
@@ -55,7 +55,10 @@ PLATFORMS: list[Platform] = [
    Platform.SWITCH,
 ]

-CONF_UNDERLYING_LIST = "underlying_entity_ids"
+CONF_HEATER = "heater_entity_id"
+CONF_HEATER_2 = "heater_entity2_id"
+CONF_HEATER_3 = "heater_entity3_id"
+CONF_HEATER_4 = "heater_entity4_id"
 CONF_HEATER_KEEP_ALIVE = "heater_keep_alive"
 CONF_TEMP_SENSOR = "temperature_sensor_entity_id"
 CONF_LAST_SEEN_TEMP_SENSOR = "last_seen_temperature_sensor_entity_id"
@@ -87,6 +90,10 @@ CONF_THERMOSTAT_CENTRAL_CONFIG = "thermostat_central_config"
 CONF_THERMOSTAT_SWITCH = "thermostat_over_switch"
 CONF_THERMOSTAT_CLIMATE = "thermostat_over_climate"
 CONF_THERMOSTAT_VALVE = "thermostat_over_valve"
+CONF_CLIMATE = "climate_entity_id"
+CONF_CLIMATE_2 = "climate_entity2_id"
+CONF_CLIMATE_3 = "climate_entity3_id"
+CONF_CLIMATE_4 = "climate_entity4_id"
 CONF_USE_WINDOW_FEATURE = "use_window_feature"
 CONF_USE_MOTION_FEATURE = "use_motion_feature"
 CONF_USE_PRESENCE_FEATURE = "use_presence_feature"
@@ -97,6 +104,10 @@ CONF_AC_MODE = "ac_mode"
 CONF_WINDOW_AUTO_OPEN_THRESHOLD = "window_auto_open_threshold"
 CONF_WINDOW_AUTO_CLOSE_THRESHOLD = "window_auto_close_threshold"
 CONF_WINDOW_AUTO_MAX_DURATION = "window_auto_max_duration"
+CONF_VALVE = "valve_entity_id"
+CONF_VALVE_2 = "valve_entity2_id"
+CONF_VALVE_3 = "valve_entity3_id"
+CONF_VALVE_4 = "valve_entity4_id"
 CONF_AUTO_REGULATION_MODE = "auto_regulation_mode"
 CONF_AUTO_REGULATION_NONE = "auto_regulation_none"
 CONF_AUTO_REGULATION_SLOW = "auto_regulation_slow"
@@ -116,20 +127,6 @@ CONF_AUTO_FAN_HIGH = "auto_fan_high"
 CONF_AUTO_FAN_TURBO = "auto_fan_turbo"
 CONF_STEP_TEMPERATURE = "step_temperature"

-# Deprecated
-CONF_HEATER = "heater_entity_id"
-CONF_HEATER_2 = "heater_entity2_id"
-CONF_HEATER_3 = "heater_entity3_id"
-CONF_HEATER_4 = "heater_entity4_id"
-CONF_CLIMATE = "climate_entity_id"
-CONF_CLIMATE_2 = "climate_entity2_id"
-CONF_CLIMATE_3 = "climate_entity3_id"
-CONF_CLIMATE_4 = "climate_entity4_id"
-CONF_VALVE = "valve_entity_id"
-CONF_VALVE_2 = "valve_entity2_id"
-CONF_VALVE_3 = "valve_entity3_id"
-CONF_VALVE_4 = "valve_entity4_id"
-
 # Global params into configuration.yaml
 CONF_SHORT_EMA_PARAMS = "short_ema_params"
 CONF_SAFETY_MODE = "safety_mode"
@@ -171,16 +168,6 @@ TYPE_AUTO_START_STOP_LEVELS = Literal[  # pylint: disable=invalid-name
    AUTO_START_STOP_LEVEL_NONE,
 ]

-HVAC_OFF_REASON_NAME = "hvac_off_reason"
-HVAC_OFF_REASON_MANUAL = "manual"
-HVAC_OFF_REASON_AUTO_START_STOP = "auto_start_stop"
-HVAC_OFF_REASON_WINDOW_DETECTION = "window_detection"
-HVAC_OFF_REASONS = Literal[  # pylint: disable=invalid-name
-    HVAC_OFF_REASON_MANUAL,
-    HVAC_OFF_REASON_AUTO_START_STOP,
-    HVAC_OFF_REASON_WINDOW_DETECTION,
-]
-
 DEFAULT_SHORT_EMA_PARAMS = {
    "max_alpha": 0.5,
    # In sec
@@ -252,6 +239,10 @@ CONF_PRESETS_AWAY_WITH_AC_VALUES = list(CONF_PRESETS_AWAY_WITH_AC.values())
 ALL_CONF = (
    [
        CONF_NAME,
+        CONF_HEATER,
+        CONF_HEATER_2,
+        CONF_HEATER_3,
+        CONF_HEATER_4,
        CONF_HEATER_KEEP_ALIVE,
        CONF_TEMP_SENSOR,
        CONF_EXTERNAL_TEMP_SENSOR,
@@ -281,12 +272,20 @@ ALL_CONF = (
        CONF_THERMOSTAT_TYPE,
        CONF_THERMOSTAT_SWITCH,
        CONF_THERMOSTAT_CLIMATE,
+        CONF_CLIMATE,
+        CONF_CLIMATE_2,
+        CONF_CLIMATE_3,
+        CONF_CLIMATE_4,
        CONF_USE_WINDOW_FEATURE,
        CONF_USE_MOTION_FEATURE,
        CONF_USE_PRESENCE_FEATURE,
        CONF_USE_POWER_FEATURE,
        CONF_USE_CENTRAL_BOILER_FEATURE,
        CONF_AC_MODE,
+        CONF_VALVE,
+        CONF_VALVE_2,
+        CONF_VALVE_3,
+        CONF_VALVE_4,
        CONF_AUTO_REGULATION_MODE,
        CONF_AUTO_REGULATION_DTEMP,
        CONF_AUTO_REGULATION_PERIOD_MIN,
--- a/custom_components/versatile_thermostat/icons.json
+++ b/custom_components/versatile_thermostat/icons.json
@@ -1,18 +0,0 @@
-{
-  "entity": {
-    "climate": {
-      "versatile_thermostat": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "shedding": "mdi:power-plug-off",
-              "safety": "mdi:shield-alert",
-              "none": "mdi:knob",
-              "frost": "mdi:snowflake"
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/custom_components/versatile_thermostat/manifest.json
+++ b/custom_components/versatile_thermostat/manifest.json
@@ -14,6 +14,6 @@
  "quality_scale": "silver",
  "requirements": [],
  "ssdp": [],
-  "version": "6.6.0",
+  "version": "6.5.0",
  "zeroconf": []
 }
--- a/custom_components/versatile_thermostat/strings.json
+++ b/custom_components/versatile_thermostat/strings.json
@@ -72,10 +72,21 @@
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "underlying_entity_ids": "The device(s) to be controlled",
+          "heater_entity_id": "1st heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "heater_keep_alive": "Switch keep-alive interval in seconds",
          "proportional_function": "Algorithm",
+          "climate_entity_id": "1st underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
          "ac_mode": "AC mode",
+          "valve_entity_id": "1st valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -84,10 +95,21 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
+          "heater_entity_id": "Mandatory heater entity id",
+          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not required",
+          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not required",
+          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not required",
          "heater_keep_alive": "Optional heater switch state refresh interval. Leave empty if not required.",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1st valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
@@ -287,10 +309,21 @@
        "title": "Entities - {name}",
        "description": "Linked entities attributes",
        "data": {
-          "underlying_entity_ids": "The device(s) to be controlled",
+          "heater_entity_id": "1st heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "heater_keep_alive": "Switch keep-alive interval in seconds",
          "proportional_function": "Algorithm",
+          "climate_entity_id": "1st underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
          "ac_mode": "AC mode",
+          "valve_entity_id": "1st valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -299,10 +332,21 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
+          "heater_entity_id": "Mandatory heater entity id",
+          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not used",
+          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
+          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
          "heater_keep_alive": "Optional heater switch state refresh interval. Leave empty if not required.",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1st valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
@@ -492,8 +536,7 @@
            "state": {
              "power": "Shedding",
              "security": "Safety",
-              "none": "Manual",
-              "frost": "Frost"
+              "none": "Manual"
            }
          }
        }
--- a/custom_components/versatile_thermostat/switch.py
+++ b/custom_components/versatile_thermostat/switch.py
@@ -58,7 +58,7 @@ class AutoStartStopEnable(VersatileThermostatBaseEntity, SwitchEntity, RestoreEn
    @property
    def icon(self) -> str | None:
        """The icon"""
-        return "mdi:power-sleep"
+        return "mdi:power-settings"

    async def async_added_to_hass(self):
        await super().async_added_to_hass()
--- a/custom_components/versatile_thermostat/thermostat_climate.py
+++ b/custom_components/versatile_thermostat/thermostat_climate.py
@@ -20,7 +20,42 @@ from .commons import NowClass, round_to_nearest
 from .base_thermostat import BaseThermostat, ConfigData
 from .pi_algorithm import PITemperatureRegulator

-from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .const import (
+    overrides,
+    DOMAIN,
+    CONF_CLIMATE,
+    CONF_CLIMATE_2,
+    CONF_CLIMATE_3,
+    CONF_CLIMATE_4,
+    CONF_AUTO_REGULATION_MODE,
+    CONF_AUTO_REGULATION_NONE,
+    CONF_AUTO_REGULATION_SLOW,
+    CONF_AUTO_REGULATION_LIGHT,
+    CONF_AUTO_REGULATION_MEDIUM,
+    CONF_AUTO_REGULATION_STRONG,
+    CONF_AUTO_REGULATION_EXPERT,
+    CONF_AUTO_REGULATION_DTEMP,
+    CONF_AUTO_REGULATION_PERIOD_MIN,
+    CONF_AUTO_REGULATION_USE_DEVICE_TEMP,
+    CONF_AUTO_FAN_MODE,
+    CONF_AUTO_FAN_NONE,
+    CONF_AUTO_FAN_LOW,
+    CONF_AUTO_FAN_MEDIUM,
+    CONF_AUTO_FAN_HIGH,
+    CONF_AUTO_FAN_TURBO,
+    RegulationParamSlow,
+    RegulationParamLight,
+    RegulationParamMedium,
+    RegulationParamStrong,
+    AUTO_FAN_DTEMP_THRESHOLD,
+    AUTO_FAN_DEACTIVATED_MODES,
+    CONF_USE_AUTO_START_STOP_FEATURE,
+    CONF_AUTO_START_STOP_LEVEL,
+    AUTO_START_STOP_LEVEL_NONE,
+    TYPE_AUTO_START_STOP_LEVELS,
+    UnknownEntity,
+    EventType,
+)

 from .vtherm_api import VersatileThermostatAPI
 from .underlyings import UnderlyingClimate
@@ -65,7 +100,10 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
                {
                    "is_over_climate",
                    "start_hvac_action_date",
-                    "underlying_entities",
+                    "underlying_climate_0",
+                    "underlying_climate_1",
+                    "underlying_climate_2",
+                    "underlying_climate_3",
                    "regulation_accumulated_error",
                    "auto_regulation_mode",
                    "auto_fan_mode",
@@ -97,15 +135,20 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
        """Initialize the Thermostat"""

        super().post_init(config_entry)
-        
-        for climate in config_entry.get(CONF_UNDERLYING_LIST):
-            self._underlyings.append(
-                UnderlyingClimate(
-                    hass=self._hass,
-                    thermostat=self,
-                    climate_entity_id=climate,
+        for climate in [
+            CONF_CLIMATE,
+            CONF_CLIMATE_2,
+            CONF_CLIMATE_3,
+            CONF_CLIMATE_4,
+        ]:
+            if config_entry.get(climate):
+                self._underlyings.append(
+                    UnderlyingClimate(
+                        hass=self._hass,
+                        thermostat=self,
+                        climate_entity_id=config_entry.get(climate),
+                    )
                )
-            )

        self.choose_auto_regulation_mode(
            config_entry.get(CONF_AUTO_REGULATION_MODE)
@@ -496,10 +539,18 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
        self._attr_extra_state_attributes["start_hvac_action_date"] = (
            self._underlying_climate_start_hvac_action_date
        )
-
-        self._attr_extra_state_attributes["underlying_entities"] = [
-            underlying.entity_id for underlying in self._underlyings
-        ]
+        self._attr_extra_state_attributes["underlying_climate_0"] = self._underlyings[
+            0
+        ].entity_id
+        self._attr_extra_state_attributes["underlying_climate_1"] = (
+            self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+        )
+        self._attr_extra_state_attributes["underlying_climate_2"] = (
+            self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+        )
+        self._attr_extra_state_attributes["underlying_climate_3"] = (
+            self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+        )

        if self.is_regulated:
            self._attr_extra_state_attributes["is_regulated"] = self.is_regulated
@@ -861,73 +912,6 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):

        await end_climate_changed(changes)

-    async def check_auto_start_stop(self):
-        """Check the auto-start-stop and an eventual action
-        Return False if we should stop the control_heating method"""
-        slope = (self.last_temperature_slope or 0) / 60  # to have the slope in °/min
-        action = self._auto_start_stop_algo.calculate_action(
-            self.hvac_mode,
-            self._saved_hvac_mode,
-            self.target_temperature,
-            self.current_temperature,
-            slope,
-            self.now,
-        )
-        _LOGGER.debug("%s - auto_start_stop action is %s", self, action)
-        if action == AUTO_START_STOP_ACTION_OFF and self.is_on:
-            _LOGGER.info(
-                "%s - Turning OFF the Vtherm due to auto-start-stop conditions",
-                self,
-            )
-            self.set_hvac_off_reason(HVAC_OFF_REASON_AUTO_START_STOP)
-            await self.async_turn_off()
-
-            # Send an event
-            self.send_event(
-                event_type=EventType.AUTO_START_STOP_EVENT,
-                data={
-                    "type": "stop",
-                    "name": self.name,
-                    "cause": "Auto stop conditions reached",
-                    "hvac_mode": self.hvac_mode,
-                    "saved_hvac_mode": self._saved_hvac_mode,
-                    "target_temperature": self.target_temperature,
-                    "current_temperature": self.current_temperature,
-                    "temperature_slope": round(slope, 3),
-                    "accumulated_error": self._auto_start_stop_algo.accumulated_error,
-                    "accumulated_error_threshold": self._auto_start_stop_algo.accumulated_error_threshold,
-                },
-            )
-
-            # Stop here
-            return False
-        elif action == AUTO_START_STOP_ACTION_ON:
-            _LOGGER.info(
-                "%s - Turning ON the Vtherm due to auto-start-stop conditions", self
-            )
-            await self.async_turn_on()
-
-            # Send an event
-            self.send_event(
-                event_type=EventType.AUTO_START_STOP_EVENT,
-                data={
-                    "type": "start",
-                    "name": self.name,
-                    "cause": "Auto start conditions reached",
-                    "hvac_mode": self.hvac_mode,
-                    "saved_hvac_mode": self._saved_hvac_mode,
-                    "target_temperature": self.target_temperature,
-                    "current_temperature": self.current_temperature,
-                    "temperature_slope": round(slope, 3),
-                    "accumulated_error": self._auto_start_stop_algo.accumulated_error,
-                    "accumulated_error_threshold": self._auto_start_stop_algo.accumulated_error_threshold,
-                },
-            )
-
-            self.update_custom_attributes()
-
-        return True
-
    @overrides
    async def async_control_heating(self, force=False, _=None) -> bool:
        """The main function used to run the calculation at each cycle"""
@@ -935,9 +919,64 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):

        # Check if we need to auto start/stop the Vtherm
        if self.auto_start_stop_enable:
-            continu = await self.check_auto_start_stop()
-            if not continu:
+            slope = (
+                self.last_temperature_slope or 0
+            ) / 60  # to have the slope in °/min
+            action = self._auto_start_stop_algo.calculate_action(
+                self.hvac_mode,
+                self._saved_hvac_mode,
+                self.target_temperature,
+                self.current_temperature,
+                slope,
+                self.now,
+            )
+            _LOGGER.debug("%s - auto_start_stop action is %s", self, action)
+            if action == AUTO_START_STOP_ACTION_OFF:
+                _LOGGER.info(
+                    "%s - Turning OFF the Vtherm due to auto-start-stop conditions",
+                    self,
+                )
+                await self.async_turn_off()
+
+                # Send an event
+                self.send_event(
+                    event_type=EventType.AUTO_START_STOP_EVENT,
+                    data={
+                        "type": "stop",
+                        "name": self.name,
+                        "cause": "Auto stop conditions reached",
+                        "hvac_mode": self.hvac_mode,
+                        "saved_hvac_mode": self._saved_hvac_mode,
+                        "target_temperature": self.target_temperature,
+                        "current_temperature": self.current_temperature,
+                        "temperature_slope": round(slope, 3),
+                    },
+                )
+
+                # Stop here
                return ret
+            elif action == AUTO_START_STOP_ACTION_ON:
+                _LOGGER.info(
+                    "%s - Turning ON the Vtherm due to auto-start-stop conditions", self
+                )
+                await self.async_turn_on()
+
+                # Send an event
+                self.send_event(
+                    event_type=EventType.AUTO_START_STOP_EVENT,
+                    data={
+                        "type": "start",
+                        "name": self.name,
+                        "cause": "Auto start conditions reached",
+                        "hvac_mode": self.hvac_mode,
+                        "saved_hvac_mode": self._saved_hvac_mode,
+                        "target_temperature": self.target_temperature,
+                        "current_temperature": self.current_temperature,
+                        "temperature_slope": round(slope, 3),
+                    },
+                )
+
+                self.update_custom_attributes()
        else:
            _LOGGER.debug("%s - auto start/stop is disabled")

--- a/custom_components/versatile_thermostat/thermostat_switch.py
+++ b/custom_components/versatile_thermostat/thermostat_switch.py
@@ -10,7 +10,10 @@ from homeassistant.helpers.event import (
 from homeassistant.components.climate import HVACMode

 from .const import (
-    CONF_UNDERLYING_LIST,
+    CONF_HEATER,
+    CONF_HEATER_2,
+    CONF_HEATER_3,
+    CONF_HEATER_4,
    CONF_HEATER_KEEP_ALIVE,
    CONF_INVERSE_SWITCH,
    overrides,
@@ -32,7 +35,10 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
                {
                    "is_over_switch",
                    "is_inversed",
-                    "underlying_entities",
+                    "underlying_switch_0",
+                    "underlying_switch_1",
+                    "underlying_switch_2",
+                    "underlying_switch_3",
                    "on_time_sec",
                    "off_time_sec",
                    "cycle_min",
@@ -84,7 +90,13 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
            self.name,
        )

-        lst_switches = config_entry.get(CONF_UNDERLYING_LIST)
+        lst_switches = [config_entry.get(CONF_HEATER)]
+        if config_entry.get(CONF_HEATER_2):
+            lst_switches.append(config_entry.get(CONF_HEATER_2))
+        if config_entry.get(CONF_HEATER_3):
+            lst_switches.append(config_entry.get(CONF_HEATER_3))
+        if config_entry.get(CONF_HEATER_4):
+            lst_switches.append(config_entry.get(CONF_HEATER_4))

        delta_cycle = self._cycle_min * 60 / len(lst_switches)
        for idx, switch in enumerate(lst_switches):
@@ -128,10 +140,16 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
        self._attr_extra_state_attributes["is_over_switch"] = self.is_over_switch
        self._attr_extra_state_attributes["is_inversed"] = self.is_inversed
        self._attr_extra_state_attributes["keep_alive_sec"] = under0.keep_alive_sec
-
-        self._attr_extra_state_attributes["underlying_entities"] = [
-           underlying.entity_id for underlying in self._underlyings
-        ]
+        self._attr_extra_state_attributes["underlying_switch_0"] = under0.entity_id
+        self._attr_extra_state_attributes["underlying_switch_1"] = (
+            self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+        )
+        self._attr_extra_state_attributes["underlying_switch_2"] = (
+            self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+        )
+        self._attr_extra_state_attributes["underlying_switch_3"] = (
+            self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+        )

        self._attr_extra_state_attributes[
            "on_percent"
--- a/custom_components/versatile_thermostat/thermostat_valve.py
+++ b/custom_components/versatile_thermostat/thermostat_valve.py
@@ -15,7 +15,10 @@ from .base_thermostat import BaseThermostat, ConfigData
 from .prop_algorithm import PropAlgorithm

 from .const import (
-    CONF_UNDERLYING_LIST,
+    CONF_VALVE,
+    CONF_VALVE_2,
+    CONF_VALVE_3,
+    CONF_VALVE_4,
    # This is not really self-regulation but regulation here
    CONF_AUTO_REGULATION_DTEMP,
    CONF_AUTO_REGULATION_PERIOD_MIN,
@@ -34,7 +37,10 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a
        frozenset(
            {
                "is_over_valve",
-                "underlying_entities",
+                "underlying_valve_0",
+                "underlying_valve_1",
+                "underlying_valve_2",
+                "underlying_valve_3",
                "on_time_sec",
                "off_time_sec",
                "cycle_min",
@@ -99,7 +105,13 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a
            self.name,
        )

-        lst_valves = config_entry.get(CONF_UNDERLYING_LIST)
+        lst_valves = [config_entry.get(CONF_VALVE)]
+        if config_entry.get(CONF_VALVE_2):
+            lst_valves.append(config_entry.get(CONF_VALVE_2))
+        if config_entry.get(CONF_VALVE_3):
+            lst_valves.append(config_entry.get(CONF_VALVE_3))
+        if config_entry.get(CONF_VALVE_4):
+            lst_valves.append(config_entry.get(CONF_VALVE_4))

        for _, valve in enumerate(lst_valves):
            self._underlyings.append(
@@ -151,10 +163,18 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a
            "valve_open_percent"
        ] = self.valve_open_percent
        self._attr_extra_state_attributes["is_over_valve"] = self.is_over_valve
-
-        self._attr_extra_state_attributes["underlying_entities"] = [
-           underlying.entity_id for underlying in self._underlyings
-        ]
+        self._attr_extra_state_attributes["underlying_valve_0"] = self._underlyings[
+            0
+        ].entity_id
+        self._attr_extra_state_attributes["underlying_valve_1"] = (
+            self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+        )
+        self._attr_extra_state_attributes["underlying_valve_2"] = (
+            self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+        )
+        self._attr_extra_state_attributes["underlying_valve_3"] = (
+            self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+        )

        self._attr_extra_state_attributes[
            "on_percent"
--- a/custom_components/versatile_thermostat/translations/en.json
+++ b/custom_components/versatile_thermostat/translations/en.json
@@ -72,10 +72,21 @@
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "underlying_entity_ids": "The device(s) to be controlled",
+          "heater_entity_id": "1st heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "heater_keep_alive": "Switch keep-alive interval in seconds",
          "proportional_function": "Algorithm",
+          "climate_entity_id": "1st underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
          "ac_mode": "AC mode",
+          "valve_entity_id": "1st valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -84,10 +95,21 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
+          "heater_entity_id": "Mandatory heater entity id",
+          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not required",
+          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not required",
+          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not required",
          "heater_keep_alive": "Optional heater switch state refresh interval. Leave empty if not required.",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1st valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
@@ -287,10 +309,21 @@
        "title": "Entities - {name}",
        "description": "Linked entities attributes",
        "data": {
-          "underlying_entity_ids": "The device(s) to be controlled",
+          "heater_entity_id": "1st heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "heater_keep_alive": "Switch keep-alive interval in seconds",
          "proportional_function": "Algorithm",
+          "climate_entity_id": "1st underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
          "ac_mode": "AC mode",
+          "valve_entity_id": "1st valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -299,10 +332,21 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "underlying_entity_ids": "The device(s) to be controlled - 1 is required",
+          "heater_entity_id": "Mandatory heater entity id",
+          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not used",
+          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
+          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
          "heater_keep_alive": "Optional heater switch state refresh interval. Leave empty if not required.",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1st valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
@@ -492,8 +536,7 @@
            "state": {
              "power": "Shedding",
              "security": "Safety",
-              "none": "Manual",
-              "frost": "Frost"
+              "none": "Manual"
            }
          }
        }
--- a/custom_components/versatile_thermostat/translations/fr.json
+++ b/custom_components/versatile_thermostat/translations/fr.json
@@ -554,8 +554,7 @@
            "state": {
              "power": "Délestage",
              "security": "Sécurité",
-              "none": "Manuel",
-              "frost": "Hors Gel"
+              "none": "Manuel"
            }
          }
        }
--- a/custom_components/versatile_thermostat/translations/it.json
+++ b/custom_components/versatile_thermostat/translations/it.json
@@ -364,8 +364,7 @@
            "state": {
              "power": "Ripartizione",
              "security": "Sicurezza",
-              "none": "Manuale",
-              "frost": "Gelo"
+              "none": "Manuale"
            }
          }
        }
--- a/tests/const.py
+++ b/tests/const.py
@@ -74,7 +74,7 @@ MOCK_TH_OVER_SWITCH_CENTRAL_MAIN_CONFIG = {
 }

 MOCK_TH_OVER_SWITCH_TYPE_CONFIG = {
-    CONF_UNDERLYING_LIST: ["switch.mock_switch"],
+    CONF_HEATER: "switch.mock_switch",
    CONF_HEATER_KEEP_ALIVE: 0,
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
    CONF_AC_MODE: False,
@@ -82,14 +82,17 @@ MOCK_TH_OVER_SWITCH_TYPE_CONFIG = {
 }

 MOCK_TH_OVER_SWITCH_AC_TYPE_CONFIG = {
-    CONF_UNDERLYING_LIST: ["switch.mock_air_conditioner"],
+    CONF_HEATER: "switch.mock_air_conditioner",
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
    CONF_AC_MODE: True,
    CONF_INVERSE_SWITCH: False,
 }

 MOCK_TH_OVER_4SWITCH_TYPE_CONFIG = {
-    CONF_UNDERLYING_LIST: ["switch.mock_4switch0", "switch.mock_4switch1","switch.mock_4switch2","switch.mock_4switch3"],
+    CONF_HEATER: "switch.mock_4switch0",
+    CONF_HEATER_2: "switch.mock_4switch1",
+    CONF_HEATER_3: "switch.mock_4switch2",
+    CONF_HEATER_4: "switch.mock_4switch3",
    CONF_HEATER_KEEP_ALIVE: 0,
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
    CONF_AC_MODE: False,
@@ -102,7 +105,7 @@ MOCK_TH_OVER_SWITCH_TPI_CONFIG = {
 }

 MOCK_TH_OVER_CLIMATE_TYPE_CONFIG = {
-    CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+    CONF_CLIMATE: "climate.mock_climate",
    CONF_AC_MODE: False,
    CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_STRONG,
    CONF_AUTO_REGULATION_DTEMP: 0.5,
@@ -112,7 +115,7 @@ MOCK_TH_OVER_CLIMATE_TYPE_CONFIG = {
 }

 MOCK_TH_OVER_CLIMATE_TYPE_USE_DEVICE_TEMP_CONFIG = {
-    CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+    CONF_CLIMATE: "climate.mock_climate",
    CONF_AC_MODE: False,
    CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_STRONG,
    CONF_AUTO_REGULATION_DTEMP: 0.1,
@@ -122,13 +125,13 @@ MOCK_TH_OVER_CLIMATE_TYPE_USE_DEVICE_TEMP_CONFIG = {
 }

 MOCK_TH_OVER_CLIMATE_TYPE_NOT_REGULATED_CONFIG = {
-    CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+    CONF_CLIMATE: "climate.mock_climate",
    CONF_AC_MODE: False,
    CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_NONE,
 }

 MOCK_TH_OVER_CLIMATE_TYPE_AC_CONFIG = {
-    CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+    CONF_CLIMATE: "climate.mock_climate",
    CONF_AC_MODE: True,
    CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_STRONG,
    CONF_AUTO_REGULATION_DTEMP: 0.5,
--- a/tests/test_auto_start_stop.py
+++ b/tests/test_auto_start_stop.py
@@ -424,7 +424,6 @@ async def test_auto_start_stop_medium_heat_vtherm(

        # VTherm should have been stopped
        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_AUTO_START_STOP

        # accumulated_error = -2.5 + target - current = -2 x 5 min / 2 capped to 5
        assert vtherm._auto_start_stop_algo.accumulated_error == -5
@@ -444,8 +443,6 @@ async def test_auto_start_stop_medium_heat_vtherm(
                        "target_temperature": 19.0,
                        "current_temperature": 21.0,
                        "temperature_slope": 0.167,
-                        "accumulated_error": -5,
-                        "accumulated_error_threshold": 5,
                    },
                )
            ]
@@ -476,7 +473,6 @@ async def test_auto_start_stop_medium_heat_vtherm(

        # VTherm should stay stopped cause slope is too low to allow the turn to On
        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_AUTO_START_STOP

    # 7. Set temperature to over the target, so that it will turn to heat
    now = now + timedelta(minutes=20)
@@ -492,8 +488,6 @@ async def test_auto_start_stop_medium_heat_vtherm(

        # VTherm should have been stopped
        assert vtherm.hvac_mode == HVACMode.HEAT
-        assert vtherm.hvac_off_reason is None
-
        # a message should have been sent
        assert mock_send_event.call_count >= 1
        mock_send_event.assert_has_calls(
@@ -509,8 +503,6 @@ async def test_auto_start_stop_medium_heat_vtherm(
                        "target_temperature": 19.0,
                        "current_temperature": 18.0,
                        "temperature_slope": -0.034,
-                        "accumulated_error": 5,
-                        "accumulated_error_threshold": 5,
                    },
                )
            ]
@@ -573,7 +565,7 @@ async def test_auto_start_stop_fast_ac_vtherm(
            CONF_USE_AUTO_START_STOP_FEATURE: True,
            CONF_USE_PRESENCE_FEATURE: True,
            CONF_PRESENCE_SENSOR: "binary_sensor.presence_sensor",
-            CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+            CONF_CLIMATE: "climate.mock_climate",
            CONF_MINIMAL_ACTIVATION_DELAY: 30,
            CONF_SECURITY_DELAY_MIN: 5,
            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
@@ -676,8 +668,6 @@ async def test_auto_start_stop_fast_ac_vtherm(
                        "target_temperature": 25.0,
                        "current_temperature": 23.0,
                        "temperature_slope": -0.28,
-                        "accumulated_error": 2,
-                        "accumulated_error_threshold": 2,
                    },
                )
            ]
@@ -740,8 +730,6 @@ async def test_auto_start_stop_fast_ac_vtherm(
                        "target_temperature": 25.0,
                        "current_temperature": 26.5,
                        "temperature_slope": 0.112,
-                        "accumulated_error": -2,
-                        "accumulated_error_threshold": 2,
                    },
                )
            ]
@@ -889,8 +877,6 @@ async def test_auto_start_stop_medium_heat_vtherm_preset_change(
                        "target_temperature": 17.0,
                        "current_temperature": 19.0,
                        "temperature_slope": 0.3,
-                        "accumulated_error": -2,
-                        "accumulated_error_threshold": 2,
                    },
                )
            ]
@@ -946,8 +932,6 @@ async def test_auto_start_stop_medium_heat_vtherm_preset_change(
                        "target_temperature": 21.0,
                        "current_temperature": 17.0,
                        "temperature_slope": -0.087,
-                        "accumulated_error": 2,
-                        "accumulated_error_threshold": 2,
                    },
                )
            ]
@@ -1096,370 +1080,3 @@ async def test_auto_start_stop_medium_heat_vtherm_preset_change_enable_false(

        # a message should have been sent
        assert mock_send_event.call_count == 0
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_auto_start_stop_fast_heat_window(
-    hass: HomeAssistant, skip_hass_states_is_state
-):
-    """Test than auto-start/stop works with a real over_climate VTherm in FAST level and check
-    interaction with window openess detection"""
-
-    # The temperatures to set
-    temps = {
-        "frost": 7.0,
-        "eco": 17.0,
-        "comfort": 19.0,
-        "boost": 21.0,
-        "eco_ac": 27.0,
-        "comfort_ac": 25.0,
-        "boost_ac": 23.0,
-        "frost_away": 7.1,
-        "eco_away": 17.1,
-        "comfort_away": 19.1,
-        "boost_away": 21.1,
-        "eco_ac_away": 27.1,
-        "comfort_ac_away": 25.1,
-        "boost_ac_away": 23.1,
-    }
-
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="overClimateUniqueId",
-        data={
-            CONF_NAME: "overClimate",
-            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: True,
-            CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
-            CONF_WINDOW_DELAY: 10,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_AUTO_START_STOP_FEATURE: True,
-            CONF_USE_PRESENCE_FEATURE: True,
-            CONF_PRESENCE_SENSOR: "binary_sensor.presence_sensor",
-            CONF_CLIMATE: "climate.mock_climate",
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SECURITY_DELAY_MIN: 5,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            CONF_AUTO_FAN_MODE: CONF_AUTO_FAN_TURBO,
-            CONF_AC_MODE: True,
-            CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_FAST,
-        },
-    )
-
-    fake_underlying_climate = MockClimate(
-        hass=hass,
-        unique_id="mock_climate",
-        name="mock_climate",
-        hvac_modes=[HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT],
-    )
-
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ):
-        vtherm: ThermostatOverClimate = await create_thermostat(
-            hass, config_entry, "climate.overclimate"
-        )
-
-        assert vtherm is not None
-
-        # Initialize all temps
-        await set_all_climate_preset_temp(hass, vtherm, temps, "overclimate")
-
-        # Check correct initialization of auto_start_stop attributes
-        assert (
-            vtherm._attr_extra_state_attributes["auto_start_stop_level"]
-            == AUTO_START_STOP_LEVEL_FAST
-        )
-
-        assert vtherm._attr_extra_state_attributes["auto_start_stop_dtmin"] == 7
-
-    # 1. Vtherm auto-start/stop should be in MEDIUM mode and an enable entity should exists
-    assert vtherm.auto_start_stop_level == AUTO_START_STOP_LEVEL_FAST
-    enable_entity = search_entity(
-        hass, "switch.overclimate_enable_auto_start_stop", SWITCH_DOMAIN
-    )
-    assert enable_entity is not None
-    assert enable_entity.state == STATE_ON
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    # 2. Set mode to Heat and preset to Comfort and close the window
-    send_window_change_event(vtherm, False, False, now, False)
-    await send_presence_change_event(vtherm, True, False, now)
-    await send_temperature_change_event(vtherm, 18, now, True)
-    await vtherm.async_set_hvac_mode(HVACMode.HEAT)
-    await vtherm.async_set_preset_mode(PRESET_COMFORT)
-    await hass.async_block_till_done()
-
-    assert vtherm.target_temperature == 19.0
-    # VTherm should be heating
-    assert vtherm.hvac_mode == HVACMode.HEAT
-    # VTherm window_state should be off
-    assert vtherm.window_state == STATE_OFF
-
-    # 3. Set current temperature to 21 5 min later -> should turn off VTherm
-    now = now + timedelta(minutes=5)
-    # reset accumulated error (only for testing)
-    vtherm._auto_start_stop_algo._accumulated_error = 0
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event:
-        vtherm._set_now(now)
-        await send_temperature_change_event(vtherm, 21, now, True)
-        await hass.async_block_till_done()
-
-        # VTherm should no more be heating
-        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_AUTO_START_STOP
-        assert vtherm._saved_hvac_mode == HVACMode.HEAT
-        assert mock_send_event.call_count == 2
-
-    # 4. Open the window and wait for the delay
-    now = now + timedelta(minutes=2)
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition:
-        vtherm._set_now(now)
-        try_function = await send_window_change_event(
-            vtherm, True, False, now, sleep=False
-        )
-
-        await try_function(None)
-
-        # Nothing should have change (window event is ignoed as we are already OFF)
-        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_AUTO_START_STOP
-        assert vtherm._saved_hvac_mode == HVACMode.HEAT
-
-        mock_send_event.assert_not_called()
-
-        assert vtherm.window_state == STATE_ON
-
-    # 5. close the window
-    now = now + timedelta(minutes=2)
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition:
-        vtherm._set_now(now)
-        try_function = await send_window_change_event(
-            vtherm, False, True, now, sleep=False
-        )
-
-        await try_function(None)
-
-        # The VTherm should stay off because the reason of off is auto-start-stop
-        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_AUTO_START_STOP
-        assert vtherm._saved_hvac_mode == HVACMode.HEAT
-
-        assert mock_send_event.call_count == 0
-
-        assert vtherm.window_state == STATE_OFF
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_auto_start_stop_fast_heat_window_mixed(
-    hass: HomeAssistant, skip_hass_states_is_state
-):
-    """Test than auto-start/stop works with a real over_climate VTherm in FAST level and check
-    interaction with window openess detection
-    The case is when first window on, then auto-stop, then window off and then auto-start
-    """
-
-    # The temperatures to set
-    temps = {
-        "frost": 7.0,
-        "eco": 17.0,
-        "comfort": 19.0,
-        "boost": 21.0,
-        "eco_ac": 27.0,
-        "comfort_ac": 25.0,
-        "boost_ac": 23.0,
-        "frost_away": 7.1,
-        "eco_away": 17.1,
-        "comfort_away": 19.1,
-        "boost_away": 21.1,
-        "eco_ac_away": 27.1,
-        "comfort_ac_away": 25.1,
-        "boost_ac_away": 23.1,
-    }
-
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="overClimateUniqueId",
-        data={
-            CONF_NAME: "overClimate",
-            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: True,
-            CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
-            CONF_WINDOW_DELAY: 10,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_AUTO_START_STOP_FEATURE: True,
-            CONF_USE_PRESENCE_FEATURE: True,
-            CONF_PRESENCE_SENSOR: "binary_sensor.presence_sensor",
-            CONF_CLIMATE: "climate.mock_climate",
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SECURITY_DELAY_MIN: 5,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            CONF_AUTO_FAN_MODE: CONF_AUTO_FAN_TURBO,
-            CONF_AC_MODE: True,
-            CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_FAST,
-        },
-    )
-
-    fake_underlying_climate = MockClimate(
-        hass=hass,
-        unique_id="mock_climate",
-        name="mock_climate",
-        hvac_modes=[HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT],
-    )
-
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ):
-        vtherm: ThermostatOverClimate = await create_thermostat(
-            hass, config_entry, "climate.overclimate"
-        )
-
-        assert vtherm is not None
-
-        # Initialize all temps
-        await set_all_climate_preset_temp(hass, vtherm, temps, "overclimate")
-
-        # Check correct initialization of auto_start_stop attributes
-        assert (
-            vtherm._attr_extra_state_attributes["auto_start_stop_level"]
-            == AUTO_START_STOP_LEVEL_FAST
-        )
-
-        assert vtherm._attr_extra_state_attributes["auto_start_stop_dtmin"] == 7
-
-    # 1. Vtherm auto-start/stop should be in MEDIUM mode and an enable entity should exists
-    assert vtherm.auto_start_stop_level == AUTO_START_STOP_LEVEL_FAST
-    enable_entity = search_entity(
-        hass, "switch.overclimate_enable_auto_start_stop", SWITCH_DOMAIN
-    )
-    assert enable_entity is not None
-    assert enable_entity.state == STATE_ON
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    # 2. Set mode to Heat and preset to Comfort and close the window
-    send_window_change_event(vtherm, False, False, now, False)
-    await send_presence_change_event(vtherm, True, False, now)
-    await send_temperature_change_event(vtherm, 18, now, True)
-    await vtherm.async_set_hvac_mode(HVACMode.HEAT)
-    await vtherm.async_set_preset_mode(PRESET_COMFORT)
-    await hass.async_block_till_done()
-
-    assert vtherm.target_temperature == 19.0
-    # VTherm should be heating
-    assert vtherm.hvac_mode == HVACMode.HEAT
-    # VTherm window_state should be off
-    assert vtherm.window_state == STATE_OFF
-
-    # 3. Open the window and wait for the delay
-    now = now + timedelta(minutes=2)
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition:
-        vtherm._set_now(now)
-        try_function = await send_window_change_event(
-            vtherm, True, False, now, sleep=False
-        )
-
-        await try_function(None)
-
-        # Nothing should have change (window event is ignoed as we are already OFF)
-        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_WINDOW_DETECTION
-        assert vtherm._saved_hvac_mode == HVACMode.HEAT
-
-        assert mock_send_event.call_count == 2
-
-        assert vtherm.window_state == STATE_ON
-
-    # 4. Set current temperature to 21 5 min later -> should turn off VTherm
-    now = now + timedelta(minutes=5)
-    # reset accumulated error (only for testing)
-    vtherm._auto_start_stop_algo._accumulated_error = 0
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event:
-        vtherm._set_now(now)
-        await send_temperature_change_event(vtherm, 21, now, True)
-        await hass.async_block_till_done()
-
-        # VTherm should no more be heating
-        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason == HVAC_OFF_REASON_WINDOW_DETECTION  # No change
-        assert vtherm._saved_hvac_mode == HVACMode.HEAT
-        assert mock_send_event.call_count == 0  # No message
-
-    # 5. close the window
-    now = now + timedelta(minutes=2)
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition:
-        vtherm._set_now(now)
-        try_function = await send_window_change_event(
-            vtherm, False, True, now, sleep=False
-        )
-
-        await try_function(None)
-
-        # The VTherm should turn on and off again due to auto-start-stop
-        assert vtherm.hvac_mode == HVACMode.OFF
-        assert vtherm.hvac_off_reason is HVAC_OFF_REASON_AUTO_START_STOP
-        assert vtherm._saved_hvac_mode == HVACMode.HEAT
-
-        assert vtherm.window_state == STATE_OFF
-        assert mock_send_event.call_count >= 2
-        mock_send_event.assert_has_calls(
-            [
-                call(EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.OFF}),
-                call(
-                    event_type=EventType.AUTO_START_STOP_EVENT,
-                    data={
-                        "type": "stop",
-                        "name": "overClimate",
-                        "cause": "Auto stop conditions reached",
-                        "hvac_mode": HVACMode.OFF,
-                        "saved_hvac_mode": HVACMode.HEAT,
-                        "target_temperature": 19.0,
-                        "current_temperature": 21.0,
-                        "temperature_slope": 0.214,
-                        "accumulated_error": -2,
-                        "accumulated_error_threshold": 2,
-                    },
-                ),
-            ]
-        )
--- a/tests/test_central_mode.py
+++ b/tests/test_central_mode.py
@@ -982,8 +982,7 @@ async def test_switch_change_central_mode_true_with_cool_only_and_window(
        await select_entity.async_select_option(CENTRAL_MODE_COOL_ONLY)

        assert entity.last_central_mode is CENTRAL_MODE_COOL_ONLY
-        assert entity.hvac_mode is HVACMode.OFF
-        assert entity.hvac_off_reason == HVAC_OFF_REASON_MANUAL
+        await entity.async_set_hvac_mode(HVACMode.OFF)
        await entity.async_set_preset_mode(PRESET_ACTIVITY)
        assert entity._saved_hvac_mode == HVACMode.HEAT
        assert entity._saved_preset_mode == PRESET_ACTIVITY
@@ -1001,14 +1000,12 @@ async def test_switch_change_central_mode_true_with_cool_only_and_window(

        await try_function(None)

-        # The VTherm is already off -> window detection is ignored
-        assert mock_send_event.call_count == 0
-        # mock_send_event.assert_has_calls(
-        #    [call.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.OFF})]
-        # )
+        assert mock_send_event.call_count == 1
+        mock_send_event.assert_has_calls(
+            [call.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.OFF})]
+        )

        assert entity.hvac_mode == HVACMode.OFF
-        assert entity.hvac_off_reason == HVAC_OFF_REASON_MANUAL
        assert entity.preset_mode == PRESET_ACTIVITY
        assert entity._saved_hvac_mode == HVACMode.HEAT
        assert entity._saved_preset_mode == PRESET_ACTIVITY
@@ -1024,8 +1021,6 @@ async def test_switch_change_central_mode_true_with_cool_only_and_window(
        assert entity.last_central_mode is CENTRAL_MODE_AUTO
        # No change
        assert entity.hvac_mode == HVACMode.OFF
-        # We have to a reason of WINDOW_DETECTION
-        assert entity.hvac_off_reason == HVAC_OFF_REASON_WINDOW_DETECTION
        assert entity.preset_mode == PRESET_ACTIVITY
        assert entity._saved_hvac_mode == HVACMode.HEAT
        assert entity._saved_preset_mode == PRESET_ACTIVITY
@@ -1051,7 +1046,6 @@ async def test_switch_change_central_mode_true_with_cool_only_and_window(

        # We should stay off because central is STOPPED
        assert entity.hvac_mode == HVACMode.HEAT
-        assert entity.hvac_off_reason is None
        assert entity.preset_mode == PRESET_ACTIVITY
        assert entity._saved_hvac_mode == HVACMode.HEAT
        assert entity._saved_preset_mode == PRESET_ACTIVITY
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -87,7 +87,7 @@ async def test_user_config_flow_over_switch(
    result = await hass.config_entries.flow.async_configure(
        result["flow_id"],
        user_input={
-            CONF_UNDERLYING_LIST: ["switch.mock_switch"],
+            CONF_HEATER: "switch.mock_switch",
            CONF_HEATER_KEEP_ALIVE: 0,
            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
            CONF_AC_MODE: False,
@@ -292,7 +292,7 @@ async def test_user_config_flow_over_switch(
    )
    assert result["result"]
    assert result["result"].domain == DOMAIN
-    assert result["result"].version == 2
+    assert result["result"].version == 1
    assert result["result"].title == "TheOverSwitchMockName"
    assert isinstance(result["result"], ConfigEntry)

@@ -379,7 +379,7 @@ async def test_user_config_flow_over_climate(
    result = await hass.config_entries.flow.async_configure(
        result["flow_id"],
        user_input={
-            CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+            CONF_CLIMATE: "climate.mock_climate",
            CONF_AC_MODE: False,
            CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_STRONG,
            CONF_AUTO_REGULATION_DTEMP: 0.5,
@@ -512,7 +512,7 @@ async def test_user_config_flow_over_climate(
    }
    assert result["result"]
    assert result["result"].domain == DOMAIN
-    assert result["result"].version == 2
+    assert result["result"].version == 1
    assert result["result"].title == "TheOverClimateMockName"
    assert isinstance(result["result"], ConfigEntry)

@@ -794,7 +794,10 @@ async def test_user_config_flow_over_4_switches(
    }

    TYPE_CONFIG = {  # pylint: disable=invalid-name
-        CONF_UNDERLYING_LIST: ["switch.mock_switch1", "switch.mock_switch2", "switch.mock_switch3","switch.mock_switch4"],
+        CONF_HEATER: "switch.mock_switch1",
+        CONF_HEATER_2: "switch.mock_switch2",
+        CONF_HEATER_3: "switch.mock_switch3",
+        CONF_HEATER_4: "switch.mock_switch4",
        CONF_HEATER_KEEP_ALIVE: 0,
        CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
        CONF_AC_MODE: False,
@@ -1012,7 +1015,7 @@ async def test_user_config_flow_over_climate_auto_start_stop(
    result = await hass.config_entries.flow.async_configure(
        result["flow_id"],
        user_input={
-            CONF_UNDERLYING_LIST: ["climate.mock_climate"],
+            CONF_CLIMATE: "climate.mock_climate",
            CONF_AC_MODE: False,
            CONF_AUTO_REGULATION_MODE: CONF_AUTO_REGULATION_STRONG,
            CONF_AUTO_REGULATION_DTEMP: 0.5,
@@ -1121,6 +1124,6 @@ async def test_user_config_flow_over_climate_auto_start_stop(
    }
    assert result["result"]
    assert result["result"].domain == DOMAIN
-    assert result["result"].version == 2
+    assert result["result"].version == 1
    assert result["result"].title == "TheOverClimateMockName"
    assert isinstance(result["result"], ConfigEntry)
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -205,8 +205,6 @@ async def test_window_management_time_enough(
        assert mock_heater_off.call_count == 2
        assert mock_condition.call_count == 1
        assert entity.hvac_mode is HVACMode.OFF
-        assert entity._saved_hvac_mode is HVACMode.HEAT
-        assert entity.hvac_off_reason == HVAC_OFF_REASON_WINDOW_DETECTION
        assert entity.window_state == STATE_ON

    # Close the window
@@ -244,9 +242,6 @@ async def test_window_management_time_enough(
            any_order=False,
        )
        assert entity.preset_mode is PRESET_BOOST
-        assert entity.hvac_mode is HVACMode.HEAT
-        assert entity._saved_hvac_mode is HVACMode.HEAT  # No change
-        assert entity.hvac_off_reason == None

    # Clean the entity
    entity.remove_thermostat()
@@ -1344,7 +1339,6 @@ async def test_window_action_fan_only(hass: HomeAssistant, skip_hass_states_is_s
        # The underlying should be in FAN_ONLY hvac_mode
        assert entity.hvac_mode is HVACMode.FAN_ONLY
        assert entity._saved_hvac_mode is HVACMode.HEAT
-        assert entity.hvac_off_reason is None  # Hvac is not off
        assert entity.preset_mode is PRESET_COMFORT

    # 3. Close the window
@@ -1363,7 +1357,7 @@ async def test_window_action_fan_only(hass: HomeAssistant, skip_hass_states_is_s
        await try_function(None)

        # Wait for initial delay of heater
-        await hass.async_block_till_done()
+        await asyncio.sleep(0.3)

        assert entity.window_state == STATE_OFF
        assert mock_send_event.call_count == 1
@@ -1385,7 +1379,6 @@ async def test_window_action_fan_only(hass: HomeAssistant, skip_hass_states_is_s
        )
        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_COMFORT
-        assert entity.hvac_off_reason is None

    # Clean the entity
    entity.remove_thermostat()
Author	SHA1	Message	Date
Jean-Marc Collin	f547647e24	With enable + tests + hysteresis in calculation	2024-11-01 10:24:35 +00:00
Jean-Marc Collin	5063374b97	Allow calculation even if slope is None	2024-10-31 22:29:30 +00:00
Jean-Marc Collin	461db8d86c	Change algo to take slop into account	2024-10-31 21:57:55 +00:00
Jean-Marc Collin	38c4b067b1	FIX too much start/stop	2024-10-31 21:30:44 +00:00
Jean-Marc Collin	32b0bcce19	+ comment	2024-10-31 11:48:52 +00:00
Jean-Marc Collin	d971cc6aed	Add change_preset test	2024-10-31 11:48:01 +00:00
Jean-Marc Collin	5bcbbb2d84	All is fine	2024-10-31 11:27:38 +00:00
Jean-Marc Collin	7854b44a2e	Change algo	2024-10-29 21:48:47 +00:00
Jean-Marc Collin	3219fd293e	With config flow ok	2024-10-27 10:42:30 +00:00
Jean-Marc Collin	db3afdf887	Auto start/stop alog and testu + ConfigFlow	2024-10-27 10:05:15 +00:00
Jean-Marc Collin	17ebf629e6	Migrate to HA 2024.10.4	2024-10-27 10:05:14 +00:00