Release

Fix Testus
Work in simuated environment
2024-11-17 10:56:17 +00:00 · 2024-11-17 10:51:02 +00:00 · 2024-11-17 10:39:59 +00:00 · 2024-11-17 07:47:44 +00:00 · 2024-11-16 21:43:53 +00:00 · 2024-11-16 21:22:13 +00:00
46 changed files with 6430 additions and 1828 deletions
--- a/.devcontainer/configuration.yaml
+++ b/.devcontainer/configuration.yaml
@@ -1,14 +1,30 @@
 default_config:

+recorder:
+    auto_purge: true
+    purge_keep_days: 1
+    commit_interval: 5
+    include:
+        domains:
+            - input_boolean
+            - input_number
+            - switch
+            - climate
+            - sensor
+            - binary_sensor
+            - number
+            - input_select
+            - versatile_thermostat
+
 logger:
    default: warning
    logs:
-       custom_components.versatile_thermostat: debug
-       # custom_components.versatile_thermostat.underlyings: info
-       # custom_components.versatile_thermostat.climate: info
-       # custom_components.versatile_thermostat.base_thermostat: debug
-       custom_components.versatile_thermostat.sensor: info
-       custom_components.versatile_thermostat.binary_sensor: info
+        custom_components.versatile_thermostat: debug
+        # custom_components.versatile_thermostat.underlyings: info
+        # custom_components.versatile_thermostat.climate: info
+        # custom_components.versatile_thermostat.base_thermostat: debug
+        custom_components.versatile_thermostat.sensor: info
+        custom_components.versatile_thermostat.binary_sensor: info

 # If you need to debug uncommment the line below (doc: https://www.home-assistant.io/integrations/debugpy/)
 debugpy:
@@ -75,6 +91,48 @@ input_number:
        icon: mdi:thermostat
        unit_of_measurement: °C
        mode: box
+    fake_offset_calibration1:
+        name: Sonoff offset calibration 1
+        min: -12
+        max: 12
+        icon: mdi:tune
+        unit_of_measurement: °C
+        mode: box
+    fake_opening_degree1:
+        name: Sonoff Opening degree 1
+        min: 0
+        max: 100
+        icon: mdi:valve-open
+        unit_of_measurement: "%"
+        mode: box
+    fake_closing_degree1:
+        name: Sonoff Closing degree 1
+        min: 0
+        max: 100
+        icon: mdi:valve-closed
+        unit_of_measurement: "%"
+        mode: box
+    fake_offset_calibration2:
+        name: Sonoff offset calibration 2
+        min: -12
+        max: 12
+        icon: mdi:tune
+        unit_of_measurement: °C
+        mode: box
+    fake_opening_degree2:
+        name: Sonoff Opening degree 2
+        min: 0
+        max: 100
+        icon: mdi:valve-open
+        unit_of_measurement: "%"
+        mode: box
+    fake_closing_degree2:
+        name: Sonoff Closing degree 2
+        min: 0
+        max: 100
+        icon: mdi:valve-closed
+        unit_of_measurement: "%"
+        mode: box

 input_boolean:
    # input_boolean to simulate the windows entity. Only for development environment.
@@ -126,6 +184,12 @@ input_boolean:
    fake_presence_sensor1:
        name: Presence Sensor 1
        icon: mdi:home
+    fake_valve_sonoff_trvzb1:
+        name: Valve Sonoff TRVZB1
+        icon: mdi:valve
+    fake_valve_sonoff_trvzb2:
+        name: Valve Sonoff TRVZB2
+        icon: mdi:valve

 climate:
    - platform: generic_thermostat
@@ -136,6 +200,7 @@ climate:
      name: Underlying thermostat2
      heater: input_boolean.fake_heater_switch3
      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false
    - platform: generic_thermostat
      name: Underlying thermostat3
      heater: input_boolean.fake_heater_switch3
@@ -168,6 +233,16 @@ climate:
      name: Underlying thermostat9
      heater: input_boolean.fake_heater_switch3
      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying Sonoff TRVZB1
+      heater: input_boolean.fake_valve_sonoff_trvzb1
+      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false
+    - platform: generic_thermostat
+      name: Underlying Sonoff TRVZB2
+      heater: input_boolean.fake_valve_sonoff_trvzb2
+      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false

 input_datetime:
    fake_last_seen:
@@ -176,20 +251,6 @@ input_datetime:
        has_date: true
        has_time: true

-recorder:
-    commit_interval: 0
-    include:
-        domains:
-            - input_boolean
-            - input_number
-            - switch
-            - climate
-            - sensor
-            - binary_sensor
-            - number
-            - input_select
-            - versatile_thermostat
-
 template:
    - binary_sensor:
          - name: maison_occupee
@@ -235,14 +296,14 @@ switch:
              friendly_name: "Pilote chauffage SDB RDC"
              value_template: "{{ is_state_attr('switch_seche_serviettes_sdb_rdc', 'sensor_state', 'on') }}"
              turn_on:
-                  service: select.select_option
+                  action: select.select_option
                  data:
                      option: comfort
                  target:
                      entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode

              turn_off:
-                  service: select.select_option
+                  action: select.select_option
                  data:
                      option: comfort-2
                  target:
--- a/.github/ISSUE_TEMPLATE/issue.md
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -4,6 +4,8 @@ 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
@@ -13,6 +13,7 @@
    - [Dans le cas d'une configuration centrale](#dans-le-cas-dune-configuration-centrale)
  - [Refonte du menu de configuration](#refonte-du-menu-de-configuration)
    - [Les options de menu 'Configuration incomplète' et 'Finaliser'](#les-options-de-menu-configuration-incomplète-et-finaliser)
+- [Changements dans la version 5.0](#changements-dans-la-version-50)
 - [Merci pour la bière buymecoffee](#merci-pour-la-bière-buymecoffee)
 - [Quand l'utiliser et ne pas l'utiliser](#quand-lutiliser-et-ne-pas-lutiliser)
  - [Incompatibilités](#incompatibilités)
@@ -31,6 +32,7 @@
      - [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)
@@ -92,6 +94,9 @@ 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)
@@ -100,14 +105,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)
-> * **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 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).
 > * **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).
@@ -126,6 +131,8 @@ Ce composant personnalisé pour Home Assistant est une mise à niveau et est une
 > * **release majeure 2.0** : ajout du thermostat "over climate" permettant de transformer n'importe quel thermostat en Versatile Thermostat et lui ajouter toutes les fonctions de ce dernier.
 </details>

+<details>
+<summary>Changements dans la version 6.0</summary>
 # Changements dans la version 6.0

 ## Entités de température pour les pre-réglages
@@ -193,10 +200,13 @@ Une fois que toute la configuration est valide, la dernière option se transform
 Cliquez sur cette option pour créér (resp. modifier) le VTherm :

 ![Configuration terminée](images/config-terminate.png)
+</details>

 <details>
 <summary>Changements dans la version 5.0</summary>

+# Changements dans la version 5.0
+
 Vous pouvez maintenant définir une configuration centrale qui va vous permettre de mettre en commun sur tous vos VTherms (ou seulement une partie), certains attributs. Pour utiliser cette possibilité, vous devez :
 1. Créer un VTherm de type "Configuration Centrale",
 2. Saisir les attributs de cette configuration centrale
@@ -237,6 +247,7 @@ Certains thermostat de type TRV sont réputés incompatibles avec le Versatile T
 4. les thermostats de type Rointe ont tendance a se réveiller tout seul. Le reste fonctionne normalement.
 5. les TRV de type Aqara SRTS-A01 et MOES TV01-ZB qui n'ont pas le retour d'état `hvac_action` permettant de savoir si elle chauffe ou pas. Donc les retours d'état sont faussés, le reste à l'air fonctionnel.
 6. La clim Airwell avec l'intégration "Midea AC LAN". Si 2 commandes de VTherm sont trop rapprochées, la clim s'arrête d'elle même.
+7. Les climates basés sur l'intégration Overkiz ne fonctionnent pas. Il parait impossible d'éteindre ni même de changer la température sur ces systèmes.

 # Pourquoi une nouvelle implémentation du thermostat ?

@@ -287,9 +298,6 @@ Ce composant nommé __Versatile thermostat__ gère les cas d'utilisation suivant
 > 3. En plus de cette configuration centralisée, tous les VTherm peuvent être contrôlées par une seule entité de type `select`. Cette fonction est nommé `central_mode`. Cela permet de stopper / démarrer / mettre en hors gel / etc tous les VTherms en une seule fois. Pour chaque VTherm, l'utilisateur indique si il est concerné par ce `central_mode`.


-<details>
-<summary>Création d'un nouveau Versatile Thermostat</summary>
-
 ## Création d'un nouveau Versatile Thermostat

 Cliquez sur le bouton Ajouter une intégration dans la page d'intégration
@@ -303,10 +311,6 @@ puis
 La configuration peut être modifiée via la même interface. Sélectionnez simplement le thermostat à modifier, appuyez sur "Configurer" et vous pourrez modifier certains paramètres ou la configuration.

 Suivez ensuite les étapes de configuration en sélectionnant dans le menu l'option à configurer.
-</details>
-
-<details>
-<summary>Choix des attributs de base</summary>

 ## Choix des attributs de base

@@ -328,10 +332,6 @@ Donnez les principaux attributs obligatoires :
 > ![Astuce](images/tips.png) _*Notes*_
 >  1. avec les types ```over_switch``` et ```over_valve```, les calculs sont effectués à chaque cycle. Donc en cas de changement de conditions, il faudra attendre le prochain cycle pour voir un changement. Pour cette raison, le cycle ne doit pas être trop long. **5 min est une bonne valeur**,
 >  2. si le cycle est trop court, le radiateur ne pourra jamais atteindre la température cible. Pour le radiateur à accumulation par exemple il sera sollicité inutilement.
-</details>
-
-<details>
-<summary>Sélectionnez des entités pilotées (sous-jacents)</summary>

 ## Sélectionnez des entités pilotées (sous-jacents)

@@ -510,16 +510,23 @@ 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.
 L'algorithme à utiliser est aujourd'hui limité à TPI est disponible. Voir [algorithme](#algorithme).

 Il est possible de choisir un thermostat over valve qui commande une climatisation en cochant la case "AC Mode". Dans ce cas, seul le mode refroidissement sera visible.
-</details>
-
-<details>
-<summary>Configurez les coefficients de l'algorithme TPI</summary>

 ## Configurez les coefficients de l'algorithme TPI

@@ -533,10 +540,6 @@ Vous devez donner :


 Pour plus d'informations sur l'algorithme TPI et son réglage, veuillez vous référer à [algorithm](#algorithm).
-</details>
-
-<details>
-<summary>Configurer les températures préréglées</summary>

 ## Configurer les températures préréglées

@@ -557,10 +560,6 @@ Les pré-réglages se font (depuis v6.0) directement depuis les entités du VThe
 >  3. Si vous utilisez la gestion du délestage, vous verrez un préréglage caché nommé ``power``. Le préréglage de l'élément chauffant est réglé sur « puissance » lorsque des conditions de surpuissance sont rencontrées et que le délestage est actif pour cet élément chauffant. Voir [gestion de l'alimentation](#configure-the-power-management).
 >  4. si vous utilisez la configuration avancée, vous verrez le préréglage défini sur ``sécurité`` si la température n'a pas pu être récupérée après un certain délai
 >  5. Si vous ne souhaitez pas utiliser le préréglage, indiquez 0 comme température. Le préréglage sera alors ignoré et ne s'affichera pas dans le composant front
-</details>
-
-<details>
-<summary>Configurer les portes/fenêtres en allumant/éteignant les thermostats</summary>

 ## Configurer les portes/fenêtres en allumant/éteignant les thermostats

@@ -603,10 +602,6 @@ Et c'est tout ! votre thermostat s'éteindra lorsque les fenêtres seront ouvert
 >  2. Si vous n'avez pas de capteur de fenêtre/porte dans votre chambre, laissez simplement l'identifiant de l'entité du capteur vide,
 >  3. **Un seul mode est permis**. On ne peut pas configurer un thermostat avec un capteur et une détection automatique. Les 2 modes risquant de se contredire, il n'est pas possible d'avoir les 2 modes en même temps,
 >  4. Il est déconseillé d'utiliser le mode automatique pour un équipement soumis à des variations de température fréquentes et normales (couloirs, zones ouvertes, ...)
-</details>
-
-<details>
-<summary>Configurer le mode d'activité ou la détection de mouvement</summary>

 ## Configurer le mode d'activité ou la détection de mouvement

@@ -634,10 +629,6 @@ Pour que cela fonctionne, le thermostat doit être en mode préréglé « Activ

 > ![Astuce](images/tips.png) _*Notes*_
    1. Sachez que comme pour les autres modes prédéfinis, ``Activity`` ne sera proposé que s'il est correctement configuré. En d'autres termes, les 4 clés de configuration doivent être définies si vous souhaitez voir l'activité dans l'interface de l'assistant domestique
-</details>
-
-<details>
-<summary>Configurer la gestion de la puissance</summary>

 ## Configurer la gestion de la puissance

@@ -656,10 +647,6 @@ Cela vous permet de modifier la puissance maximale au fil du temps à l'aide d'u
 > 3. Gardez toujours une marge, car la puissance max peut être brièvement dépassée en attendant le calcul du prochain cycle typiquement ou par des équipements non régulés.
 > 4. Si vous ne souhaitez pas utiliser cette fonctionnalité, laissez simplement l'identifiant des entités vide
 > 5. Si vous controlez plusieurs radiateurs, la **consommation électrique de votre chauffage** renseigné doit correspondre à la somme des puissances.
-</details>
-
-<details>
-<summary>Configurer la présence (ou l'absence)</summary>

 ## Configurer la présence (ou l'absence)

@@ -681,10 +668,6 @@ ATTENTION : les groupes de personnes ne fonctionnent pas en tant que capteur de
 > ![Astuce](images/tips.png) _*Notes*_
 > 1. le changement de température est immédiat et se répercute sur le volet avant. Le calcul prendra en compte la nouvelle température cible au prochain calcul du cycle,
 > 2. vous pouvez utiliser le capteur direct person.xxxx ou un groupe de capteurs de Home Assistant. Le capteur de présence gère les états ``on`` ou ``home`` comme présents et les états ``off`` ou ``not_home`` comme absents.
-</details>
-
-<details>
-<summary>Configuration avancée</summary>

 ## Configuration avancée

@@ -702,6 +685,8 @@ Mettre ce paramètre à ``0.00`` déclenchera le préréglage sécurité quelque

 Le quatrième param§tre (``security_default_on_percent``) est la valeur de ``on_percent`` qui sera utilisée lorsque le thermostat passe en mode ``security``. Si vous mettez ``0`` alors le thermostat sera coupé lorsqu'il passe en mode ``security``, mettre 0,2% par exemple permet de garder un peu de chauffage (20% dans ce cas), même en mode ``security``. Ca évite de retrouver son logement totalement gelé lors d'une panne de thermomètre.

+Note: les paramètres `security_min_on_percent` et `security_default_on_percent` ne s'applique pas aux VTherms `over_climate`.
+
 Depuis la version 5.3 il est possible de désactiver la mise en sécurité suite à une absence de données du thermomètre extérieure. En effet, celui-ci ayant la plupart du temps un impact faible sur la régulation (dépendant de votre paramètrage), il est possible qu'il soit absent sans mettre en danger le logement. Pour cela, il faut ajouter les lignes suivantes dans votre `configuration.yaml` :
 ```
 versatile_thermostat:
@@ -719,10 +704,6 @@ Voir [exemple de réglages](#examples-tuning) pour avoir des exemples de réglag
 > 3. Un service est disponible qui permet de régler les 3 paramètres de sécurité. Ca peut servir à adapter la fonction de sécurité à votre usage,
 > 4. Pour un usage naturel, le ``security_default_on_percent`` doit être inférieur à ``security_min_on_percent``,
 > 5. Les thermostats de type ``thermostat_over_climate`` ne sont pas concernés par le mode security.
-</details>
-
-<details>
-<summary>Le contrôle centralisé</summary>

 ## Le contrôle centralisé

@@ -739,10 +720,6 @@ Il est donc possible de contrôler tous les VTherms (que ceux que l'on désigne
 Exemple de rendu :

 ![central_mode](images/central_mode.png)
-</details>
-
-<details>
-<summary>Le contrôle d'une chaudière centrale</summary>

 ## Le contrôle d'une chaudière centrale

@@ -844,7 +821,6 @@ context:

 > ![Astuce](images/tips.png) _*Notes*_
 > Le contrôle par du logiciel ou du matériel de type domotique d'une chaudière centrale peut induire des risques pour son bon fonctionnement. Assurez-vous avant d'utiliser ces fonctions, que votre chaudière possède bien des fonctions de sécurité et que celles-ci fonctionnent. Allumer une chaudière si tous les robinets sont fermés peut générer de la sur-pression par exemple.
-</details>

 <details>
 <summary>Synthèse des paramètres</summary>
@@ -911,6 +887,8 @@ 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
@@ -1168,6 +1146,9 @@ 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

@@ -1590,7 +1571,7 @@ Ces paramètres sont sensibles et assez difficiles à régler. Merci de ne les u
 <summary>Pourquoi mon Versatile Thermostat se met en Securite ?</summary>

 ## Pourquoi mon Versatile Thermostat se met en Securite ?
-Le mode sécurité n'est possible que sur les VTherm `over_switch` et `over_valve`. Il survient lorsqu'un des 2 thermomètres qui donne la température de la pièce ou la température extérieure n'a pas envoyé de valeur depuis plus de `security_delay_min` minutes et que le radiateur chauffait à au moins `security_min_on_percent`.
+Le mode sécurité est possible sur tous les types de VTherm . Il survient lorsqu'un des 2 thermomètres qui donne la température de la pièce ou la température extérieure n'a pas envoyé de valeur depuis plus de `security_delay_min` minutes et que le radiateur chauffait à au moins `security_min_on_percent`.

 Comme l'algorithme est basé sur les mesures de température, si elles ne sont plus reçues par le VTherm, il y a un risque de surchauffe et d'incendie. Pour éviter ça, lorsque les conditions rappelées ci-dessus sont détectées, la chauffe est limité au paramètre `security_default_on_percent`. Cette valeur doit donc être raisonnablement faible (10% est une bonne valeur). Elle permet d'éviter un incendie tout en évitant de couper totalement le radiateur (risque de gel).

--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
    - [In the case of a central configuration](#in-the-case-of-a-central-configuration)
  - [Redesign of the configuration menu](#redesign-of-the-configuration-menu)
    - [The 'Incomplete configuration' and 'Finalize' menu options](#the-incomplete-configuration-and-finalize-menu-options)
- [Changements dans la version 5.0](#changements-dans-la-version-50)
+- [Changes in release 5.0](#changes-in-release-50)
 - [Thanks for the beer buymecoffee](#thanks-for-the-beer-buymecoffee)
 - [When to use / not use](#when-to-use--not-use)
  - [Incompatibilities](#incompatibilities)
@@ -32,6 +32,7 @@
      - [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)
@@ -93,6 +94,9 @@
 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)
@@ -101,13 +105,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).
@@ -126,6 +130,10 @@ This custom component for Home Assistant is an upgrade and is a complete rewrite
 > * **major release 2.0**: addition of the "over climate" thermostat allowing you to transform any thermostat into a Versatile Thermostat and add all the functions of the latter.
 </details>

+
+<details>
+<summary>Changes in version 6.0</summary>
+
 # Changes in version 6.0

 ## Temperature entities for presets
@@ -193,11 +201,12 @@ Once all configuration is valid, the last option changes to:
 Click on this option to create (resp. modify) the VTherm:

 ![Configuration Complete](images/config-terminate.png)
+</details>

 <details>
-<summary>Changements dans la version 5.0</summary>
+<summary>Changes in release 5.0</summary>

-# Changements dans la version 5.0
+# Changes in release 5.0

 You can now define a central configuration which will allow you to share certain attributes on all your VTherms (or only part of them). To use this possibility, you must:
 1. Create a VTherm of type “Central Configuration”,
@@ -238,6 +247,7 @@ Some TRV type thermostats are known to be incompatible with the Versatile Thermo
 4. Thermostats of type Rointe tends to awake alone even if VTherm turns it off. Others functions works fine.
 5. TRV of type Aqara SRTS-A01 and MOES TV01-ZB which doesn't have the return state `hvac_action` allowing to know if it is heating or not. So return states are not available. Others features, seems to work normally.
 6. The Airwell with the "Midea AC LAN" integration. If two orders are too close, the device shut off.
+7. System based on intégration Overkiz don't work as expected. It seems not possible to turn off nor sending setpoint on those systems.

 # Why another thermostat implementation ?

@@ -288,9 +298,6 @@ This component named __Versatile thermostat__ manage the following use cases :
 > 3. In addition to this centralized configuration, all VTherms can be controlled by a single entity of type `select`. This function is named `central_mode`. This allows you to stop / start / freeze / etc. all VTherms at once. For each VTherm, the user indicates whether he is affected by this `central_mode`.


-<details>
-<summary>Creation of a new Versatile Thermostat</summary>
-
 ## Creation of a new Versatile Thermostat

 Click on Add integration button in the integration page
@@ -301,11 +308,6 @@ The configuration can be change through the same interface. Simply select the th
 Then choose the type of VTherm you want to create:
 ![image](images/config-main0.png)

-</details>
-
-<details>
-<summary>Minimal configuration update</summary>
-
 ## Minimal configuration update

 Then choose the “Main attributes” menu.
@@ -326,10 +328,6 @@ Give the main mandatory attributes:
 > ![Tip](images/tips.png) _*Notes*_
 > 1. With the ```thermostat_over_switch``` type, calculation are done at each cycle. So in case of conditions change, you will have to wait for the next cycle to see a change. For this reason, the cycle should not be too long. **5 min is a good value**,
 > 2. if the cycle is too short, the heater could never reach the target temperature. For the storage radiator for example it will be used unnecessarily.
-</details>
-
-<details>
-<summary>Select the driven entity</summary>

 ## Select the driven entity

@@ -468,21 +466,16 @@ and of course, configure the VTherm's self-regulation mode in **Expert** mode. A
 For the changes to be taken into account, you must either **completely restart Home Assistant** or just the **Versatile Thermostat integration** (Dev tools / Yaml / reloading the configuration / Versatile Thermostat).

 #### Internal temperature compensation
-Sometimes, it happens that the internal thermometer of the underlying (TRV, air conditioning, etc.) is so wrong that self-regulation is not enough to regulate.
-This happens when the internal thermometer is too close to the heat source. The internal temperature then rises much faster than the room temperature, which generates faults in the regulation.
-Example :
-1. the room temperature is 18°, the setpoint is 20°,
-2. the internal temperature of the equipment is 22°,
-3. if VTherm sends 21° as setpoint (= 20° + 1° auto-regulation), then the equipment will not heat because its internal temperature (22°) is above the setpoint (21°)
+Sometimes, a device’s internal temperature sensor (like in a TRV or AC) can give inaccurate readings, especially if it’s too close to a heat source. This can cause the device to stop heating too soon.
+For example:
+1. target temperature: 20 °C, room temperature: 18 °C,
+2. device’s internal sensor: 22 °C
+3. If the target temperature is increased to 21 °C, the device won’t heat because it thinks it’s already warm (internal temperature is 22°C).

-To overcome this, a new optional option was added in version 5.4: ![Use of internal temperature](images/config-use-internal-temp.png)
+The Adjust Setpoint for Room vs. TRV Temperature feature fixes this by adding the temperature difference between the room and the device’s internal reading to the target. In this case, VTherm would adjust the target to 25°C (21°C + 4°C difference), forcing the device to continue heating.

-When enabled, this function will add the difference between the internal temperature and the room temperature to the setpoint to force heating.
-In the example above, the difference is +4° (22° - 18°), so VTherm will send 25° (21°+4°) to the equipment forcing it to heat up.
-
-This difference is calculated for each underlying because each has its own internal temperature. Think of a VTherm which would be connected to 3 TRVs each with its internal temperature for example.
-
-We then obtain much more effective self-regulation which avoids the pitfall of large variations in faulty internal temperature.
+This adjustment is specific to each device, making the heating system more accurate and avoiding issues from faulty sensor readings.
+See ![Use of internal temperature](images/config-use-internal-temp.png)

 #### synthesis of the self-regulation algorithm
 The self-regulation algorithm can be summarized as follows:
@@ -505,6 +498,17 @@ 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.
@@ -512,11 +516,6 @@ The algorithm to use is currently limited to TPI is available. See [algorithm](#

 It is possible to choose an over valve thermostat which controls air conditioning by checking the "AC Mode" box. In this case, only the cooling mode will be visible.

-</details>
-
-<details>
-<summary>Configure the TPI algorithm coefficients</summary>
-
 ## Configure the TPI algorithm coefficients

 Ff you choose a  ```over_switch``` or ```over_valve``` thermostat and select the "TPI" menu option, you will get there:
@@ -524,11 +523,6 @@ Ff you choose a  ```over_switch``` or ```over_valve``` thermostat and select the

 For more informations on the TPI algorithm and tuned please refer to [algorithm](#algorithm).

-</details>
-
-<details>
-<summary>Configure the preset temperature</summary>
-
 ## Configure the preset temperature

 The preset mode allows you to pre-configurate targeted temperature. Used in conjonction with Scheduler (see [scheduler](#even-better-with-scheduler-component) you will have a powerfull and simple way to optimize the temperature vs electrical consumption of your hous. Preset handled are the following :
@@ -549,11 +543,6 @@ The pre-settings are made (since v6.0) directly from the VTherm entities or from
 >  4. if you uses the advanced configuration you will see the preset set to ``safety`` if the temperature could not be retrieved after a certain delay
 >  5. ff you don't want to use the preseet, give 0 as temperature. The preset will then been ignored and will not displayed in the front component

-</details>
-
-<details>
-<summary>Configure the doors/windows turning on/off the thermostats</summary>
-
 ## Configure the doors/windows turning on/off the thermostats

 You must have chosen the ```With opening detection``` feature on the first page to arrive on this page.
@@ -595,11 +584,6 @@ And that's all ! your thermostat will turn off when the windows are open and tur
 > 3. **Only one mode is allowed**. You cannot configure a thermostat with a sensor and automatic detection. The 2 modes may contradict each other, it is not possible to have the 2 modes at the same time,
 > 4. It is not recommended to use the automatic mode for equipment subject to frequent and normal temperature variations (corridors, open areas, ...)

-</details>
-
-<details>
-<summary>Configure the activity mode or motion detection</summary>
-
 ## Configure the activity mode or motion detection
 If you choose the ```Motion management``` feature, lick on 'Validate' on the previous page and you will get there:
 ![image](images/config-motion.png)
@@ -624,11 +608,6 @@ For this to work, the climate thermostat should be in ``Activity`` preset mode.
 > ![Tip](images/tips.png)  _*Notes*_
 > 1. Be aware that as for the others preset modes, ``Activity`` will only be proposed if it's correctly configure. In other words, the 4 configuration keys have to be set if you want to see Activity in home assistant Interface

-</details>
-
-<details>
-<summary>Configure the power management</summary>
-
 ## Configure the power management

 If you choose the ```Power management``` feature, click on 'Validate' on the previous page and you will get there:
@@ -646,10 +625,6 @@ This allows you to change the max power along time using a Scheduler or whatever
 > 3. Always keep a margin, because max power can be briefly exceeded while waiting for the next cycle calculation typically or by not regulated equipement.
 > 4. If you don't want to use this feature, just leave the entities id empty
 > 5. If you control several heaters, the **power consumption of your heater** setup should be the sum of the power.
-</details>
-
-<details>
-<summary>Configure presence or occupancy</summary>

 ## Configure presence or occupancy

@@ -672,11 +647,6 @@ ATTENTION: groups of people do not function as a presence sensor. They are not r
 > 1. the change in temperature is immediate and is reflected on the front shutter. The calculation will take into account the new target temperature at the next calculation of the cycle,
 > 2. you can use the person.xxxx direct sensor or a group of Home Assistant sensors. The presence sensor manages the ``on`` or ``home`` states as present and the ``off`` or ``not_home`` states as absent.

-</details>
-
-<details>
-<summary>Advanced configuration</summary>
-
 ## Advanced configuration

 Those parameters allows to fine tune the thermostat.
@@ -693,6 +663,8 @@ Setting this parameter to ``0.00`` will trigger the safety preset regardless of

 The fourth parameter (``security_default_on_percent``) is the ``on_percent`` value that will be used when the thermostat enters ``safety`` mode. If you put ``0`` then the thermostat will be cut off when it goes into ``safety`` mode, putting 0.2% for example allows you to keep a little heating (20% in this case), even in mode ``safety``. It avoids finding your home totally frozen during a thermometer failure.

+Note: parameters `security_min_on_percent` et `security_default_on_percent` are not used by `over_climate` VTherm.
+
 Since version 5.3 it is possible to deactivate the safety device following a lack of data from the outdoor thermometer. Indeed, this most of the time having a low impact on regulation (depending on your settings), it is possible that it is absent without endangering the home. To do this, you must add the following lines to your `configuration.yaml`:
 ```
 versatile_thermostat:
@@ -711,11 +683,6 @@ See [example tuning](#examples-tuning) for common tuning examples
 > 4. For natural usage, the ``security_default_on_percent`` should be less than ``security_min_on_percent``,
 > 5. Thermostat of type ``thermostat_over_climate`` are not concerned by the safety feature.

-</details>
-
-<details>
-<summary>Centralized control</summary>
-
 ## Centralized control

 Since release 5.2, if you have defined a centralized configuration, you have a new entity named `select.central_mode` which allows you to control all VTherms with a single action. For a VTherm to be centrally controllable, its configuration attribute named `use_central_mode` must be true.
@@ -732,11 +699,6 @@ Example rendering:

 ![central_mode](images/central_mode.png)

-</details>
-
-<details>
-<summary>Control of a central boiler</summary>
-
 ## Control of a central boiler

 Since release 5.3, you have the possibility of controlling a centralized boiler. From the moment it is possible to start or stop this boiler from Home Assistant, then Versatile Thermostat will be able to control it directly.
@@ -838,8 +800,6 @@ context:
 > ![Tip](images/tips.png) _*Notes*_
 > Controlling a central boiler using software or hardware such as home automation can pose risks to its proper functioning. Before using these functions, make sure that your boiler has safety functions and that they are working. Turning on a boiler if all the taps are closed can generate excess pressure, for example.

-</details>
-
 <details>
 <summary>Parameter summary</summary>

@@ -905,6 +865,8 @@ 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
@@ -1160,6 +1122,9 @@ 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

@@ -1338,7 +1303,7 @@ Example of graph obtained with Plotly :


 ## And always better and better with the NOTIFIER daemon app to notify events
-This automation uses the excellent App Daemon named NOTIFIER developed by Horizon Domotique that you will find in demonstration [here](https://www.youtube.com/watch?v=chJylIK0ASo&ab_channel=HorizonDomotique) and the code is [here](https ://github.com/jlpouffier/home-assistant-config/blob/master/appdaemon/apps/notifier.py). It allows you to notify the users of the accommodation when one of the events affecting safety occurs on one of the Versatile Thermostats.
+This automation uses the excellent App Daemon named NOTIFIER developed by Horizon Domotique that you will find in demonstration [here](https://www.youtube.com/watch?v=chJylIK0ASo&ab_channel=HorizonDomotique) and the code is [here](https://github.com/jlpouffier/home-assistant-config/blob/master/appdaemon/apps/notifier.py). It allows you to notify the users of the accommodation when one of the events affecting safety occurs on one of the Versatile Thermostats.

 This is a great example of using the notifications described here [notification](#notifications).

@@ -1581,7 +1546,7 @@ These parameters are sensitive and quite difficult to adjust. Please only use th

 ## Why does my Versatile Thermostat go into Safety?

-Safety mode is only possible on VTherm `over_switch` and `over_valve`. It occurs when one of the 2 thermometers which gives the room temperature or the outside temperature has not sent a value for more than `security_delay_min` minutes and the radiator was heating at least `security_min_on_percent`.
+Safety mode is possible on all VTherm's type. It occurs when one of the 2 thermometers which gives the room temperature or the outside temperature has not sent a value for more than `security_delay_min` minutes and the radiator was heating at least `security_min_on_percent`.

 As the algorithm is based on temperature measurements, if they are no longer received by the VTherm, there is a risk of overheating and fire. To avoid this, when the conditions mentioned above are detected, heating is limited to the `security_default_on_percent` parameter. This value must therefore be reasonably low. It helps prevent a fire while avoiding completely cutting off the radiator (risk of freezing).

--- a/custom_components/versatile_thermostat/init.py
+++ b/custom_components/versatile_thermostat/init.py
@@ -38,6 +38,22 @@ 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
@@ -162,13 +178,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

    if hass.state == CoreState.running:
        await api.reload_central_boiler_entities_list()
-        await api.init_vtherm_links()
+        await api.init_vtherm_links(entry.entry_id)

    return True


 async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
    """Update listener."""
+
+    _LOGGER.debug(
+        "Calling update_listener entry: entry_id='%s', value='%s'",
+        entry.entry_id,
+        entry.data,
+    )
+
    if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_CENTRAL_CONFIG:
        await reload_all_vtherm(hass)
    else:
@@ -177,7 +200,7 @@ async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(hass)
        if api is not None:
            await api.reload_central_boiler_entities_list()
-            await api.init_vtherm_links()
+            await api.init_vtherm_links(entry.entry_id)


 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -208,10 +231,9 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry):
        )
        new = {**config_entry.data}

-        if (
-            config_entry.data.get(CONF_THERMOSTAT_TYPE)
-            == CONF_THERMOSTAT_CENTRAL_CONFIG
-        ):
+        thermostat_type = config_entry.data.get(CONF_THERMOSTAT_TYPE)
+
+        if 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
@@ -223,6 +245,50 @@ 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/auto_start_stop_algorithm.py
+++ b/custom_components/versatile_thermostat/auto_start_stop_algorithm.py
@@ -0,0 +1,239 @@
+# pylint: disable=line-too-long
+""" This file implements the Auto start/stop algorithm as described here: https://github.com/jmcollin78/versatile_thermostat/issues/585
+"""
+
+import logging
+from datetime import datetime
+from typing import Literal
+
+from homeassistant.components.climate import HVACMode
+
+from .const import (
+    AUTO_START_STOP_LEVEL_NONE,
+    AUTO_START_STOP_LEVEL_FAST,
+    AUTO_START_STOP_LEVEL_MEDIUM,
+    AUTO_START_STOP_LEVEL_SLOW,
+    TYPE_AUTO_START_STOP_LEVELS,
+)
+
+
+_LOGGER = logging.getLogger(__name__)
+
+# Some constant to make algorithm depending of level
+DT_MIN = {
+    AUTO_START_STOP_LEVEL_NONE: 0,  # Not used
+    AUTO_START_STOP_LEVEL_SLOW: 30,
+    AUTO_START_STOP_LEVEL_MEDIUM: 15,
+    AUTO_START_STOP_LEVEL_FAST: 7,
+}
+
+# the measurement cycle (2 min)
+CYCLE_SEC = 120
+
+# A temp hysteresis to avoid rapid OFF/ON
+TEMP_HYSTERESIS = 0.5
+
+ERROR_THRESHOLD = {
+    AUTO_START_STOP_LEVEL_NONE: 0,  # Not used
+    AUTO_START_STOP_LEVEL_SLOW: 10,  # 10 cycle above 1° or 5 cycle above 2°, ...
+    AUTO_START_STOP_LEVEL_MEDIUM: 5,  # 5 cycle above 1° or 3 cycle above 2°, ..., 1 cycle above 5°
+    AUTO_START_STOP_LEVEL_FAST: 2,  # 2 cycle above 1° or 1 cycle above 2°
+}
+
+AUTO_START_STOP_ACTION_OFF = "turnOff"
+AUTO_START_STOP_ACTION_ON = "turnOn"
+AUTO_START_STOP_ACTION_NOTHING = "nothing"
+AUTO_START_STOP_ACTIONS = Literal[  # pylint: disable=invalid-name
+    AUTO_START_STOP_ACTION_OFF,
+    AUTO_START_STOP_ACTION_ON,
+    AUTO_START_STOP_ACTION_NOTHING,
+]
+
+class AutoStartStopDetectionAlgorithm:
+    """The class that implements the algorithm listed above"""
+
+    _dt: float | None = None
+    _level: str = AUTO_START_STOP_LEVEL_NONE
+    _accumulated_error: float = 0
+    _error_threshold: float | None = None
+    _last_calculation_date: datetime | None = None
+
+    def __init__(self, level: TYPE_AUTO_START_STOP_LEVELS, vtherm_name) -> None:
+        """Initalize a new algorithm with the right constants"""
+        self._vtherm_name = vtherm_name
+        self._init_level(level)
+
+    def _init_level(self, level: TYPE_AUTO_START_STOP_LEVELS):
+        """Initialize a new level"""
+        if level == self._level:
+            return
+
+        self._level = level
+        if self._level != AUTO_START_STOP_LEVEL_NONE:
+            self._dt = DT_MIN[level]
+            self._error_threshold = ERROR_THRESHOLD[level]
+            # reset accumulated error if we change the level
+            self._accumulated_error = 0
+
+    def calculate_action(
+        self,
+        hvac_mode: HVACMode | None,
+        saved_hvac_mode: HVACMode | None,
+        target_temp: float,
+        current_temp: float,
+        slope_min: float | None,
+        now: datetime,
+    ) -> AUTO_START_STOP_ACTIONS:
+        """Calculate an eventual action to do depending of the value in parameter"""
+        if self._level == AUTO_START_STOP_LEVEL_NONE:
+            _LOGGER.debug(
+                "%s - auto-start/stop is disabled",
+                self,
+            )
+            return AUTO_START_STOP_ACTION_NOTHING
+
+        _LOGGER.debug(
+            "%s - calculate_action: hvac_mode=%s, saved_hvac_mode=%s, target_temp=%s, current_temp=%s, slope_min=%s at %s",
+            self,
+            hvac_mode,
+            saved_hvac_mode,
+            target_temp,
+            current_temp,
+            slope_min,
+            now,
+        )
+
+        if hvac_mode is None or target_temp is None or current_temp is None:
+            _LOGGER.debug(
+                "%s - No all mandatory parameters are set. Disable auto-start/stop",
+                self,
+            )
+            return AUTO_START_STOP_ACTION_NOTHING
+
+        # Calculate the error factor (P)
+        error = target_temp - current_temp
+
+        # reduce the error considering the dt between the last measurement
+        if self._last_calculation_date is not None:
+            dtmin = (now - self._last_calculation_date).total_seconds() / CYCLE_SEC
+            # ignore two calls too near (< 24 sec)
+            if dtmin <= 0.2:
+                _LOGGER.debug(
+                    "%s - new calculation of auto_start_stop (%s) is too near of the last one (%s). Forget it",
+                    self,
+                    now,
+                    self._last_calculation_date,
+                )
+                return AUTO_START_STOP_ACTION_NOTHING
+            error = error * dtmin
+
+        # If the error have change its sign, reset smoothly the accumulated error
+        if error * self._accumulated_error < 0:
+            self._accumulated_error = self._accumulated_error / 2.0
+
+        self._accumulated_error += error
+
+        # Capping of the error
+        self._accumulated_error = min(
+            self._error_threshold,
+            max(-self._error_threshold, self._accumulated_error),
+        )
+
+        self._last_calculation_date = now
+
+        temp_at_dt = current_temp + slope_min * self._dt
+
+        # Check to turn-off
+        # When we hit the threshold, that mean we can turn off
+        if hvac_mode == HVACMode.HEAT:
+            if (
+                self._accumulated_error <= -self._error_threshold
+                and temp_at_dt >= target_temp + TEMP_HYSTERESIS
+            ):
+                _LOGGER.info(
+                    "%s - We need to stop, there is no need for heating for a long time.",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_OFF
+            else:
+                _LOGGER.debug("%s - nothing to do, we are heating", self)
+                return AUTO_START_STOP_ACTION_NOTHING
+
+        if hvac_mode == HVACMode.COOL:
+            if (
+                self._accumulated_error >= self._error_threshold
+                and temp_at_dt <= target_temp - TEMP_HYSTERESIS
+            ):
+                _LOGGER.info(
+                    "%s - We need to stop, there is no need for cooling for a long time.",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_OFF
+            else:
+                _LOGGER.debug(
+                    "%s - nothing to do, we are cooling",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_NOTHING
+
+        # check to turn on
+        if hvac_mode == HVACMode.OFF and saved_hvac_mode == HVACMode.HEAT:
+            if temp_at_dt <= target_temp - TEMP_HYSTERESIS:
+                _LOGGER.info(
+                    "%s - We need to start, because it will be time to heat",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_ON
+            else:
+                _LOGGER.debug(
+                    "%s - nothing to do, we don't need to heat soon",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_NOTHING
+
+        if hvac_mode == HVACMode.OFF and saved_hvac_mode == HVACMode.COOL:
+            if temp_at_dt >= target_temp + TEMP_HYSTERESIS:
+                _LOGGER.info(
+                    "%s - We need to start, because it will be time to cool",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_ON
+            else:
+                _LOGGER.debug(
+                    "%s - nothing to do, we don't need to cool soon",
+                    self,
+                )
+                return AUTO_START_STOP_ACTION_NOTHING
+
+        _LOGGER.debug(
+            "%s - nothing to do, no conditions applied",
+            self,
+        )
+        return AUTO_START_STOP_ACTION_NOTHING
+
+    def set_level(self, level: TYPE_AUTO_START_STOP_LEVELS):
+        """Set a new level"""
+        self._init_level(level)
+
+    @property
+    def dt_min(self) -> float:
+        """Get the dt value"""
+        return self._dt
+
+    @property
+    def accumulated_error(self) -> float:
+        """Get the accumulated error value"""
+        return self._accumulated_error
+
+    @property
+    def accumulated_error_threshold(self) -> float:
+        """Get the accumulated error threshold value"""
+        return self._error_threshold
+
+    @property
+    def level(self) -> TYPE_AUTO_START_STOP_LEVELS:
+        """Get the level value"""
+        return self._level
+
+    def __str__(self) -> str:
+        return f"AutoStartStopDetectionAlgorithm-{self._vtherm_name}"
--- a/custom_components/versatile_thermostat/base_thermostat.py
+++ b/custom_components/versatile_thermostat/base_thermostat.py
@@ -15,10 +15,15 @@ from homeassistant.core import (
    callback,
    Event,
    State,
+
 )

 from homeassistant.components.climate import ClimateEntity
-from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.restore_state import (
+    RestoreEntity,
+    async_get as restore_async_get,
+)
+from homeassistant.helpers.entity import Entity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType

@@ -60,72 +65,7 @@ from homeassistant.const import (
    STATE_NOT_HOME,
 )

-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 .const import *  # pylint: disable=wildcard-import, unused-wildcard-import

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

@@ -197,6 +137,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                    "is_device_active",
                    "target_temperature_step",
                    "is_used_by_central_boiler",
+                    "temperature_slope"
                }
            )
        )
@@ -260,6 +201,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        self._attr_translation_key = "versatile_thermostat"

        self._total_energy = None
+        _LOGGER.debug("%s - _init_ resetting energy to None", self)

        # because energy of climate is calculated in the thermostat we have to keep that here and not in underlying entity
        self._underlying_climate_start_hvac_action_date = None
@@ -301,6 +243,8 @@ 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(
@@ -530,6 +474,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        self._presence_state = None

        self._total_energy = None
+        _LOGGER.debug("%s - post_init_ resetting energy to None", self)

        # Read the parameter from configuration.yaml if it exists
        short_ema_params = DEFAULT_SHORT_EMA_PARAMS
@@ -645,14 +590,24 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        # issue 428. Link to others entities will start at link
        # await self.async_startup()

+    async def async_will_remove_from_hass(self):
+        """Try to force backup of entity"""
+        _LOGGER.debug(
+            "%s - force write before remove. Energy is %s", self, self.total_energy
+        )
+        # Force dump in background
+        await restore_async_get(self.hass).async_dump_states()
+
    def remove_thermostat(self):
        """Called when the thermostat will be removed"""
        _LOGGER.info("%s - Removing thermostat", self)
+
        for under in self._underlyings:
            under.remove_entity()

    async def async_startup(self, central_configuration):
-        """Triggered on startup, used to get old state and set internal states accordingly"""
+        """Triggered on startup, used to get old state and set internal states accordingly. This is triggered by
+        VTherm API"""
        _LOGGER.debug("%s - Calling async_startup", self)

        _LOGGER.debug("%s - Calling async_startup_internal", self)
@@ -846,18 +801,29 @@ 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
-            else:
-                if not self._hvac_mode:
-                    self._hvac_mode = HVACMode.OFF
+
+            # 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
+            )

            old_total_energy = old_state.attributes.get(ATTR_TOTAL_ENERGY)
-            self._total_energy = old_total_energy if old_total_energy else 0
+            self._total_energy = old_total_energy if old_total_energy is not None else 0
+            _LOGGER.debug(
+                "%s - get_my_previous_state restored energy is %s",
+                self,
+                self._total_energy,
+            )

            self.restore_specific_previous_state(old_state)
        else:
@@ -871,13 +837,20 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                "No previously saved temperature, setting to %s", self._target_temp
            )
            self._total_energy = 0
+            _LOGGER.debug(
+                "%s - get_my_previous_state  no previous state energy is %s",
+                self,
+                self._total_energy,
+            )

-        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})

@@ -985,16 +958,6 @@ 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
@@ -1159,10 +1122,17 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        return len(self._underlyings)

    @property
-    def underlying_entities(self) -> int:
+    def underlying_entities(self) -> list | None:
        """Returns the underlying entities"""
        return self._underlyings

+    def find_underlying_by_entity_id(self, entity_id: str) -> Entity | None:
+        """Get the underlying entity by a entity_id"""
+        for under in self._underlyings:
+            if under.entity_id == entity_id:
+                return under
+        return None
+
    @property
    def is_on(self) -> bool:
        """True if the VTherm is on (! HVAC_OFF)"""
@@ -1184,6 +1154,13 @@ 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:
@@ -1225,6 +1202,24 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
        if hvac_mode is None:
            return

+        def save_state():
+            self.reset_last_change_time()
+            self.update_custom_attributes()
+            self.async_write_ha_state()
+            self.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": self._hvac_mode})
+
+        # If we already are in OFF, the manual OFF should just overwrite the reason and saved_hvac_mode
+        if self._hvac_mode == HVACMode.OFF and hvac_mode == HVACMode.OFF:
+            _LOGGER.info(
+                "%s - already in OFF. Change the reason to MANUAL and erase the saved_havc_mode"
+            )
+            self._hvac_off_reason = HVAC_OFF_REASON_MANUAL
+            self._saved_hvac_mode = HVACMode.OFF
+
+            save_state()
+
+            return
+
        self._hvac_mode = hvac_mode

        # Delegate to all underlying
@@ -1247,11 +1242,10 @@ 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.update_custom_attributes()
-        self.async_write_ha_state()
-        self.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": self._hvac_mode})
+        save_state()

    @overrides
    async def async_set_preset_mode(
@@ -1645,9 +1639,28 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):

            if not long_enough:
                _LOGGER.debug(
-                    "Motion delay condition is not satisfied. Ignore motion event"
+                    "Motion delay condition is not satisfied (the sensor have change its state during the delay). Check motion sensor state"
                )
-            else:
+                # Get sensor current state
+                motion_state = self.hass.states.get(self._motion_sensor_entity_id)
+                _LOGGER.debug(
+                    "%s - motion_state=%s, new_state.state=%s",
+                    self,
+                    motion_state.state,
+                    new_state.state,
+                )
+                if (
+                    motion_state.state == new_state.state
+                    and new_state.state == STATE_ON
+                ):
+                    _LOGGER.debug(
+                        "%s - the motion sensor is finally 'on' after the delay", self
+                    )
+                    long_enough = True
+                else:
+                    long_enough = False
+
+            if long_enough:
                _LOGGER.debug("%s - Motion delay condition is satisfied", self)
                self._motion_state = new_state.state
                if self._attr_preset_mode == PRESET_ACTIVITY:
@@ -1670,6 +1683,11 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
                    )
                self.recalculate()
                await self.async_control_heating(force=True)
+            else:
+                self._motion_state = (
+                    STATE_ON if new_state.state == STATE_OFF else STATE_OFF
+                )
+
            self._motion_call_cancel = None

        im_on = self._motion_state == STATE_ON
@@ -1727,6 +1745,19 @@ 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)

@@ -2063,6 +2094,10 @@ 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)
@@ -2194,27 +2229,34 @@ 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:
-            await self.async_set_hvac_mode(HVACMode.OFF)
+            if self.hvac_mode != HVACMode.OFF:
+                self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
+                await self.async_set_hvac_mode(HVACMode.OFF)
            return

        if new_central_mode == CENTRAL_MODE_COOL_ONLY:
            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

        if new_central_mode == CENTRAL_MODE_HEAT_ONLY:
            if HVACMode.HEAT in self.hvac_modes:
                await self.async_set_hvac_mode(HVACMode.HEAT)
-            else:
+            # if not already off
+            elif self.hvac_mode != HVACMode.OFF:
+                self.set_hvac_off_reason(HVAC_OFF_REASON_MANUAL)
                await self.async_set_hvac_mode(HVACMode.OFF)
            return

@@ -2228,6 +2270,7 @@ 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

@@ -2407,17 +2450,27 @@ 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 not new_state:
+        if new_state is False:
            _LOGGER.info(
-                "%s - Window is closed. Restoring hvac_mode '%s' if central_mode is not STOPPED",
+                "%s - Window is closed. Restoring hvac_mode '%s' if stopped by window detection or temperature %s",
                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, CONF_WINDOW_FAN_ONLY]:
+            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]:
                if self.last_central_mode != CENTRAL_MODE_STOPPED:
+                    self.set_hvac_off_reason(None)
                    await self.restore_hvac_mode(True)
            else:
                _LOGGER.error(
@@ -2429,6 +2482,12 @@ 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()
@@ -2458,6 +2517,7 @@ 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:
@@ -2600,8 +2660,26 @@ class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
            "is_device_active": self.is_device_active,
            "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,
        }

+        _LOGGER.debug(
+            "%s - update_custom_attributes saved energy is %s",
+            self,
+            self.total_energy,
+        )
+
+    @overrides
+    def async_write_ha_state(self):
+        """overrides to have log"""
+        _LOGGER.debug(
+            "%s - async_write_ha_state written state energy is %s",
+            self,
+            self._total_energy,
+        )
+        return super().async_write_ha_state()
+
    @callback
    def async_registry_entry_updated(self):
        """update the entity if the config entry have been updated
--- a/custom_components/versatile_thermostat/binary_sensor.py
+++ b/custom_components/versatile_thermostat/binary_sensor.py
@@ -100,7 +100,7 @@ class SecurityBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
        entry_infos,
    ) -> None:
        """Initialize the SecurityState Binary sensor"""
-        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
+        super().__init__(hass, unique_id, name)
        self._attr_name = "Security state"
        self._attr_unique_id = f"{self._device_name}_security_state"
        self._attr_is_on = False
--- a/custom_components/versatile_thermostat/climate.py
+++ b/custom_components/versatile_thermostat/climate.py
@@ -37,11 +37,13 @@ from .const import (
    CONF_THERMOSTAT_CLIMATE,
    CONF_THERMOSTAT_VALVE,
    CONF_THERMOSTAT_CENTRAL_CONFIG,
+    CONF_SONOFF_TRZB_MODE,
 )

 from .thermostat_switch import ThermostatOverSwitch
 from .thermostat_climate import ThermostatOverClimate
 from .thermostat_valve import ThermostatOverValve
+from .thermostat_sonoff_trvzb import ThermostatOverSonoffTRVZB

 _LOGGER = logging.getLogger(__name__)

@@ -60,6 +62,7 @@ async def async_setup_entry(
    unique_id = entry.entry_id
    name = entry.data.get(CONF_NAME)
    vt_type = entry.data.get(CONF_THERMOSTAT_TYPE)
+    is_sonoff_trvzb = entry.data.get(CONF_SONOFF_TRZB_MODE)

    if vt_type == CONF_THERMOSTAT_CENTRAL_CONFIG:
        return
@@ -69,7 +72,10 @@ async def async_setup_entry(
    if vt_type == CONF_THERMOSTAT_SWITCH:
        entity = ThermostatOverSwitch(hass, unique_id, name, entry.data)
    elif vt_type == CONF_THERMOSTAT_CLIMATE:
-        entity = ThermostatOverClimate(hass, unique_id, name, entry.data)
+        if is_sonoff_trvzb is True:
+            entity = ThermostatOverSonoffTRVZB(hass, unique_id, name, entry.data)
+        else:
+            entity = ThermostatOverClimate(hass, unique_id, name, entry.data)
    elif vt_type == CONF_THERMOSTAT_VALVE:
        entity = ThermostatOverValve(hass, unique_id, name, entry.data)
    else:
--- a/custom_components/versatile_thermostat/commons.py
+++ b/custom_components/versatile_thermostat/commons.py
@@ -17,7 +17,6 @@ from .const import DOMAIN, DEVICE_MANUFACTURER, ServiceConfigurationError

 _LOGGER = logging.getLogger(__name__)

-
 def get_tz(hass: HomeAssistant):
    """Get the current timezone"""

--- a/custom_components/versatile_thermostat/config_flow.py
+++ b/custom_components/versatile_thermostat/config_flow.py
@@ -109,17 +109,17 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            or self._infos.get(CONF_WINDOW_AUTO_OPEN_THRESHOLD) is not None
        )
        self._infos[CONF_USE_MOTION_FEATURE] = self._infos.get(
-            CONF_USE_MOTION_FEATURE
+            CONF_USE_MOTION_FEATURE, False
        ) and (self._infos.get(CONF_MOTION_SENSOR) is not None or is_central_config)

        self._infos[CONF_USE_POWER_FEATURE] = self._infos.get(
-            CONF_USE_POWER_CENTRAL_CONFIG
+            CONF_USE_POWER_CENTRAL_CONFIG, False
        ) or (
            self._infos.get(CONF_POWER_SENSOR) is not None
            and self._infos.get(CONF_MAX_POWER_SENSOR) is not None
        )
        self._infos[CONF_USE_PRESENCE_FEATURE] = (
-            self._infos.get(CONF_USE_PRESENCE_CENTRAL_CONFIG)
+            self._infos.get(CONF_USE_PRESENCE_CENTRAL_CONFIG, False)
            or self._infos.get(CONF_PRESENCE_SENSOR) is not None
        )

@@ -128,6 +128,11 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            and self._infos.get(CONF_CENTRAL_BOILER_DEACTIVATION_SRV) is not None
        )

+        self._infos[CONF_USE_AUTO_START_STOP_FEATURE] = (
+            self._infos.get(CONF_USE_AUTO_START_STOP_FEATURE, False) is True
+            and self._infos.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_CLIMATE
+        )
+
    def _init_central_config_flags(self, infos):
        """Initialisation of central configuration flags"""
        is_empty: bool = not bool(infos)
@@ -140,19 +145,43 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            CONF_USE_PRESETS_CENTRAL_CONFIG,
            CONF_USE_PRESENCE_CENTRAL_CONFIG,
            CONF_USE_ADVANCED_CENTRAL_CONFIG,
+            CONF_USE_CENTRAL_MODE,
        ):
            if not is_empty:
                current_config = self._infos.get(config, None)
-                self._infos[config] = current_config is True or (
-                    current_config is None and self._central_config is not None
+
+                self._infos[config] = self._central_config is not None and (
+                    current_config is True or current_config is None
                )
+                # self._infos[config] = current_config is True or (
+                #     current_config is None and self._central_config is not None
+                # )
            else:
                self._infos[config] = self._central_config is not None

        if COMES_FROM in self._infos:
            del self._infos[COMES_FROM]

-    async def validate_input(self, data: dict) -> None:
+    def check_sonoff_trvzb_nb_entities(self, data: dict) -> bool:
+        """Check the number of entities for Sonoff TRVZB"""
+        ret = True
+        if (
+            self._infos.get(CONF_SONOFF_TRZB_MODE)
+            and data.get(CONF_OFFSET_CALIBRATION_LIST) is not None
+        ):
+            nb_unders = len(self._infos.get(CONF_UNDERLYING_LIST))
+            nb_offset = len(data.get(CONF_OFFSET_CALIBRATION_LIST))
+            nb_opening = len(data.get(CONF_OPENING_DEGREE_LIST))
+            nb_closing = len(data.get(CONF_CLOSING_DEGREE_LIST))
+            if (
+                nb_unders != nb_offset
+                or nb_unders != nb_opening
+                or nb_unders != nb_closing
+            ):
+                ret = False
+        return ret
+
+    async def validate_input(self, data: dict, step_id) -> None:
        """Validate the user input allows us to connect.

        Data has the keys from STEP_*_DATA_SCHEMA with values provided by the user.
@@ -160,7 +189,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):

        # check the heater_entity_id
        for conf in [
-            CONF_HEATER,
+            CONF_UNDERLYING_LIST,
            CONF_TEMP_SENSOR,
            CONF_EXTERNAL_TEMP_SENSOR,
            CONF_WINDOW_SENSOR,
@@ -168,15 +197,20 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            CONF_POWER_SENSOR,
            CONF_MAX_POWER_SENSOR,
            CONF_PRESENCE_SENSOR,
-            CONF_CLIMATE,
+            CONF_OFFSET_CALIBRATION_LIST,
+            CONF_OPENING_DEGREE_LIST,
+            CONF_CLOSING_DEGREE_LIST,
        ]:
            d = data.get(conf, None)  # pylint: disable=invalid-name
-            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)
+            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)

        # Check that only one window feature is used
        ws = self._infos.get(CONF_WINDOW_SENSOR)  # pylint: disable=invalid-name
@@ -202,6 +236,9 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                CONF_USE_PRESENCE_CENTRAL_CONFIG,
                CONF_USE_PRESETS_CENTRAL_CONFIG,
                CONF_USE_ADVANCED_CENTRAL_CONFIG,
+                CONF_USE_CENTRAL_MODE,
+                # CONF_USE_CENTRAL_BOILER_FEATURE, this is for Central Config
+                CONF_USED_BY_CENTRAL_BOILER,
            ]:
                if data.get(conf) is True:
                    _LOGGER.error(
@@ -220,6 +257,11 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                except ServiceConfigurationError as err:
                    raise ServiceConfigurationError(conf) from err

+        # Check that the number of offet_calibration and opening_degree and closing_degree are equals
+        # to the number of underlying entities
+        if not self.check_sonoff_trvzb_nb_entities(data):
+            raise SonoffTRVZBNbEntitiesIncorrect()
+
    def check_config_complete(self, infos) -> bool:
        """True if the config is now complete (ie all mandatory attributes are set)"""
        is_central_config = (
@@ -265,21 +307,8 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            ):
                return False

-            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
+            if infos.get(CONF_UNDERLYING_LIST, None) is not None and not infos.get(
+                CONF_UNDERLYING_LIST, None
            ):
                return False

@@ -312,6 +341,25 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            ):
                return False

+            if (
+                infos.get(CONF_PROP_FUNCTION, None) == PROPORTIONAL_FUNCTION_TPI
+                and infos.get(CONF_USE_TPI_CENTRAL_CONFIG, False) is False
+                and (
+                    infos.get(CONF_TPI_COEF_INT, None) is None
+                    or infos.get(CONF_TPI_COEF_EXT) is None
+                )
+            ):
+                return False
+
+            if (
+                infos.get(CONF_USE_PRESETS_CENTRAL_CONFIG, False) is True
+                and self._central_config is None
+            ):
+                return False
+
+            if not self.check_sonoff_trvzb_nb_entities(infos):
+                return False
+
        return True

    def merge_user_input(self, data_schema: vol.Schema, user_input: dict):
@@ -341,7 +389,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
        if user_input is not None:
            defaults.update(user_input or {})
            try:
-                await self.validate_input(user_input)
+                await self.validate_input(user_input, step_id)
            except UnknownEntity as err:
                errors[str(err)] = "unknown_entity"
            except WindowOpenDetectionMethod as err:
@@ -352,6 +400,8 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                errors[str(err)] = "service_configuration_format"
            except ConfigurationNotCompleteError as err:
                errors["base"] = "configuration_not_complete"
+            except SonoffTRVZBNbEntitiesIncorrect as err:
+                errors["base"] = "sonoff_trvzb_nb_entities_incorrect"
            except Exception:  # pylint: disable=broad-except
                _LOGGER.exception("Unexpected exception")
                errors["base"] = "unknown"
@@ -431,6 +481,16 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
        if self._infos[CONF_USE_PRESENCE_FEATURE] is True:
            menu_options.append("presence")

+        if self._infos.get(CONF_USE_AUTO_START_STOP_FEATURE) is True and self._infos[
+            CONF_THERMOSTAT_TYPE
+        ] in [
+            CONF_THERMOSTAT_CLIMATE,
+        ]:
+            menu_options.append("auto_start_stop")
+
+        if self._infos.get(CONF_SONOFF_TRZB_MODE) is True:
+            menu_options.append("sonoff_trvzb")
+
        menu_options.append("advanced")

        if self.check_config_complete(self._infos):
@@ -500,6 +560,24 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
        """Handle the Type flow steps"""
        _LOGGER.debug("Into ConfigFlow.async_step_type user_input=%s", user_input)

+        if (
+            self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_CLIMATE
+            and user_input is not None
+            and not user_input.get(CONF_SONOFF_TRZB_MODE)
+        ):
+            # Remove TPI info
+            for key in [
+                PROPORTIONAL_FUNCTION_TPI,
+                CONF_PROP_FUNCTION,
+                CONF_TPI_COEF_INT,
+                CONF_TPI_COEF_EXT,
+                CONF_OFFSET_CALIBRATION_LIST,
+                CONF_OPENING_DEGREE_LIST,
+                CONF_CLOSING_DEGREE_LIST,
+            ]:
+                if self._infos.get(key):
+                    del self._infos[key]
+
        if self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_SWITCH:
            return await self.generic_step(
                "type", STEP_THERMOSTAT_SWITCH, user_input, self.async_step_menu
@@ -520,17 +598,43 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
        """Handle the Type flow steps"""
        _LOGGER.debug("Into ConfigFlow.async_step_features user_input=%s", user_input)

+        schema = STEP_FEATURES_DATA_SCHEMA
+        if self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_CENTRAL_CONFIG:
+            schema = STEP_CENTRAL_FEATURES_DATA_SCHEMA
+        elif self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_CLIMATE:
+            schema = STEP_CLIMATE_FEATURES_DATA_SCHEMA
+
        return await self.generic_step(
            "features",
-            (
-                STEP_CENTRAL_FEATURES_DATA_SCHEMA
-                if self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_CENTRAL_CONFIG
-                else STEP_FEATURES_DATA_SCHEMA
-            ),
+            schema,
            user_input,
            self.async_step_menu,
        )

+    async def async_step_auto_start_stop(self, user_input: dict | None = None) -> FlowResult:
+        """ Handle the Auto start stop step"""
+        _LOGGER.debug("Into ConfigFlow.async_step_auto_start_stop user_input=%s", user_input)
+
+        schema = STEP_AUTO_START_STOP
+        self._infos[COMES_FROM] = None
+        next_step = self.async_step_menu
+
+        return await self.generic_step("auto_start_stop", schema, user_input, next_step)
+
+    async def async_step_sonoff_trvzb(
+        self, user_input: dict | None = None
+    ) -> FlowResult:
+        """Handle the Sonoff TRVZB configuration step"""
+        _LOGGER.debug(
+            "Into ConfigFlow.async_step_sonoff_trvzb user_input=%s", user_input
+        )
+
+        schema = STEP_SONOFF_TRVZB
+        self._infos[COMES_FROM] = None
+        next_step = self.async_step_menu
+
+        return await self.generic_step("sonoff_trvzb", schema, user_input, next_step)
+
    async def async_step_tpi(self, user_input: dict | None = None) -> FlowResult:
        """Handle the TPI flow steps"""
        _LOGGER.debug("Into ConfigFlow.async_step_tpi user_input=%s", user_input)
@@ -869,6 +973,8 @@ class VersatileThermostatOptionsFlowHandler(
        if not self._infos[CONF_USE_CENTRAL_BOILER_FEATURE]:
            self._infos[CONF_CENTRAL_BOILER_ACTIVATION_SRV] = None
            self._infos[CONF_CENTRAL_BOILER_DEACTIVATION_SRV] = None
+        if not self._infos[CONF_USE_AUTO_START_STOP_FEATURE]:
+            self._infos[CONF_AUTO_START_STOP_LEVEL] = AUTO_START_STOP_LEVEL_NONE

        _LOGGER.info(
            "Recreating entry %s due to configuration change. New config is now: %s",
--- a/custom_components/versatile_thermostat/config_schema.py
+++ b/custom_components/versatile_thermostat/config_schema.py
@@ -68,6 +68,16 @@ STEP_FEATURES_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
    }
 )

+STEP_CLIMATE_FEATURES_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
+    {
+        vol.Optional(CONF_USE_WINDOW_FEATURE, default=False): cv.boolean,
+        vol.Optional(CONF_USE_MOTION_FEATURE, default=False): cv.boolean,
+        vol.Optional(CONF_USE_POWER_FEATURE, default=False): cv.boolean,
+        vol.Optional(CONF_USE_PRESENCE_FEATURE, default=False): cv.boolean,
+        vol.Optional(CONF_USE_AUTO_START_STOP_FEATURE, default=False): cv.boolean,
+    }
+)
+
 STEP_CENTRAL_FEATURES_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
    {
        vol.Optional(CONF_USE_WINDOW_FEATURE, default=False): cv.boolean,
@@ -109,17 +119,10 @@ STEP_CENTRAL_BOILER_SCHEMA = vol.Schema(

 STEP_THERMOSTAT_SWITCH = vol.Schema(  # pylint: disable=invalid-name
    {
-        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.Required(CONF_UNDERLYING_LIST): selector.EntitySelector(
+            selector.EntitySelectorConfig(
+                domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN], multiple=True
+            ),
        ),
        vol.Optional(CONF_HEATER_KEEP_ALIVE): cv.positive_int,
        vol.Required(CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI): vol.In(
@@ -134,19 +137,11 @@ STEP_THERMOSTAT_SWITCH = vol.Schema(  # pylint: disable=invalid-name

 STEP_THERMOSTAT_CLIMATE = vol.Schema(  # pylint: disable=invalid-name
    {
-        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.Required(CONF_UNDERLYING_LIST): selector.EntitySelector(
+            selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN, multiple=True),
        ),
        vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
+        vol.Optional(CONF_SONOFF_TRZB_MODE, default=False): cv.boolean,
        vol.Optional(
            CONF_AUTO_REGULATION_MODE, default=CONF_AUTO_REGULATION_NONE
        ): selector.SelectSelector(
@@ -173,17 +168,10 @@ STEP_THERMOSTAT_CLIMATE = vol.Schema(  # pylint: disable=invalid-name

 STEP_THERMOSTAT_VALVE = vol.Schema(  # pylint: disable=invalid-name
    {
-        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_UNDERLYING_LIST): selector.EntitySelector(
+            selector.EntitySelectorConfig(
+                domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN], multiple=True
+            ),
        ),
        vol.Required(CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI): vol.In(
            [
@@ -196,6 +184,45 @@ STEP_THERMOSTAT_VALVE = vol.Schema(  # pylint: disable=invalid-name
    }
 )

+STEP_AUTO_START_STOP = vol.Schema(  # pylint: disable=invalid-name
+    {
+        vol.Optional(
+            CONF_AUTO_START_STOP_LEVEL, default=AUTO_START_STOP_LEVEL_NONE
+        ): selector.SelectSelector(
+            selector.SelectSelectorConfig(
+                options=CONF_AUTO_START_STOP_LEVELS,
+                translation_key="auto_start_stop",
+                mode="dropdown",
+            )
+        ),
+    }
+)
+
+STEP_SONOFF_TRVZB = vol.Schema(  # pylint: disable=invalid-name
+    {
+        vol.Required(CONF_OFFSET_CALIBRATION_LIST): selector.EntitySelector(
+            selector.EntitySelectorConfig(
+                domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN], multiple=True
+            ),
+        ),
+        vol.Required(CONF_OPENING_DEGREE_LIST): selector.EntitySelector(
+            selector.EntitySelectorConfig(
+                domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN], multiple=True
+            ),
+        ),
+        vol.Required(CONF_CLOSING_DEGREE_LIST): selector.EntitySelector(
+            selector.EntitySelectorConfig(
+                domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN], multiple=True
+            ),
+        ),
+        vol.Required(CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI): vol.In(
+            [
+                PROPORTIONAL_FUNCTION_TPI,
+            ]
+        ),
+    }
+)
+
 STEP_TPI_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
    {
        vol.Required(CONF_USE_TPI_CENTRAL_CONFIG, default=True): cv.boolean,
--- a/custom_components/versatile_thermostat/const.py
+++ b/custom_components/versatile_thermostat/const.py
@@ -2,6 +2,7 @@
 """Constants for the Versatile Thermostat integration."""

 import logging
+from typing import Literal

 from enum import Enum
 from homeassistant.const import CONF_NAME, Platform
@@ -22,8 +23,8 @@ from .prop_algorithm import (

 _LOGGER = logging.getLogger(__name__)

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

 PRESET_TEMP_SUFFIX = "_temp"
 PRESET_AC_SUFFIX = "_ac"
@@ -51,12 +52,10 @@ PLATFORMS: list[Platform] = [
    # Number should be after CLIMATE
    Platform.NUMBER,
    Platform.BINARY_SENSOR,
+    Platform.SWITCH,
 ]

-CONF_HEATER = "heater_entity_id"
-CONF_HEATER_2 = "heater_entity2_id"
-CONF_HEATER_3 = "heater_entity3_id"
-CONF_HEATER_4 = "heater_entity4_id"
+CONF_UNDERLYING_LIST = "underlying_entity_ids"
 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"
@@ -88,23 +87,17 @@ 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"
 CONF_USE_POWER_FEATURE = "use_power_feature"
 CONF_USE_CENTRAL_BOILER_FEATURE = "use_central_boiler_feature"
+CONF_USE_AUTO_START_STOP_FEATURE = "use_auto_start_stop_feature"
 CONF_AC_MODE = "ac_mode"
+CONF_SONOFF_TRZB_MODE = "sonoff_trvzb_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"
@@ -123,6 +116,23 @@ CONF_AUTO_FAN_MEDIUM = "auto_fan_medium"
 CONF_AUTO_FAN_HIGH = "auto_fan_high"
 CONF_AUTO_FAN_TURBO = "auto_fan_turbo"
 CONF_STEP_TEMPERATURE = "step_temperature"
+CONF_OFFSET_CALIBRATION_LIST = "offset_calibration_entity_ids"
+CONF_OPENING_DEGREE_LIST = "opening_degree_entity_ids"
+CONF_CLOSING_DEGREE_LIST = "closing_degree_entity_ids"
+
+# 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"
@@ -145,6 +155,36 @@ CONF_CENTRAL_BOILER_DEACTIVATION_SRV = "central_boiler_deactivation_service"
 CONF_USED_BY_CENTRAL_BOILER = "used_by_controls_central_boiler"
 CONF_WINDOW_ACTION = "window_action"

+CONF_AUTO_START_STOP_LEVEL = "auto_start_stop_level"
+AUTO_START_STOP_LEVEL_NONE = "auto_start_stop_none"
+AUTO_START_STOP_LEVEL_SLOW = "auto_start_stop_slow"
+AUTO_START_STOP_LEVEL_MEDIUM = "auto_start_stop_medium"
+AUTO_START_STOP_LEVEL_FAST = "auto_start_stop_fast"
+CONF_AUTO_START_STOP_LEVELS = [
+    AUTO_START_STOP_LEVEL_NONE,
+    AUTO_START_STOP_LEVEL_SLOW,
+    AUTO_START_STOP_LEVEL_MEDIUM,
+    AUTO_START_STOP_LEVEL_FAST,
+]
+
+# For explicit typing purpose only
+TYPE_AUTO_START_STOP_LEVELS = Literal[  # pylint: disable=invalid-name
+    AUTO_START_STOP_LEVEL_FAST,
+    AUTO_START_STOP_LEVEL_MEDIUM,
+    AUTO_START_STOP_LEVEL_SLOW,
+    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
@@ -216,10 +256,6 @@ 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,
@@ -249,20 +285,13 @@ 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_SONOFF_TRZB_MODE,
        CONF_AUTO_REGULATION_MODE,
        CONF_AUTO_REGULATION_DTEMP,
        CONF_AUTO_REGULATION_PERIOD_MIN,
@@ -330,7 +359,11 @@ CONF_WINDOW_ACTIONS = [
    CONF_WINDOW_ECO_TEMP,
 ]

-SUPPORT_FLAGS = ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.TURN_OFF | ClimateEntityFeature.TURN_ON
+SUPPORT_FLAGS = (
+    ClimateEntityFeature.TARGET_TEMPERATURE
+    | ClimateEntityFeature.TURN_OFF
+    | ClimateEntityFeature.TURN_ON
+)

 SERVICE_SET_PRESENCE = "set_presence"
 SERVICE_SET_PRESET_TEMPERATURE = "set_preset_temperature"
@@ -445,6 +478,7 @@ class EventType(Enum):
    CENTRAL_BOILER_EVENT: str = "versatile_thermostat_central_boiler_event"
    PRESET_EVENT: str = "versatile_thermostat_preset_event"
    WINDOW_AUTO_EVENT: str = "versatile_thermostat_window_auto_event"
+    AUTO_START_STOP_EVENT: str = "versatile_thermostat_auto_start_stop_event"


 def send_vtherm_event(hass, event_type: EventType, entity, data: dict):
@@ -476,6 +510,11 @@ class ConfigurationNotCompleteError(HomeAssistantError):
    """Error the configuration is not complete"""


+class SonoffTRVZBNbEntitiesIncorrect(HomeAssistantError):
+    """Error to indicate there is an error in the configuration of the Sonoff TRVZB.
+    The number of specific entities is incorrect."""
+
+
 class overrides:  # pylint: disable=invalid-name
    """An annotation to inform overrides"""

--- a/custom_components/versatile_thermostat/icons.json
+++ b/custom_components/versatile_thermostat/icons.json
@@ -0,0 +1,18 @@
+{
+  "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.3.0",
+  "version": "6.8.0.alpha",
  "zeroconf": []
 }
--- a/custom_components/versatile_thermostat/number.py
+++ b/custom_components/versatile_thermostat/number.py
@@ -20,7 +20,6 @@ from homeassistant.components.climate import (
    PRESET_COMFORT,
    PRESET_ECO,
 )
-from homeassistant.components.sensor import UnitOfTemperature

 from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.config_entries import ConfigEntry
@@ -487,8 +486,8 @@ class TemperatureNumber(  # pylint: disable=abstract-method
            )
        )

-        # We set the min, max and step from central config if relevant because it is possible that central config
-        # was not loaded at startup
+        # We set the min, max and step from central config if relevant because it is possible
+        # that central config was not loaded at startup
        self.init_min_max_step()

    def __str__(self):
--- a/custom_components/versatile_thermostat/prop_algorithm.py
+++ b/custom_components/versatile_thermostat/prop_algorithm.py
@@ -1,4 +1,5 @@
 """ The TPI calculation module """
+# pylint: disable='line-too-long'
 import logging

 from homeassistant.components.climate import HVACMode
@@ -15,6 +16,7 @@ FUNCTION_TYPE = [PROPORTIONAL_FUNCTION_ATAN, PROPORTIONAL_FUNCTION_LINEAR]


 def is_number(value):
+    """check if value is a number"""
    return isinstance(value, (int, float))


@@ -61,7 +63,7 @@ class PropAlgorithm:
                minimal_activation_delay,
            )
            raise TypeError(
-                f"TPI parameters are not set correctly. VTherm will not work as expected. Please reconfigure it correctly. See previous log for values"
+                "TPI parameters are not set correctly. VTherm will not work as expected. Please reconfigure it correctly. See previous log for values"
            )

        self._vtherm_entity_id = vtherm_entity_id
--- a/custom_components/versatile_thermostat/select.py
+++ b/custom_components/versatile_thermostat/select.py
@@ -3,19 +3,15 @@
 """ Implements the VersatileThermostat select component """
 import logging

-from homeassistant.const import EVENT_HOMEASSISTANT_START
-from homeassistant.core import HomeAssistant, CoreState, callback
+from homeassistant.core import HomeAssistant

-from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
 from homeassistant.components.select import SelectEntity
 from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.entity_component import EntityComponent

 from custom_components.versatile_thermostat.base_thermostat import (
-    BaseThermostat,
    ConfigData,
 )

@@ -126,6 +122,12 @@ class CentralModeSelect(SelectEntity, RestoreEntity):
            self._attr_current_option = option
            await self.notify_central_mode_change(old_central_mode=old_option)

+    @overrides
+    def select_option(self, option: str) -> None:
+        """Change the selected option"""
+        # Update the VTherms which have temperature in central config
+        self.hass.create_task(self.async_select_option(option))
+
    async def notify_central_mode_change(self, old_central_mode: str | None = None):
        """Notify all VTherm that the central_mode have change"""
        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(self.hass)
--- a/custom_components/versatile_thermostat/sensor.py
+++ b/custom_components/versatile_thermostat/sensor.py
@@ -17,7 +17,6 @@ from homeassistant.components.sensor import (
    SensorEntity,
    SensorDeviceClass,
    SensorStateClass,
-    UnitOfTemperature,
 )
 from homeassistant.config_entries import ConfigEntry

@@ -50,6 +49,7 @@ from .const import (
    CONF_THERMOSTAT_TYPE,
    CONF_THERMOSTAT_CENTRAL_CONFIG,
    CONF_USE_CENTRAL_BOILER_FEATURE,
+    CONF_SONOFF_TRZB_MODE,
    overrides,
 )

@@ -71,6 +71,7 @@ async def async_setup_entry(
    unique_id = entry.entry_id
    name = entry.data.get(CONF_NAME)
    vt_type = entry.data.get(CONF_THERMOSTAT_TYPE)
+    is_sonoff_trvzb = entry.data.get(CONF_SONOFF_TRZB_MODE)

    entities = None

@@ -99,10 +100,16 @@ async def async_setup_entry(
            entities.append(OnTimeSensor(hass, unique_id, name, entry.data))
            entities.append(OffTimeSensor(hass, unique_id, name, entry.data))

-        if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE:
+        if (
+            entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE
+            or is_sonoff_trvzb
+        ):
            entities.append(ValveOpenPercentSensor(hass, unique_id, name, entry.data))

-        if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_CLIMATE:
+        if (
+            entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_CLIMATE
+            and not is_sonoff_trvzb
+        ):
            entities.append(
                RegulatedTemperatureSensor(hass, unique_id, name, entry.data)
            )
--- a/custom_components/versatile_thermostat/strings.json
+++ b/custom_components/versatile_thermostat/strings.json
@@ -27,6 +27,8 @@
          "power": "Power management",
          "presence": "Presence detection",
          "advanced": "Advanced parameters",
+          "auto_start_stop": "Auto start and stop",
+          "sonoff_trvzb": "Sonoff TRVZB configuration",
          "finalize": "All done",
          "configuration_not_complete": "Configuration not complete"
        }
@@ -63,28 +65,19 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page",
+          "use_auto_start_stop_feature": "Use the auto start and stop feature"
        }
      },
      "type": {
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "1st heater switch",
-          "heater_entity2_id": "2nd heater switch",
-          "heater_entity3_id": "3rd heater switch",
-          "heater_entity4_id": "4th heater switch",
+          "underlying_entity_ids": "The device(s) to be controlled",
          "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",
+          "sonoff_trvzb_mode": "SONOFF TRVZB mode",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -93,21 +86,11 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "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",
+          "underlying_entity_ids": "The device(s) to be controlled - 1 is 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",
+          "sonoff_trvzb_mode": "The underlyings are SONOFF TRVZB. You have to configure some extra entities in the specific menu option 'Sonoff trvzb configuration'",
          "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",
@@ -223,6 +206,34 @@
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
+      },
+      "central_boiler": {
+        "title": "Control of the central boiler",
+        "description": "Enter the services to call to turn on/off the central boiler. Leave blank if no service call is to be made (in this case, you will have to manage the turning on/off of your central boiler yourself). The service called must be formatted as follows: `entity_id/service_name[/attribute:value]` (/attribute:value is optional)\nFor example:\n- to turn on a switch: `switch.controle_chaudiere/switch.turn_on`\n- to turn off a switch: `switch.controle_chaudiere/switch.turn_off`\n- to program the boiler to 25° and thus force its ignition: `climate.thermostat_chaudiere/climate.set_temperature/temperature:25`\n- to send 10° to the boiler and thus force its extinction: `climate.thermostat_chaudiere/climate.set_temperature/temperature:10`",
+        "data": {
+          "central_boiler_activation_service": "Command to turn-on",
+          "central_boiler_deactivation_service": "Command to turn-off"
+        },
+        "data_description": {
+          "central_boiler_activation_service": "Command to turn-on the central boiler formatted like entity_id/service_name[/attribut:valeur]",
+          "central_boiler_deactivation_service": "Command to turn-off the central boiler formatted like entity_id/service_name[/attribut:valeur]"
+        }
+      },
+      "sonoff_trvzb": {
+        "title": "Sonoff TRVZB configuration",
+        "description": "Specific Sonoff TRVZB configuration",
+        "data": {
+          "offset_calibration_entity_ids": "Offset calibration entities",
+          "opening_degree_entity_ids": "Opening degree entities",
+          "closing_degree_entity_ids": "Closing degree entities",
+          "proportional_function": "Algorithm"
+        },
+        "data_description": {
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. There should be one per underlying climate entities",
+          "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. There should be one per underlying climate entities",
+          "proportional_function": "Algorithm to use (TPI is the only one for now)"
+        }
      }
    },
    "error": {
@@ -262,6 +273,8 @@
          "power": "Power management",
          "presence": "Presence detection",
          "advanced": "Advanced parameters",
+          "auto_start_stop": "Auto start and stop",
+          "sonoff_trvzb": "Sonoff TRVZB configuration",
          "finalize": "All done",
          "configuration_not_complete": "Configuration not complete"
        }
@@ -298,28 +311,19 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page",
+          "use_auto_start_stop_feature": "Use the auto start and stop feature"
        }
      },
      "type": {
        "title": "Entities - {name}",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "1st heater switch",
-          "heater_entity2_id": "2nd heater switch",
-          "heater_entity3_id": "3rd heater switch",
-          "heater_entity4_id": "4th heater switch",
+          "underlying_entity_ids": "The device(s) to be controlled",
          "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",
+          "sonoff_trvzb_mode": "SONOFF TRVZB mode",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -328,21 +332,11 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "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",
+          "underlying_entity_ids": "The device(s) to be controlled - 1 is 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",
+          "sonoff_trvzb_mode": "The underlyings are SONOFF TRVZB. You have to configure some extra entities in the specific menu option 'Sonoff trvzb configuration'",
          "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",
@@ -458,6 +452,34 @@
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
+      },
+      "central_boiler": {
+        "title": "Control of the central boiler - {name}",
+        "description": "Enter the services to call to turn on/off the central boiler. Leave blank if no service call is to be made (in this case, you will have to manage the turning on/off of your central boiler yourself). The service called must be formatted as follows: `entity_id/service_name[/attribute:value]` (/attribute:value is optional)\nFor example:\n- to turn on a switch: `switch.controle_chaudiere/switch.turn_on`\n- to turn off a switch: `switch.controle_chaudiere/switch.turn_off`\n- to program the boiler to 25° and thus force its ignition: `climate.thermostat_chaudiere/climate.set_temperature/temperature:25`\n- to send 10° to the boiler and thus force its extinction: `climate.thermostat_chaudiere/climate.set_temperature/temperature:10`",
+        "data": {
+          "central_boiler_activation_service": "Command to turn-on",
+          "central_boiler_deactivation_service": "Command to turn-off"
+        },
+        "data_description": {
+          "central_boiler_activation_service": "Command to turn-on the central boiler formatted like entity_id/service_name[/attribut:valeur]",
+          "central_boiler_deactivation_service": "Command to turn-off the central boiler formatted like entity_id/service_name[/attribut:valeur]"
+        }
+      },
+      "sonoff_trvzb": {
+        "title": "Sonoff TRVZB configuration - {name}",
+        "description": "Specific Sonoff TRVZB configuration",
+        "data": {
+          "offset_calibration_entity_ids": "Offset calibration entities",
+          "opening_degree_entity_ids": "Opening degree entities",
+          "closing_degree_entity_ids": "Closing degree entities",
+          "proportional_function": "Algorithm"
+        },
+        "data_description": {
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. There should be one per underlying climate entities",
+          "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. There should be one per underlying climate entities",
+          "proportional_function": "Algorithm to use (TPI is the only one for now)"
+        }
      }
    },
    "error": {
@@ -465,7 +487,8 @@
      "unknown_entity": "Unknown entity id",
      "window_open_detection_method": "Only one window open detection method should be used. Use either window sensor or automatic detection through temperature threshold but not both",
      "no_central_config": "You cannot check 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it.",
-      "service_configuration_format": "The format of the service configuration is wrong"
+      "service_configuration_format": "The format of the service configuration is wrong",
+      "sonoff_trvzb_nb_entities_incorrect": "The number of specific entities for Sonoff TRVZB should be equal to the number of underlyings"
    },
    "abort": {
      "already_configured": "Device is already configured"
@@ -514,6 +537,14 @@
        "comfort": "Comfort",
        "boost": "Boost"
      }
+    },
+    "auto_start_stop": {
+      "options": {
+        "auto_start_stop_none": "No auto start/stop",
+        "auto_start_stop_slow": "Slow detection",
+        "auto_start_stop_medium": "Medium detection",
+        "auto_start_stop_fast": "Fast detection"
+      }
    }
  },
  "entity": {
@@ -524,7 +555,8 @@
            "state": {
              "power": "Shedding",
              "security": "Safety",
-              "none": "Manual"
+              "none": "Manual",
+              "frost": "Frost"
            }
          }
        }
--- a/custom_components/versatile_thermostat/switch.py
+++ b/custom_components/versatile_thermostat/switch.py
@@ -0,0 +1,168 @@
+## pylint: disable=unused-argument
+
+""" Implements the VersatileThermostat select component """
+import logging
+from typing import Any
+
+from homeassistant.core import HomeAssistant, callback
+
+from homeassistant.components.switch import SwitchEntity
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .commons import VersatileThermostatBaseEntity
+
+from .const import *  # pylint: disable=unused-wildcard-import,wildcard-import
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the VersatileThermostat switches with config flow."""
+    _LOGGER.debug(
+        "Calling async_setup_entry entry=%s, data=%s", entry.entry_id, entry.data
+    )
+
+    unique_id = entry.entry_id
+    name = entry.data.get(CONF_NAME)
+    vt_type = entry.data.get(CONF_THERMOSTAT_TYPE)
+    auto_start_stop_feature = entry.data.get(CONF_USE_AUTO_START_STOP_FEATURE)
+
+    entities = []
+    if vt_type == CONF_THERMOSTAT_CLIMATE:
+        entities.append(FollowUnderlyingTemperatureChange(hass, unique_id, name, entry))
+
+        if auto_start_stop_feature is True:
+            # Creates a switch to enable the auto-start/stop
+            enable_entity = AutoStartStopEnable(hass, unique_id, name, entry)
+            entities.append(enable_entity)
+
+    async_add_entities(entities, True)
+
+
+class AutoStartStopEnable(VersatileThermostatBaseEntity, SwitchEntity, RestoreEntity):
+    """The that enables the ManagedDevice optimisation with"""
+
+    def __init__(
+        self, hass: HomeAssistant, unique_id: str, name: str, entry_infos: ConfigEntry
+    ):
+        super().__init__(hass, unique_id, name)
+        self._attr_name = "Enable auto start/stop"
+        self._attr_unique_id = f"{self._device_name}_enable_auto_start_stop"
+        self._default_value = (
+            entry_infos.data.get(CONF_AUTO_START_STOP_LEVEL)
+            != AUTO_START_STOP_LEVEL_NONE
+        )
+        self._attr_is_on = self._default_value
+
+    @property
+    def icon(self) -> str | None:
+        """The icon"""
+        return "mdi:power-sleep"
+
+    async def async_added_to_hass(self):
+        await super().async_added_to_hass()
+
+        # Récupérer le dernier état sauvegardé de l'entité
+        last_state = await self.async_get_last_state()
+
+        # Si l'état précédent existe, vous pouvez l'utiliser
+        if last_state is not None:
+            self._attr_is_on = last_state.state == "on"
+        else:
+            # If no previous state set it to false by default
+            self._attr_is_on = self._default_value
+
+        self.update_my_state_and_vtherm()
+
+    def update_my_state_and_vtherm(self):
+        """Update the auto_start_stop_enable flag in my VTherm"""
+        self.async_write_ha_state()
+        if self.my_climate is not None:
+            self.my_climate.set_auto_start_stop_enable(self._attr_is_on)
+
+    @callback
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        self.turn_on()
+
+    @callback
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        self.turn_off()
+
+    @overrides
+    def turn_off(self, **kwargs: Any):
+        self._attr_is_on = False
+        self.update_my_state_and_vtherm()
+
+    @overrides
+    def turn_on(self, **kwargs: Any):
+        self._attr_is_on = True
+        self.update_my_state_and_vtherm()
+
+
+class FollowUnderlyingTemperatureChange(
+    VersatileThermostatBaseEntity, SwitchEntity, RestoreEntity
+):
+    """The that enables the ManagedDevice optimisation with"""
+
+    def __init__(
+        self, hass: HomeAssistant, unique_id: str, name: str, entry_infos: ConfigEntry
+    ):
+        super().__init__(hass, unique_id, name)
+        self._attr_name = "Follow underlying temp change"
+        self._attr_unique_id = f"{self._device_name}_follow_underlying_temp_change"
+        self._attr_is_on = False
+
+    @property
+    def icon(self) -> str | None:
+        """The icon"""
+        return "mdi:content-copy"
+
+    async def async_added_to_hass(self):
+        await super().async_added_to_hass()
+
+        # Récupérer le dernier état sauvegardé de l'entité
+        last_state = await self.async_get_last_state()
+
+        # Si l'état précédent existe, vous pouvez l'utiliser
+        if last_state is not None:
+            self._attr_is_on = last_state.state == "on"
+        else:
+            # If no previous state set it to false by default
+            self._attr_is_on = False
+
+        self.update_my_state_and_vtherm()
+
+    def update_my_state_and_vtherm(self):
+        """Update the follow flag in my VTherm"""
+        self.async_write_ha_state()
+        if self.my_climate is not None:
+            self.my_climate.set_follow_underlying_temp_change(self._attr_is_on)
+
+    @callback
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        self.turn_on()
+
+    @callback
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        self.turn_off()
+
+    @overrides
+    def turn_off(self, **kwargs: Any):
+        self._attr_is_on = False
+        self.update_my_state_and_vtherm()
+
+    @overrides
+    def turn_on(self, **kwargs: Any):
+        self._attr_is_on = True
+        self.update_my_state_and_vtherm()
--- a/custom_components/versatile_thermostat/thermostat_climate.py
+++ b/custom_components/versatile_thermostat/thermostat_climate.py
@@ -1,8 +1,9 @@
-# pylint: disable=line-too-long, too-many-lines
-""" A climate over switch classe """
+# pylint: disable=line-too-long, too-many-lines, abstract-method
+""" A climate over climate classe """
 import logging
 from datetime import timedelta, datetime

+from homeassistant.const import STATE_ON
 from homeassistant.core import Event, HomeAssistant, State, callback
 from homeassistant.helpers.event import (
    async_track_state_change_event,
@@ -19,43 +20,24 @@ from .commons import NowClass, round_to_nearest
 from .base_thermostat import BaseThermostat, ConfigData
 from .pi_algorithm import PITemperatureRegulator

-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,
-    UnknownEntity,
-)
+from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import

 from .vtherm_api import VersatileThermostatAPI
 from .underlyings import UnderlyingClimate
+from .auto_start_stop_algorithm import (
+    AutoStartStopDetectionAlgorithm,
+    AUTO_START_STOP_ACTION_OFF,
+    AUTO_START_STOP_ACTION_ON,
+)

 _LOGGER = logging.getLogger(__name__)

+HVAC_ACTION_ON = [  # pylint: disable=invalid-name
+    HVACAction.COOLING,
+    HVACAction.DRYING,
+    HVACAction.FAN,
+    HVACAction.HEATING,
+]

 class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
    """Representation of a base class for a Versatile Thermostat over a climate"""
@@ -73,26 +55,31 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
    # The fan_mode name depending of the current_mode
    _auto_activated_fan_mode: str | None = None
    _auto_deactivated_fan_mode: str | None = None
+    _auto_start_stop_level: TYPE_AUTO_START_STOP_LEVELS = AUTO_START_STOP_LEVEL_NONE
+    _auto_start_stop_algo: AutoStartStopDetectionAlgorithm | None = None
+    _is_auto_start_stop_enabled: bool = False
+    _follow_underlying_temp_change: bool = False

-    _entity_component_unrecorded_attributes = (
-        BaseThermostat._entity_component_unrecorded_attributes.union(
-            frozenset(
-                {
-                    "is_over_climate",
-                    "start_hvac_action_date",
-                    "underlying_climate_0",
-                    "underlying_climate_1",
-                    "underlying_climate_2",
-                    "underlying_climate_3",
-                    "regulation_accumulated_error",
-                    "auto_regulation_mode",
-                    "auto_fan_mode",
-                    "current_auto_fan_mode",
-                    "auto_activated_fan_mode",
-                    "auto_deactivated_fan_mode",
-                    "auto_regulation_use_device_temp",
-                }
-            )
+    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(  # pylint: disable=protected-access
+        frozenset(
+            {
+                "is_over_climate",
+                "start_hvac_action_date",
+                "underlying_entities",
+                "regulation_accumulated_error",
+                "auto_regulation_mode",
+                "auto_fan_mode",
+                "current_auto_fan_mode",
+                "auto_activated_fan_mode",
+                "auto_deactivated_fan_mode",
+                "auto_regulation_use_device_temp",
+                "auto_start_stop_level",
+                "auto_start_stop_dtmin",
+                "auto_start_stop_enable",
+                "auto_start_stop_accumulated_error",
+                "auto_start_stop_accumulated_error_threshold",
+                "follow_underlying_temp_change",
+            }
        )
    )

@@ -105,6 +92,60 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
        self._regulated_target_temp = self.target_temperature
        self._last_regulation_change = NowClass.get_now(hass)

+    @overrides
+    def post_init(self, config_entry: ConfigData):
+        """Initialize the Thermostat"""
+
+        super().post_init(config_entry)
+
+        for climate in config_entry.get(CONF_UNDERLYING_LIST):
+            under = UnderlyingClimate(
+                hass=self._hass,
+                thermostat=self,
+                climate_entity_id=climate,
+            )
+            self._underlyings.append(under)
+
+        self.choose_auto_regulation_mode(
+            config_entry.get(CONF_AUTO_REGULATION_MODE)
+            if config_entry.get(CONF_AUTO_REGULATION_MODE) is not None
+            else CONF_AUTO_REGULATION_NONE
+        )
+
+        self._auto_regulation_dtemp = (
+            config_entry.get(CONF_AUTO_REGULATION_DTEMP)
+            if config_entry.get(CONF_AUTO_REGULATION_DTEMP) is not None
+            else 0.5
+        )
+        self._auto_regulation_period_min = (
+            config_entry.get(CONF_AUTO_REGULATION_PERIOD_MIN)
+            if config_entry.get(CONF_AUTO_REGULATION_PERIOD_MIN) is not None
+            else 5
+        )
+
+        self._auto_fan_mode = (
+            config_entry.get(CONF_AUTO_FAN_MODE)
+            if config_entry.get(CONF_AUTO_FAN_MODE) is not None
+            else CONF_AUTO_FAN_NONE
+        )
+
+        self._auto_regulation_use_device_temp = config_entry.get(
+            CONF_AUTO_REGULATION_USE_DEVICE_TEMP, False
+        )
+
+        use_auto_start_stop = config_entry.get(CONF_USE_AUTO_START_STOP_FEATURE, False)
+        if use_auto_start_stop:
+            self._auto_start_stop_level = config_entry.get(
+                CONF_AUTO_START_STOP_LEVEL, AUTO_START_STOP_LEVEL_NONE
+            )
+        else:
+            self._auto_start_stop_level = AUTO_START_STOP_LEVEL_NONE
+
+        # Instanciate the auto start stop algo
+        self._auto_start_stop_algo = AutoStartStopDetectionAlgorithm(
+            self._auto_start_stop_level, self.name
+        )
+
    @property
    def is_over_climate(self) -> bool:
        """True if the Thermostat is over_climate"""
@@ -220,17 +261,6 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
                and self.auto_regulation_use_device_temp
                # and we have access to the device temp
                and (device_temp := under.underlying_current_temperature) is not None
-                # and target is not reach (ie we need regulation)
-                and (
-                    (
-                        self.hvac_mode == HVACMode.COOL
-                        and self.target_temperature < self.current_temperature
-                    )
-                    or (
-                        self.hvac_mode == HVACMode.HEAT
-                        and self.target_temperature > self.current_temperature
-                    )
-                )
            ):
                offset_temp = device_temp - self.current_temperature

@@ -295,53 +325,6 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            )
            await self.async_set_fan_mode(self._auto_deactivated_fan_mode)

-    @overrides
-    def post_init(self, config_entry: ConfigData):
-        """Initialize the Thermostat"""
-
-        super().post_init(config_entry)
-        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)
-            if config_entry.get(CONF_AUTO_REGULATION_MODE) is not None
-            else CONF_AUTO_REGULATION_NONE
-        )
-
-        self._auto_regulation_dtemp = (
-            config_entry.get(CONF_AUTO_REGULATION_DTEMP)
-            if config_entry.get(CONF_AUTO_REGULATION_DTEMP) is not None
-            else 0.5
-        )
-        self._auto_regulation_period_min = (
-            config_entry.get(CONF_AUTO_REGULATION_PERIOD_MIN)
-            if config_entry.get(CONF_AUTO_REGULATION_PERIOD_MIN) is not None
-            else 5
-        )
-
-        self._auto_fan_mode = (
-            config_entry.get(CONF_AUTO_FAN_MODE)
-            if config_entry.get(CONF_AUTO_FAN_MODE) is not None
-            else CONF_AUTO_FAN_NONE
-        )
-
-        self._auto_regulation_use_device_temp = config_entry.get(
-            CONF_AUTO_REGULATION_USE_DEVICE_TEMP, False
-        )
-
    def choose_auto_regulation_mode(self, auto_regulation_mode: str):
        """Choose or change the regulation mode"""
        self._auto_regulation_mode = auto_regulation_mode
@@ -512,18 +495,10 @@ 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_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
-        )
+
+        self._attr_extra_state_attributes["underlying_entities"] = [
+            underlying.entity_id for underlying in self._underlyings
+        ]

        if self.is_regulated:
            self._attr_extra_state_attributes["is_regulated"] = self.is_regulated
@@ -554,7 +529,30 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            self.auto_regulation_use_device_temp
        )

+        self._attr_extra_state_attributes["auto_start_stop_enable"] = (
+            self.auto_start_stop_enable
+        )
+
+        self._attr_extra_state_attributes["auto_start_stop_level"] = (
+            self._auto_start_stop_algo.level
+        )
+        self._attr_extra_state_attributes["auto_start_stop_dtmin"] = (
+            self._auto_start_stop_algo.dt_min
+        )
+        self._attr_extra_state_attributes["auto_start_stop_accumulated_error"] = (
+            self._auto_start_stop_algo.accumulated_error
+        )
+
+        self._attr_extra_state_attributes[
+            "auto_start_stop_accumulated_error_threshold"
+        ] = self._auto_start_stop_algo.accumulated_error_threshold
+
+        self._attr_extra_state_attributes["follow_underlying_temp_change"] = (
+            self._follow_underlying_temp_change
+        )
+
        self.async_write_ha_state()
+
        _LOGGER.debug(
            "%s - Calling update_custom_attributes: %s",
            self,
@@ -601,8 +599,18 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):

        if self._total_energy is None:
            self._total_energy = added_energy
+            _LOGGER.debug(
+                "%s - incremente_energy set energy is %s",
+                self,
+                self._total_energy,
+            )
        else:
            self._total_energy += added_energy
+            _LOGGER.debug(
+                "%s - incremente_energy incremented energy is %s",
+                self,
+                self._total_energy,
+            )

        _LOGGER.debug(
            "%s - added energy is %.3f . Total energy is now: %.3f",
@@ -625,7 +633,8 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
        async def end_climate_changed(changes: bool):
            """To end the event management"""
            if changes:
-                self.async_write_ha_state()
+                # already done by update_custom_attribute
+                # self.async_write_ha_state()
                self.update_custom_attributes()
                await self.async_control_heating()

@@ -634,6 +643,15 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
        if not new_state:
            return

+        # Find the underlying which have change
+        under = self.find_underlying_by_entity_id(new_state.entity_id)
+
+        if not under:
+            _LOGGER.warning(
+                "We have a receive an event from entity %s which is NOT one of our underlying entities. This is not normal and should be reported to the developper of the integration"
+            )
+            return
+
        changes = False
        new_hvac_mode = new_state.state

@@ -668,20 +686,68 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            new_state.last_updated if new_state and new_state.last_updated else None
        )

+        new_target_temp = (
+            new_state.attributes.get("temperature")
+            if new_state and new_state.attributes
+            else None
+        )
+
+        last_sent_temperature = under.last_sent_temperature or 0
+        under_temp_diff = (
+            (new_target_temp - last_sent_temperature) if new_target_temp else 0
+        )
+        if -1 < under_temp_diff < 1:
+            under_temp_diff = 0
+
        # Issue 99 - some AC turn hvac_mode=cool and hvac_action=idle when sending a HVACMode_OFF command
        # Issue 114 - Remove this because hvac_mode is now managed by local _hvac_mode and use idle action as is
        # if self._hvac_mode == HVACMode.OFF and new_hvac_action == HVACAction.IDLE:
        #    _LOGGER.debug("The underlying switch to idle instead of OFF. We will consider it as OFF")
        #    new_hvac_mode = HVACMode.OFF

+        # Forget event when the event holds no real changes
+        if (
+            new_hvac_mode == self._hvac_mode
+            and new_hvac_action == old_hvac_action
+            and under_temp_diff == 0
+            and (new_fan_mode is None or new_fan_mode == self._attr_fan_mode)
+        ):
+            _LOGGER.debug(
+                "%s - a underlying state change event is received but no real change have been found. Forget the event",
+                self,
+            )
+            return
+
+        # Ignore new target temperature when out of range
+        if (
+            not new_target_temp is None
+            and not self._attr_min_temp is None
+            and not self._attr_max_temp is None
+            and not (self._attr_min_temp <= new_target_temp <= self._attr_max_temp)
+        ):
+            _LOGGER.debug(
+                "%s - underlying sent a target temperature (%s) which is out of configured min/max range (%s / %s). The value will be ignored",
+                self,
+                new_target_temp,
+                self._attr_min_temp,
+                self._attr_max_temp,
+            )
+            new_target_temp = None
+            under_temp_diff = 0
+
+        # A real changes have to be managed
        _LOGGER.info(
-            "%s - Underlying climate %s changed. Event.new_hvac_mode is %s, current_hvac_mode=%s, new_hvac_action=%s, old_hvac_action=%s",
+            "%s - Underlying climate %s have changed. new_hvac_mode is %s (vs %s), new_hvac_action=%s (vs %s), new_target_temp=%s (vs %s), new_fan_mode=%s (vs %s)",
            self,
-            new_state.entity_id,
+            under.entity_id,
            new_hvac_mode,
            self._hvac_mode,
            new_hvac_action,
            old_hvac_action,
+            new_target_temp,
+            self.target_temperature,
+            new_fan_mode,
+            self._attr_fan_mode,
        )

        _LOGGER.debug(
@@ -695,12 +761,6 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
        )

        # Interpretation of hvac action
-        HVAC_ACTION_ON = [  # pylint: disable=invalid-name
-            HVACAction.COOLING,
-            HVACAction.DRYING,
-            HVACAction.FAN,
-            HVACAction.HEATING,
-        ]
        if old_hvac_action not in HVAC_ACTION_ON and new_hvac_action in HVAC_ACTION_ON:
            self._underlying_climate_start_hvac_action_date = (
                self.get_last_updated_date_or_now(new_state)
@@ -733,6 +793,7 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            )
            changes = True

+        # Filter new state when received just after a change from VTherm
        # Issue #120 - Some TRV are changing target temperature a very long time (6 sec) after the change.
        # In that case a loop is possible if a user change multiple times during this 6 sec.
        if new_state_date_updated and self._last_change_time:
@@ -745,6 +806,7 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
                await end_climate_changed(changes)
                return

+        # Update all underlyings hvac_mode state if it has change
        if (
            new_hvac_mode
            in [
@@ -759,7 +821,6 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            ]
            and self._hvac_mode != new_hvac_mode
        ):
-            # Update all underlyings state
            # Issue #334 - if all underlyings are not aligned with the same hvac_mode don't change the underlying and wait they are aligned
            if self.is_over_climate:
                for under in self._underlyings:
@@ -790,35 +851,119 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            self._attr_fan_mode = new_fan_mode
            changes = True

-        if not changes:
-            # try to manage new target temperature set if state
+        # try to manage new target temperature set if state if no other changes have been found
+        # and if a target temperature have already been sent
+        if (
+            self._follow_underlying_temp_change
+            and not changes
+            and under.last_sent_temperature is not None
+        ):
            _LOGGER.debug(
-                "Do temperature check. temperature is %s, new_state.attributes is %s",
-                self.target_temperature,
-                new_state.attributes,
+                "Do temperature check. under.last_sent_temperature is %s, new_target_temp is %s",
+                under.last_sent_temperature,
+                new_target_temp,
            )
-            if (
-                # we do not change target temperature on regulated VTherm
-                not self.is_regulated
-                and new_state.attributes
-                and (new_target_temp := new_state.attributes.get("temperature"))
-                and new_target_temp != self.target_temperature
-            ):
+            # if the underlying have change its target temperature
+            if under_temp_diff != 0:
                _LOGGER.info(
-                    "%s - Target temp in underlying have change to %s",
+                    "%s - Target temp in underlying have change to %s (vs %s)",
                    self,
                    new_target_temp,
+                    under.last_sent_temperature,
                )
                await self.async_set_temperature(temperature=new_target_temp)
                changes = True
+            else:
+                _LOGGER.debug(
+                    "%s - Forget the eventual underlying temperature change there is no real change",
+                    self,
+                )

        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"""
        ret = await super().async_control_heating(force, _)

+        # 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:
+                return ret
+        else:
+            _LOGGER.debug("%s - auto start/stop is disabled", self)
+
+            # Continue the normal async_control_heating
+
+        # Send the regulated temperature to the underlyings
        await self._send_regulated_temperature()

        if self._auto_fan_mode and self._auto_fan_mode != CONF_AUTO_FAN_NONE:
@@ -826,6 +971,16 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):

        return ret

+    def set_auto_start_stop_enable(self, is_enabled: bool):
+        """Enable/Disable the auto-start/stop feature"""
+        self._is_auto_start_stop_enabled = is_enabled
+        self.update_custom_attributes()
+
+    def set_follow_underlying_temp_change(self, follow: bool):
+        """Set the flaf follow the underlying temperature changes"""
+        self._follow_underlying_temp_change = follow
+        self.update_custom_attributes()
+
    @property
    def auto_regulation_mode(self) -> str | None:
        """Get the regulation mode"""
@@ -953,6 +1108,14 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):

        return None

+    @property
+    def current_humidity(self) -> float | None:
+        """Return the humidity."""
+        if self.underlying_entity(0):
+            return self.underlying_entity(0).current_humidity
+
+        return None
+
    @property
    def is_aux_heat(self) -> bool | None:
        """Return true if aux heater.
@@ -972,6 +1135,21 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
                return False
        return True

+    @property
+    def auto_start_stop_level(self) -> TYPE_AUTO_START_STOP_LEVELS:
+        """Return the auto start/stop level."""
+        return self._auto_start_stop_level
+
+    @property
+    def auto_start_stop_enable(self) -> bool:
+        """Returns the auto_start_stop_enable"""
+        return self._is_auto_start_stop_enabled
+
+    @property
+    def follow_underlying_temp_change(self) -> bool:
+        """Get the follow underlying temp change flag"""
+        return self._follow_underlying_temp_change
+
    @overrides
    def init_underlyings(self):
        """Init the underlyings if not already done"""
@@ -1103,3 +1281,29 @@ class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
            self.choose_auto_fan_mode(CONF_AUTO_FAN_TURBO)

        self.update_custom_attributes()
+
+    @overrides
+    async def async_turn_off(self) -> None:
+        # if window is open, don't overwrite the saved_hvac_mode
+        if self.window_state != STATE_ON:
+            self.save_hvac_mode()
+        await self.async_set_hvac_mode(HVACMode.OFF)
+
+    @overrides
+    async def async_turn_on(self) -> None:
+
+        # don't turn_on if window is open
+        if self.window_state == STATE_ON:
+            _LOGGER.info(
+                "%s - refuse to turn on because window is open. We keep the save_hvac_mode",
+                self,
+            )
+            return
+
+        if self._saved_hvac_mode is not None:  # pylint: disable=protected-access
+            await self.restore_hvac_mode(True)
+        else:
+            if self._ac_mode:
+                await self.async_set_hvac_mode(HVACMode.COOL)
+            else:
+                await self.async_set_hvac_mode(HVACMode.HEAT)
--- a/custom_components/versatile_thermostat/thermostat_sonoff_trvzb.py
+++ b/custom_components/versatile_thermostat/thermostat_sonoff_trvzb.py
@@ -0,0 +1,242 @@
+# pylint: disable=line-too-long, too-many-lines, abstract-method
+""" A climate over Sonoff TRVZB classe """
+
+import logging
+from datetime import datetime
+
+from homeassistant.core import HomeAssistant
+from homeassistant.components.climate import HVACMode
+
+from .underlyings import UnderlyingSonoffTRVZB
+
+# from .commons import NowClass, round_to_nearest
+from .base_thermostat import ConfigData
+from .thermostat_climate import ThermostatOverClimate
+from .prop_algorithm import PropAlgorithm
+
+from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
+
+# from .vtherm_api import VersatileThermostatAPI
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class ThermostatOverSonoffTRVZB(ThermostatOverClimate):
+    """This class represent a VTherm over a Sonoff TRVZB climate"""
+
+    _entity_component_unrecorded_attributes = ThermostatOverClimate._entity_component_unrecorded_attributes.union(  # pylint: disable=protected-access
+        frozenset(
+            {
+                "is_over_climate",
+                "is_over_sonoff_trvzb",
+                "underlying_entities",
+                "on_time_sec",
+                "off_time_sec",
+                "cycle_min",
+                "function",
+                "tpi_coef_int",
+                "tpi_coef_ext",
+                "power_percent",
+            }
+        )
+    )
+    _underlyings_sonoff_trvzb: list[UnderlyingSonoffTRVZB] = []
+    _valve_open_percent: int = 0
+    _last_calculation_timestamp: datetime | None = None
+    _auto_regulation_dpercent: float | None = None
+    _auto_regulation_period_min: int | None = None
+
+    def __init__(
+        self, hass: HomeAssistant, unique_id: str, name: str, entry_infos: ConfigData
+    ):
+        """Initialize the ThermostatOverSonoffTRVZB class"""
+        _LOGGER.debug("%s - creating a ThermostatOverSonoffTRVZB VTherm", name)
+        super().__init__(hass, unique_id, name, entry_infos)
+        # self._valve_open_percent: int = 0
+        # self._last_calculation_timestamp: datetime | None = None
+        # self._auto_regulation_dpercent: float | None = None
+        # self._auto_regulation_period_min: int | None = None
+
+    @overrides
+    def post_init(self, config_entry: ConfigData):
+        """Initialize the Thermostat and underlyings
+        Beware that the underlyings list contains the climate which represent the Sonoff TRVZB
+        but also the UnderlyingSonoff which reprensent the valve"""
+
+        super().post_init(config_entry)
+
+        self._auto_regulation_dpercent = (
+            config_entry.get(CONF_AUTO_REGULATION_DTEMP)
+            if config_entry.get(CONF_AUTO_REGULATION_DTEMP) is not None
+            else 0.0
+        )
+        self._auto_regulation_period_min = (
+            config_entry.get(CONF_AUTO_REGULATION_PERIOD_MIN)
+            if config_entry.get(CONF_AUTO_REGULATION_PERIOD_MIN) is not None
+            else 0
+        )
+
+        # Initialization of the TPI algo
+        self._prop_algorithm = PropAlgorithm(
+            self._proportional_function,
+            self._tpi_coef_int,
+            self._tpi_coef_ext,
+            self._cycle_min,
+            self._minimal_activation_delay,
+            self.name,
+        )
+
+        for idx, _ in enumerate(config_entry.get(CONF_UNDERLYING_LIST)):
+            offset = config_entry.get(CONF_OFFSET_CALIBRATION_LIST)[idx]
+            opening = config_entry.get(CONF_OPENING_DEGREE_LIST)[idx]
+            closing = config_entry.get(CONF_CLOSING_DEGREE_LIST)[idx]
+            under = UnderlyingSonoffTRVZB(
+                hass=self._hass,
+                thermostat=self,
+                offset_calibration_entity_id=offset,
+                opening_degree_entity_id=opening,
+                closing_degree_entity_id=closing,
+            )
+            self._underlyings_sonoff_trvzb.append(under)
+
+    @overrides
+    def update_custom_attributes(self):
+        """Custom attributes"""
+        super().update_custom_attributes()
+
+        self._attr_extra_state_attributes["is_over_sonoff_trvzb"] = (
+            self.is_over_sonoff_trvzb
+        )
+
+        self._attr_extra_state_attributes["underlying_sonoff_trvzb_entities"] = [
+            underlying.entity_id for underlying in self._underlyings_sonoff_trvzb
+        ]
+
+        self._attr_extra_state_attributes["on_percent"] = (
+            self._prop_algorithm.on_percent
+        )
+        self._attr_extra_state_attributes["power_percent"] = self.power_percent
+        self._attr_extra_state_attributes["on_time_sec"] = (
+            self._prop_algorithm.on_time_sec
+        )
+        self._attr_extra_state_attributes["off_time_sec"] = (
+            self._prop_algorithm.off_time_sec
+        )
+        self._attr_extra_state_attributes["cycle_min"] = self._cycle_min
+        self._attr_extra_state_attributes["function"] = self._proportional_function
+        self._attr_extra_state_attributes["tpi_coef_int"] = self._tpi_coef_int
+        self._attr_extra_state_attributes["tpi_coef_ext"] = self._tpi_coef_ext
+
+        self._attr_extra_state_attributes["valve_open_percent"] = (
+            self.valve_open_percent
+        )
+
+        self._attr_extra_state_attributes["auto_regulation_dpercent"] = (
+            self._auto_regulation_dpercent
+        )
+        self._attr_extra_state_attributes["auto_regulation_period_min"] = (
+            self._auto_regulation_period_min
+        )
+        self._attr_extra_state_attributes["last_calculation_timestamp"] = (
+            self._last_calculation_timestamp.astimezone(self._current_tz).isoformat()
+            if self._last_calculation_timestamp
+            else None
+        )
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    @overrides
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate the open percent", self)
+
+        # TODO this is exactly the same method as the thermostat_valve recalculate. Put that in common
+
+        # For testing purpose. Should call _set_now() before
+        now = self.now
+
+        if self._last_calculation_timestamp is not None:
+            period = (now - self._last_calculation_timestamp).total_seconds() / 60
+            if period < self._auto_regulation_period_min:
+                _LOGGER.info(
+                    "%s - do not calculate TPI because regulation_period (%d) is not exceeded",
+                    self,
+                    period,
+                )
+                return
+
+        self._prop_algorithm.calculate(
+            self._target_temp,
+            self._cur_temp,
+            self._cur_ext_temp,
+            self._hvac_mode or HVACMode.OFF,
+        )
+
+        new_valve_percent = round(
+            max(0, min(self.proportional_algorithm.on_percent, 1)) * 100
+        )
+
+        # Issue 533 - don't filter with dtemp if valve should be close. Else it will never close
+        if new_valve_percent < self._auto_regulation_dpercent:
+            new_valve_percent = 0
+
+        dpercent = new_valve_percent - self.valve_open_percent
+        if (
+            new_valve_percent > 0
+            and -1 * self._auto_regulation_dpercent
+            <= dpercent
+            < self._auto_regulation_dpercent
+        ):
+            _LOGGER.debug(
+                "%s - do not calculate TPI because regulation_dpercent (%.1f) is not exceeded",
+                self,
+                dpercent,
+            )
+
+            return
+
+        if self._valve_open_percent == new_valve_percent:
+            _LOGGER.debug("%s - no change in valve_open_percent.", self)
+            return
+
+        self._valve_open_percent = new_valve_percent
+
+        for under in self._underlyings_sonoff_trvzb:
+            under.set_valve_open_percent()
+
+        self._last_calculation_timestamp = now
+
+        self.update_custom_attributes()
+
+    @property
+    def is_over_sonoff_trvzb(self) -> bool:
+        """True if the Thermostat is over_sonoff_trvzb"""
+        return True
+
+    @property
+    def power_percent(self) -> float | None:
+        """Get the current on_percent value"""
+        if self._prop_algorithm:
+            return round(self._prop_algorithm.on_percent * 100, 0)
+        else:
+            return None
+
+    # @property
+    # def hvac_modes(self) -> list[HVACMode]:
+    #    """Get the hvac_modes"""
+    #    return self._hvac_list
+
+    @property
+    def valve_open_percent(self) -> int:
+        """Gives the percentage of valve needed"""
+        if self._hvac_mode == HVACMode.OFF:
+            return 0
+        else:
+            return self._valve_open_percent
--- a/custom_components/versatile_thermostat/thermostat_switch.py
+++ b/custom_components/versatile_thermostat/thermostat_switch.py
@@ -1,4 +1,4 @@
-# pylint: disable=line-too-long
+# pylint: disable=line-too-long, abstract-method

 """ A climate over switch classe """
 import logging
@@ -10,10 +10,7 @@ from homeassistant.helpers.event import (
 from homeassistant.components.climate import HVACMode

 from .const import (
-    CONF_HEATER,
-    CONF_HEATER_2,
-    CONF_HEATER_3,
-    CONF_HEATER_4,
+    CONF_UNDERLYING_LIST,
    CONF_HEATER_KEEP_ALIVE,
    CONF_INVERSE_SWITCH,
    overrides,
@@ -25,29 +22,23 @@ from .prop_algorithm import PropAlgorithm

 _LOGGER = logging.getLogger(__name__)

-
 class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
    """Representation of a base class for a Versatile Thermostat over a switch."""

-    _entity_component_unrecorded_attributes = (
-        BaseThermostat._entity_component_unrecorded_attributes.union(
-            frozenset(
-                {
-                    "is_over_switch",
-                    "is_inversed",
-                    "underlying_switch_0",
-                    "underlying_switch_1",
-                    "underlying_switch_2",
-                    "underlying_switch_3",
-                    "on_time_sec",
-                    "off_time_sec",
-                    "cycle_min",
-                    "function",
-                    "tpi_coef_int",
-                    "tpi_coef_ext",
-                    "power_percent",
-                }
-            )
+    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(  # pylint: disable=protected-access
+        frozenset(
+            {
+                "is_over_switch",
+                "is_inversed",
+                "underlying_entities",
+                "on_time_sec",
+                "off_time_sec",
+                "cycle_min",
+                "function",
+                "tpi_coef_int",
+                "tpi_coef_ext",
+                "power_percent",
+            }
        )
    )

@@ -90,13 +81,7 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
            self.name,
        )

-        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))
+        lst_switches = config_entry.get(CONF_UNDERLYING_LIST)

        delta_cycle = self._cycle_min * 60 / len(lst_switches)
        for idx, switch in enumerate(lst_switches):
@@ -140,16 +125,10 @@ 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_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["underlying_entities"] = [
+           underlying.entity_id for underlying in self._underlyings
+        ]

        self._attr_extra_state_attributes[
            "on_percent"
@@ -186,7 +165,8 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):
            self._hvac_mode or HVACMode.OFF,
        )
        self.update_custom_attributes()
-        self.async_write_ha_state()
+        # already done bu update_custom_attributes
+        # self.async_write_ha_state()

    @overrides
    def incremente_energy(self):
@@ -200,8 +180,20 @@ class ThermostatOverSwitch(BaseThermostat[UnderlyingSwitch]):

        if self._total_energy is None:
            self._total_energy = added_energy
+            _LOGGER.debug(
+                "%s - incremente_energy set energy is %s",
+                self,
+                self._total_energy,
+            )
        else:
            self._total_energy += added_energy
+            _LOGGER.debug(
+                "%s - incremente_energy increment energy is %s",
+                self,
+                self._total_energy,
+            )
+
+        self.update_custom_attributes()

        _LOGGER.debug(
            "%s - added energy is %.3f . Total energy is now: %.3f",
--- a/custom_components/versatile_thermostat/thermostat_valve.py
+++ b/custom_components/versatile_thermostat/thermostat_valve.py
@@ -1,4 +1,4 @@
-# pylint: disable=line-too-long
+# pylint: disable=line-too-long, abstract-method
 """ A climate over switch classe """
 import logging
 from datetime import timedelta, datetime
@@ -15,10 +15,7 @@ from .base_thermostat import BaseThermostat, ConfigData
 from .prop_algorithm import PropAlgorithm

 from .const import (
-    CONF_VALVE,
-    CONF_VALVE_2,
-    CONF_VALVE_3,
-    CONF_VALVE_4,
+    CONF_UNDERLYING_LIST,
    # This is not really self-regulation but regulation here
    CONF_AUTO_REGULATION_DTEMP,
    CONF_AUTO_REGULATION_PERIOD_MIN,
@@ -29,30 +26,24 @@ from .underlyings import UnderlyingValve

 _LOGGER = logging.getLogger(__name__)

-
 class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=abstract-method
    """Representation of a class for a Versatile Thermostat over a Valve"""

-    _entity_component_unrecorded_attributes = (
-        BaseThermostat._entity_component_unrecorded_attributes.union(
-            frozenset(
-                {
-                    "is_over_valve",
-                    "underlying_valve_0",
-                    "underlying_valve_1",
-                    "underlying_valve_2",
-                    "underlying_valve_3",
-                    "on_time_sec",
-                    "off_time_sec",
-                    "cycle_min",
-                    "function",
-                    "tpi_coef_int",
-                    "tpi_coef_ext",
-                    "auto_regulation_dpercent",
-                    "auto_regulation_period_min",
-                    "last_calculation_timestamp",
-                }
-            )
+    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(  # pylint: disable=protected-access
+        frozenset(
+            {
+                "is_over_valve",
+                "underlying_entities",
+                "on_time_sec",
+                "off_time_sec",
+                "cycle_min",
+                "function",
+                "tpi_coef_int",
+                "tpi_coef_ext",
+                "auto_regulation_dpercent",
+                "auto_regulation_period_min",
+                "last_calculation_timestamp",
+            }
        )
    )

@@ -107,13 +98,7 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a
            self.name,
        )

-        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))
+        lst_valves = config_entry.get(CONF_UNDERLYING_LIST)

        for _, valve in enumerate(lst_valves):
            self._underlyings.append(
@@ -165,18 +150,10 @@ 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_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["underlying_entities"] = [
+           underlying.entity_id for underlying in self._underlyings
+        ]

        self._attr_extra_state_attributes[
            "on_percent"
@@ -241,10 +218,16 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a
            max(0, min(self.proportional_algorithm.on_percent, 1)) * 100
        )

+        # Issue 533 - don't filter with dtemp if valve should be close. Else it will never close
+        if new_valve_percent < self._auto_regulation_dpercent:
+            new_valve_percent = 0
+
        dpercent = new_valve_percent - self.valve_open_percent
        if (
-            dpercent >= -1 * self._auto_regulation_dpercent
-            and dpercent < self._auto_regulation_dpercent
+            new_valve_percent > 0
+            and -1 * self._auto_regulation_dpercent
+            <= dpercent
+            < self._auto_regulation_dpercent
        ):
            _LOGGER.debug(
                "%s - do not calculate TPI because regulation_dpercent (%.1f) is not exceeded",
@@ -266,7 +249,8 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a
        self._last_calculation_timestamp = now

        self.update_custom_attributes()
-        self.async_write_ha_state()
+        # already done in update_custom_attributes
+        # self.async_write_ha_state()

    @overrides
    def incremente_energy(self):
@@ -280,8 +264,20 @@ class ThermostatOverValve(BaseThermostat[UnderlyingValve]):  # pylint: disable=a

        if self._total_energy is None:
            self._total_energy = added_energy
+            _LOGGER.debug(
+                "%s - incremente_energy set energy is %s",
+                self,
+                self._total_energy,
+            )
        else:
            self._total_energy += added_energy
+            _LOGGER.debug(
+                "%s - get_my_previous_state increment energy is %s",
+                self,
+                self._total_energy,
+            )
+
+        self.update_custom_attributes()

        _LOGGER.debug(
            "%s - added energy is %.3f . Total energy is now: %.3f",
--- a/custom_components/versatile_thermostat/translations/en.json
+++ b/custom_components/versatile_thermostat/translations/en.json
@@ -27,6 +27,8 @@
          "power": "Power management",
          "presence": "Presence detection",
          "advanced": "Advanced parameters",
+          "auto_start_stop": "Auto start and stop",
+          "sonoff_trvzb": "Sonoff TRVZB configuration",
          "finalize": "All done",
          "configuration_not_complete": "Configuration not complete"
        }
@@ -63,28 +65,19 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page",
+          "use_auto_start_stop_feature": "Use the auto start and stop feature"
        }
      },
      "type": {
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "1st heater switch",
-          "heater_entity2_id": "2nd heater switch",
-          "heater_entity3_id": "3rd heater switch",
-          "heater_entity4_id": "4th heater switch",
+          "underlying_entity_ids": "The device(s) to be controlled",
          "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",
+          "sonoff_trvzb_mode": "SONOFF TRVZB mode",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -93,21 +86,11 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "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",
+          "underlying_entity_ids": "The device(s) to be controlled - 1 is 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",
+          "sonoff_trvzb_mode": "The underlyings are SONOFF TRVZB. You have to configure some extra entities in the specific menu option 'Sonoff trvzb configuration'",
          "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",
@@ -223,6 +206,34 @@
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
+      },
+      "central_boiler": {
+        "title": "Control of the central boiler",
+        "description": "Enter the services to call to turn on/off the central boiler. Leave blank if no service call is to be made (in this case, you will have to manage the turning on/off of your central boiler yourself). The service called must be formatted as follows: `entity_id/service_name[/attribute:value]` (/attribute:value is optional)\nFor example:\n- to turn on a switch: `switch.controle_chaudiere/switch.turn_on`\n- to turn off a switch: `switch.controle_chaudiere/switch.turn_off`\n- to program the boiler to 25° and thus force its ignition: `climate.thermostat_chaudiere/climate.set_temperature/temperature:25`\n- to send 10° to the boiler and thus force its extinction: `climate.thermostat_chaudiere/climate.set_temperature/temperature:10`",
+        "data": {
+          "central_boiler_activation_service": "Command to turn-on",
+          "central_boiler_deactivation_service": "Command to turn-off"
+        },
+        "data_description": {
+          "central_boiler_activation_service": "Command to turn-on the central boiler formatted like entity_id/service_name[/attribut:valeur]",
+          "central_boiler_deactivation_service": "Command to turn-off the central boiler formatted like entity_id/service_name[/attribut:valeur]"
+        }
+      },
+      "sonoff_trvzb": {
+        "title": "Sonoff TRVZB configuration",
+        "description": "Specific Sonoff TRVZB configuration",
+        "data": {
+          "offset_calibration_entity_ids": "Offset calibration entities",
+          "opening_degree_entity_ids": "Opening degree entities",
+          "closing_degree_entity_ids": "Closing degree entities",
+          "proportional_function": "Algorithm"
+        },
+        "data_description": {
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. There should be one per underlying climate entities",
+          "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. There should be one per underlying climate entities",
+          "proportional_function": "Algorithm to use (TPI is the only one for now)"
+        }
      }
    },
    "error": {
@@ -262,6 +273,8 @@
          "power": "Power management",
          "presence": "Presence detection",
          "advanced": "Advanced parameters",
+          "auto_start_stop": "Auto start and stop",
+          "sonoff_trvzb": "Sonoff TRVZB configuration",
          "finalize": "All done",
          "configuration_not_complete": "Configuration not complete"
        }
@@ -298,28 +311,19 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page",
+          "use_auto_start_stop_feature": "Use the auto start and stop feature"
        }
      },
      "type": {
        "title": "Entities - {name}",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "1st heater switch",
-          "heater_entity2_id": "2nd heater switch",
-          "heater_entity3_id": "3rd heater switch",
-          "heater_entity4_id": "4th heater switch",
+          "underlying_entity_ids": "The device(s) to be controlled",
          "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",
+          "sonoff_trvzb_mode": "SONOFF TRVZB mode",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
          "auto_regulation_periode_min": "Regulation minimum period",
@@ -328,21 +332,11 @@
          "auto_fan_mode": "Auto fan mode"
        },
        "data_description": {
-          "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",
+          "underlying_entity_ids": "The device(s) to be controlled - 1 is 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",
+          "sonoff_trvzb_mode": "The underlyings are SONOFF TRVZB. You have to configure some extra entities in the specific menu option 'Sonoff trvzb configuration'",
          "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",
@@ -458,6 +452,34 @@
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
+      },
+      "central_boiler": {
+        "title": "Control of the central boiler",
+        "description": "Enter the services to call to turn on/off the central boiler. Leave blank if no service call is to be made (in this case, you will have to manage the turning on/off of your central boiler yourself). The service called must be formatted as follows: `entity_id/service_name[/attribute:value]` (/attribute:value is optional)\nFor example:\n- to turn on a switch: `switch.controle_chaudiere/switch.turn_on`\n- to turn off a switch: `switch.controle_chaudiere/switch.turn_off`\n- to program the boiler to 25° and thus force its ignition: `climate.thermostat_chaudiere/climate.set_temperature/temperature:25`\n- to send 10° to the boiler and thus force its extinction: `climate.thermostat_chaudiere/climate.set_temperature/temperature:10`",
+        "data": {
+          "central_boiler_activation_service": "Command to turn-on",
+          "central_boiler_deactivation_service": "Command to turn-off"
+        },
+        "data_description": {
+          "central_boiler_activation_service": "Command to turn-on the central boiler formatted like entity_id/service_name[/attribut:valeur]",
+          "central_boiler_deactivation_service": "Command to turn-off the central boiler formatted like entity_id/service_name[/attribut:valeur]"
+        }
+      },
+      "sonoff_trvzb": {
+        "title": "Sonoff TRVZB configuration",
+        "description": "Specific Sonoff TRVZB configuration",
+        "data": {
+          "offset_calibration_entity_ids": "Offset calibration entities",
+          "opening_degree_entity_ids": "Opening degree entities",
+          "closing_degree_entity_ids": "Closing degree entities",
+          "proportional_function": "Algorithm"
+        },
+        "data_description": {
+          "offset_calibration_entity_ids": "The list of the 'offset calibration' entities. There should be one per underlying climate entities",
+          "opening_degree_entity_ids": "The list of the 'opening degree' entities. There should be one per underlying climate entities",
+          "closing_degree_entity_ids": "The list of the 'closing degree' entities. There should be one per underlying climate entities",
+          "proportional_function": "Algorithm to use (TPI is the only one for now)"
+        }
      }
    },
    "error": {
@@ -465,7 +487,8 @@
      "unknown_entity": "Unknown entity id",
      "window_open_detection_method": "Only one window open detection method should be used. Use either window sensor or automatic detection through temperature threshold but not both",
      "no_central_config": "You cannot check 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it.",
-      "service_configuration_format": "The format of the service configuration is wrong"
+      "service_configuration_format": "The format of the service configuration is wrong",
+      "sonoff_trvzb_nb_entities_incorrect": "The number of specific entities for Sonoff TRVZB should be equal to the number of underlyings"
    },
    "abort": {
      "already_configured": "Device is already configured"
@@ -514,6 +537,14 @@
        "comfort": "Comfort",
        "boost": "Boost"
      }
+    },
+    "auto_start_stop": {
+      "options": {
+        "auto_start_stop_none": "No auto start/stop",
+        "auto_start_stop_slow": "Slow detection",
+        "auto_start_stop_medium": "Medium detection",
+        "auto_start_stop_fast": "Fast detection"
+      }
    }
  },
  "entity": {
@@ -524,7 +555,8 @@
            "state": {
              "power": "Shedding",
              "security": "Safety",
-              "none": "Manual"
+              "none": "Manual",
+              "frost": "Frost"
            }
          }
        }
--- a/custom_components/versatile_thermostat/translations/fr.json
+++ b/custom_components/versatile_thermostat/translations/fr.json
@@ -27,6 +27,8 @@
          "power": "Gestion de la puissance",
          "presence": "Détection de présence",
          "advanced": "Paramètres avancés",
+          "auto_start_stop": "Allumage/extinction automatique",
+          "sonoff_trvzb": "Configuration spécifique à Sonoff TRVZB",
          "finalize": "Finaliser la création",
          "configuration_not_complete": "Configuration incomplète"
        }
@@ -63,55 +65,36 @@
          "use_motion_feature": "Avec détection de mouvement",
          "use_power_feature": "Avec gestion de la puissance",
          "use_presence_feature": "Avec détection de présence",
-          "use_central_boiler_feature": "Ajouter une chaudière centrale. Cochez pour ajouter un controle sur une chaudière centrale. Vous devrez ensuite configurer les VTherms qui commande la chaudière centrale pour que cette option prenne effet. Si au moins un des VTherm a besoin de chauffer, la chaudière centrale sera activée. Si aucun VTherm n'a besoin de chauffer, elle sera éteinte. Les commandes pour allumer/éteindre la chaudière centrale sont données dans la page de configuration suivante."
+          "use_central_boiler_feature": "Ajouter une chaudière centrale. Cochez pour ajouter un controle sur une chaudière centrale. Vous devrez ensuite configurer les VTherms qui commande la chaudière centrale pour que cette option prenne effet. Si au moins un des VTherm a besoin de chauffer, la chaudière centrale sera activée. Si aucun VTherm n'a besoin de chauffer, elle sera éteinte. Les commandes pour allumer/éteindre la chaudière centrale sont données dans la page de configuration suivante.",
+          "use_auto_start_stop_feature": "Avec démarrage et extinction automatique"
        }
      },
      "type": {
        "title": "Entité(s) liée(s)",
        "description": "Attributs de(s) l'entité(s) liée(s)",
        "data": {
-          "heater_entity_id": "1er radiateur",
-          "heater_entity2_id": "2ème radiateur",
-          "heater_entity3_id": "3ème radiateur",
-          "heater_entity4_id": "4ème radiateur",
+          "underlying_entity_ids": "Les équipements à controller",
          "heater_keep_alive": "keep-alive (sec)",
          "proportional_function": "Algorithme",
-          "climate_entity_id": "Thermostat sous-jacent",
-          "climate_entity2_id": "2ème thermostat sous-jacent",
-          "climate_entity3_id": "3ème thermostat sous-jacent",
-          "climate_entity4_id": "4ème thermostat sous-jacent",
          "ac_mode": "AC mode ?",
-          "valve_entity_id": "1ère valve number",
-          "valve_entity2_id": "2ème valve number",
-          "valve_entity3_id": "3ème valve number",
-          "valve_entity4_id": "4ème valve number",
+          "sonoff_trvzb_mode": "Mode Sonoff TRVZB",
          "auto_regulation_mode": "Auto-régulation",
          "auto_regulation_dtemp": "Seuil de régulation",
          "auto_regulation_periode_min": "Période minimale de régulation",
-          "auto_regulation_use_device_temp": "Utiliser la température interne du sous-jacent",
+          "auto_regulation_use_device_temp": "Compenser la température interne du sous-jacent",
          "inverse_switch_command": "Inverser la commande",
          "auto_fan_mode": " Auto ventilation mode"
        },
        "data_description": {
-          "heater_entity_id": "Entity id du 1er radiateur obligatoire",
-          "heater_entity2_id": "Optionnel entity id du 2ème radiateur",
-          "heater_entity3_id": "Optionnel entity id du 3ème radiateur",
-          "heater_entity4_id": "Optionnel entity id du 4ème radiateur",
+          "underlying_entity_ids": "La liste des équipements qui seront controlés par ce VTherm",
          "heater_keep_alive": "Intervalle de rafraichissement du switch en secondes. Laisser vide pour désactiver. À n'utiliser que pour les switchs qui le nécessite.",
          "proportional_function": "Algorithme à utiliser (Seul TPI est disponible pour l'instant)",
-          "climate_entity_id": "Entity id du thermostat sous-jacent",
-          "climate_entity2_id": "Entity id du 2ème thermostat sous-jacent",
-          "climate_entity3_id": "Entity id du 3ème thermostat sous-jacent",
-          "climate_entity4_id": "Entity id du 4ème thermostat sous-jacent",
          "ac_mode": "Utilisation du mode Air Conditionné (AC)",
-          "valve_entity_id": "Entity id de la 1ère valve",
-          "valve_entity2_id": "Entity id de la 2ème valve",
-          "valve_entity3_id": "Entity id de la 3ème valve",
-          "valve_entity4_id": "Entity id de la 4ème valve",
+          "sonoff_trvzb_mode": "Les équipements sont des Sonoff TRVZB. Vous devez configurer les entités dédiées dans le menu 'Configuration Sonoff TRVZB'",
          "auto_regulation_mode": "Ajustement automatique de la température cible",
          "auto_regulation_dtemp": "Le seuil en ° (ou % pour les valves) en-dessous duquel la régulation ne sera pas envoyée",
          "auto_regulation_periode_min": "La durée en minutes entre deux mise à jour faites par la régulation",
-          "auto_regulation_use_device_temp": "Utiliser la temperature interne du sous-jacent pour accélérer l'auto-régulation",
+          "auto_regulation_use_device_temp": "Compenser la temperature interne du sous-jacent pour accélérer l'auto-régulation",
          "inverse_switch_command": "Inverse la commande du switch pour une installation avec fil pilote et diode",
          "auto_fan_mode": "Active la ventilation automatiquement en cas d'écart important"
        }
@@ -235,6 +218,22 @@
          "central_boiler_activation_service": "Commande à éxecuter pour allumer la chaudière centrale au format entity_id/service_name[/attribut:valeur]",
          "central_boiler_deactivation_service": "Commande à éxecuter pour étiendre la chaudière centrale au format entity_id/service_name[/attribut:valeur]"
        }
+      },
+      "sonoff_trvzb": {
+        "title": "Configuration Sonoff TRVZB",
+        "description": "Configuration spécifique des Sonoff TRVZB",
+        "data": {
+          "offset_calibration_entity_ids": "Entités de 'Offset calibration'",
+          "opening_degree_entity_ids": "Entités de 'Opening degree'",
+          "closing_degree_entity_ids": "Entités de 'Closing degree'",
+          "proportional_function": "Algorithme"
+        },
+        "data_description": {
+          "offset_calibration_entity_ids": "La liste des entités 'offset calibration' entities. Il doit y en avoir une par entité climate sous-jacente",
+          "opening_degree_entity_ids": "La liste des entités 'opening degree' entities. Il doit y en avoir une par entité climate sous-jacente",
+          "closing_degree_entity_ids": "La liste des entités 'closing degree' entities. Il doit y en avoir une par entité climate sous-jacente",
+          "proportional_function": "Algorithme à utiliser (seulement TPI est disponible)"
+        }
      }
    },
    "error": {
@@ -260,7 +259,7 @@
        }
      },
      "menu": {
-        "title": "Menu",
+        "title": "Menu - {name}",
        "description": "Paramétrez votre thermostat. Vous pourrez finaliser la configuration quand tous les paramètres auront été saisis.",
        "menu_options": {
          "main": "Principaux Attributs",
@@ -274,6 +273,8 @@
          "power": "Gestion de la puissance",
          "presence": "Détection de présence",
          "advanced": "Paramètres avancés",
+          "auto_start_stop": "Allumage/extinction automatique",
+          "sonoff_trvzb": "Configuration spécifique à Sonoff TRVZB",
          "finalize": "Finaliser les modifications",
          "configuration_not_complete": "Configuration incomplète"
        }
@@ -310,55 +311,36 @@
          "use_motion_feature": "Avec détection de mouvement",
          "use_power_feature": "Avec gestion de la puissance",
          "use_presence_feature": "Avec détection de présence",
-          "use_central_boiler_feature": "Ajouter une chaudière centrale. Cochez pour ajouter un controle sur une chaudière centrale. Vous devrez ensuite configurer les VTherms qui commande la chaudière centrale pour que cette option prenne effet. Si au moins un des VTherm a besoin de chauffer, la chaudière centrale sera activée. Si aucun VTherm n'a besoin de chauffer, elle sera éteinte. Les commandes pour allumer/éteindre la chaudière centrale sont données dans la page de configuration suivante."
+          "use_central_boiler_feature": "Ajouter une chaudière centrale. Cochez pour ajouter un controle sur une chaudière centrale. Vous devrez ensuite configurer les VTherms qui commande la chaudière centrale pour que cette option prenne effet. Si au moins un des VTherm a besoin de chauffer, la chaudière centrale sera activée. Si aucun VTherm n'a besoin de chauffer, elle sera éteinte. Les commandes pour allumer/éteindre la chaudière centrale sont données dans la page de configuration suivante.",
+          "use_auto_start_stop_feature": "Avec démarrage et extinction automatique"
        }
      },
      "type": {
-        "title": "Entités - {name}",
+        "title": "Entité(s) liée(s) - {name}",
        "description": "Attributs de(s) l'entité(s) liée(s)",
        "data": {
-          "heater_entity_id": "1er radiateur",
-          "heater_entity2_id": "2ème radiateur",
-          "heater_entity3_id": "3ème radiateur",
-          "heater_entity4_id": "4ème radiateur",
-          "heater_keep_alive": "Keep-alive (sec)",
+          "underlying_entity_ids": "Les équipements à controller",
+          "heater_keep_alive": "keep-alive (sec)",
          "proportional_function": "Algorithme",
-          "climate_entity_id": "Thermostat sous-jacent",
-          "climate_entity2_id": "2ème thermostat sous-jacent",
-          "climate_entity3_id": "3ème thermostat sous-jacent",
-          "climate_entity4_id": "4ème thermostat sous-jacent",
          "ac_mode": "AC mode ?",
-          "valve_entity_id": "1ère valve",
-          "valve_entity2_id": "2ème valve",
-          "valve_entity3_id": "3ème valve",
-          "valve_entity4_id": "4ème valve",
-          "auto_regulation_mode": "Auto-regulation",
+          "sonoff_trvzb_mode": "Mode Sonoff TRVZB",
+          "auto_regulation_mode": "Auto-régulation",
          "auto_regulation_dtemp": "Seuil de régulation",
          "auto_regulation_periode_min": "Période minimale de régulation",
-          "auto_regulation_use_device_temp": "Utiliser la température interne du sous-jacent",
+          "auto_regulation_use_device_temp": "Compenser la température interne du sous-jacent",
          "inverse_switch_command": "Inverser la commande",
-          "auto_fan_mode": "Auto fan mode"
+          "auto_fan_mode": " Auto ventilation mode"
        },
        "data_description": {
-          "heater_entity_id": "Entity id du 1er radiateur obligatoire",
-          "heater_entity2_id": "Optionnel entity id du 2ème radiateur",
-          "heater_entity3_id": "Optionnel entity id du 3ème radiateur",
-          "heater_entity4_id": "Optionnel entity id du 4ème radiateur",
+          "underlying_entity_ids": "La liste des équipements qui seront controlés par ce VTherm",
          "heater_keep_alive": "Intervalle de rafraichissement du switch en secondes. Laisser vide pour désactiver. À n'utiliser que pour les switchs qui le nécessite.",
          "proportional_function": "Algorithme à utiliser (Seul TPI est disponible pour l'instant)",
-          "climate_entity_id": "Entity id du thermostat sous-jacent",
-          "climate_entity2_id": "Entity id du 2ème thermostat sous-jacent",
-          "climate_entity3_id": "Entity id du 3ème thermostat sous-jacent",
-          "climate_entity4_id": "Entity id du 4ème thermostat sous-jacent",
          "ac_mode": "Utilisation du mode Air Conditionné (AC)",
-          "valve_entity_id": "Entity id de la 1ère valve",
-          "valve_entity2_id": "Entity id de la 2ème valve",
-          "valve_entity3_id": "Entity id de la 3ème valve",
-          "valve_entity4_id": "Entity id de la 4ème valve",
-          "auto_regulation_mode": "Ajustement automatique de la consigne",
+          "sonoff_trvzb_mode": "Les équipements sont des Sonoff TRVZB. Vous devez configurer les entités dédiées dans le menu 'Configuration Sonoff TRVZB'",
+          "auto_regulation_mode": "Ajustement automatique de la température cible",
          "auto_regulation_dtemp": "Le seuil en ° (ou % pour les valves) en-dessous duquel la régulation ne sera pas envoyée",
          "auto_regulation_periode_min": "La durée en minutes entre deux mise à jour faites par la régulation",
-          "auto_regulation_use_device_temp": "Utiliser la temperature interne du sous-jacent pour accélérer l'auto-régulation",
+          "auto_regulation_use_device_temp": "Compenser la temperature interne du sous-jacent pour accélérer l'auto-régulation",
          "inverse_switch_command": "Inverse la commande du switch pour une installation avec fil pilote et diode",
          "auto_fan_mode": "Active la ventilation automatiquement en cas d'écart important"
        }
@@ -476,6 +458,22 @@
          "central_boiler_activation_service": "Commande à éxecuter pour allumer la chaudière centrale au format entity_id/service_name[/attribut:valeur]",
          "central_boiler_deactivation_service": "Commande à éxecuter pour étiendre la chaudière centrale au format entity_id/service_name[/attribut:valeur]"
        }
+      },
+      "sonoff_trvzb": {
+        "title": "Configuration Sonoff TRVZB - {name}",
+        "description": "Configuration spécifique des Sonoff TRVZB",
+        "data": {
+          "offset_calibration_entity_ids": "Entités de 'Offset calibration'",
+          "opening_degree_entity_ids": "Entités de 'Opening degree'",
+          "closing_degree_entity_ids": "Entités de 'Closing degree'",
+          "proportional_function": "Algorithme"
+        },
+        "data_description": {
+          "offset_calibration_entity_ids": "La liste des entités 'offset calibration' entities. Il doit y en avoir une par entité climate sous-jacente",
+          "opening_degree_entity_ids": "La liste des entités 'opening degree' entities. Il doit y en avoir une par entité climate sous-jacente",
+          "closing_degree_entity_ids": "La liste des entités 'closing degree' entities. Il doit y en avoir une par entité climate sous-jacente",
+          "proportional_function": "Algorithme à utiliser (seulement TPI est disponible)"
+        }
      }
    },
    "error": {
@@ -483,7 +481,8 @@
      "unknown_entity": "entity id inconnu",
      "window_open_detection_method": "Une seule méthode de détection des ouvertures ouvertes doit être utilisée. Utilisez le détecteur d'ouverture ou les seuils de température mais pas les deux.",
      "no_central_config": "Vous ne pouvez pas cocher 'Utiliser la configuration centrale' car aucune configuration centrale n'a été trouvée. Vous devez créer un Versatile Thermostat de type 'Central Configuration' pour pouvoir l'utiliser.",
-      "service_configuration_format": "Mauvais format de la configuration du service"
+      "service_configuration_format": "Mauvais format de la configuration du service",
+      "sonoff_trvzb_nb_entities_incorrect": "Le nombre d'entités spécifiques au Sonoff TRVZB doit être égal au nombre d'entité sous-jacentes"
    },
    "abort": {
      "already_configured": "Le device est déjà configuré"
@@ -532,6 +531,14 @@
        "comfort": "Confort",
        "boost": "Renforcé (boost)"
      }
+    },
+    "auto_start_stop": {
+      "options": {
+        "auto_start_stop_none": "No auto start/stop",
+        "auto_start_stop_slow": "Slow detection",
+        "auto_start_stop_medium": "Medium detection",
+        "auto_start_stop_fast": "Fast detection"
+      }
    }
  },
  "entity": {
@@ -542,7 +549,8 @@
            "state": {
              "power": "Délestage",
              "security": "Sécurité",
-              "none": "Manuel"
+              "none": "Manuel",
+              "frost": "Hors Gel"
            }
          }
        }
--- a/custom_components/versatile_thermostat/translations/it.json
+++ b/custom_components/versatile_thermostat/translations/it.json
@@ -364,7 +364,8 @@
            "state": {
              "power": "Ripartizione",
              "security": "Sicurezza",
-              "none": "Manuale"
+              "none": "Manuale",
+              "frost": "Gelo"
            }
          }
        }
--- a/custom_components/versatile_thermostat/underlyings.py
+++ b/custom_components/versatile_thermostat/underlyings.py
@@ -1,4 +1,4 @@
-# pylint: disable=unused-argument, line-too-long
+# pylint: disable=unused-argument, line-too-long, too-many-lines

 """ Underlying entities classes """
 import logging
@@ -53,6 +53,9 @@ class UnderlyingEntityType(StrEnum):
    # a valve
    VALVE = "valve"

+    # a Sonoff TRVZB
+    SONOFF_TRVZB = "sonoff_trvzb"
+

 class UnderlyingEntity:
    """Represent a underlying device which could be a switch or a climate"""
@@ -62,6 +65,7 @@ class UnderlyingEntity:
    _thermostat: Any
    _entity_id: str
    _type: UnderlyingEntityType
+    _hvac_mode: HVACMode | None

    def __init__(
        self,
@@ -75,6 +79,7 @@ class UnderlyingEntity:
        self._thermostat = thermostat
        self._type = entity_type
        self._entity_id = entity_id
+        self._hvac_mode = None

    def __str__(self):
        return str(self._thermostat) + "-" + self._entity_id
@@ -100,13 +105,24 @@ class UnderlyingEntity:

    async def set_hvac_mode(self, hvac_mode: HVACMode):
        """Set the HVACmode"""
+        self._hvac_mode = hvac_mode
        return

+    @property
+    def hvac_mode(self) -> HVACMode | None:
+        """Return the current hvac_mode"""
+        return self._hvac_mode
+
    @property
    def is_device_active(self) -> bool | None:
        """If the toggleable device is currently active."""
        return None

+    @property
+    def hvac_action(self) -> HVACAction:
+        """Calculate a hvac_action"""
+        return HVACAction.HEATING if self.is_device_active is True else HVACAction.OFF
+
    async def set_temperature(self, temperature, max_temp, min_temp):
        """Set the target temperature"""
        return
@@ -181,7 +197,6 @@ class UnderlyingSwitch(UnderlyingEntity):
    _initialDelaySec: int
    _on_time_sec: int
    _off_time_sec: int
-    _hvac_mode: HVACMode

    def __init__(
        self,
@@ -204,7 +219,6 @@ class UnderlyingSwitch(UnderlyingEntity):
        self._should_relaunch_control_heating = False
        self._on_time_sec = 0
        self._off_time_sec = 0
-        self._hvac_mode = None
        self._keep_alive = IntervalCaller(hass, keep_alive_sec)

    @property
@@ -237,8 +251,8 @@ class UnderlyingSwitch(UnderlyingEntity):
                await self.turn_off()
            self._cancel_cycle()

-        if self._hvac_mode != hvac_mode:
-            self._hvac_mode = hvac_mode
+        if self.hvac_mode != hvac_mode:
+            super().set_hvac_mode(hvac_mode)
            return True
        else:
            return False
@@ -488,6 +502,7 @@ class UnderlyingClimate(UnderlyingEntity):
            entity_id=climate_entity_id,
        )
        self._underlying_climate = None
+        self._last_sent_temperature = None

    def find_underlying_climate(self) -> ClimateEntity:
        """Find the underlying climate entity"""
@@ -549,14 +564,11 @@ class UnderlyingClimate(UnderlyingEntity):
    def is_device_active(self):
        """If the toggleable device is currently active."""
        if self.is_initialized:
-            return (
-                self._underlying_climate.hvac_mode != HVACMode.OFF
-                and self._underlying_climate.hvac_action
-                not in [
-                    HVACAction.IDLE,
-                    HVACAction.OFF,
-                ]
-            )
+            return self.hvac_mode != HVACMode.OFF and self.hvac_action not in [
+                HVACAction.IDLE,
+                HVACAction.OFF,
+                None,
+            ]
        else:
            return None

@@ -622,6 +634,8 @@ class UnderlyingClimate(UnderlyingEntity):
                ATTR_ENTITY_ID: self._entity_id,
                "target_temp_high": target_temp,
                "target_temp_low": target_temp,
+                # issue 518 - we should send also the target temperature, even in TARGET RANGE
+                "temperature": target_temp,
            }
        else:
            data = {
@@ -635,12 +649,48 @@ class UnderlyingClimate(UnderlyingEntity):
            data,
        )

+        self._last_sent_temperature = target_temp
+
+    @property
+    def last_sent_temperature(self) -> float | None:
+        """Get the last send temperature. None if no temperature have been sent yet"""
+        return self._last_sent_temperature
+
    @property
    def hvac_action(self) -> HVACAction | None:
        """Get the hvac action of the underlying"""
        if not self.is_initialized:
            return None
-        return self._underlying_climate.hvac_action
+
+        hvac_action = self._underlying_climate.hvac_action
+        if hvac_action is None:
+            target = (
+                self.underlying_target_temperature
+                or self._thermostat.target_temperature
+            )
+            current = (
+                self.underlying_current_temperature
+                or self._thermostat.current_temperature
+            )
+            hvac_mode = self.hvac_mode
+
+            _LOGGER.debug(
+                "%s - hvac_action simulation target=%s, current=%s, hvac_mode=%s",
+                self,
+                target,
+                current,
+                hvac_mode,
+            )
+            hvac_action = HVACAction.IDLE
+            if target is not None and current is not None:
+                dtemp = target - current
+
+                if hvac_mode == HVACMode.COOL and dtemp < 0:
+                    hvac_action = HVACAction.COOLING
+                elif hvac_mode in [HVACMode.HEAT, HVACMode.HEAT_COOL] and dtemp > 0:
+                    hvac_action = HVACAction.HEATING
+
+        return hvac_action

    @property
    def hvac_mode(self) -> HVACMode | None:
@@ -677,6 +727,13 @@ class UnderlyingClimate(UnderlyingEntity):
            return []
        return self._underlying_climate.hvac_modes

+    @property
+    def current_humidity(self) -> float | None:
+        """Get the humidity"""
+        if not self.is_initialized:
+            return None
+        return self._underlying_climate.current_humidity
+
    @property
    def fan_modes(self) -> list[str]:
        """Get the fan_modes"""
@@ -720,11 +777,19 @@ class UnderlyingClimate(UnderlyingEntity):
        return self._underlying_climate.target_temperature_low

    @property
-    def is_aux_heat(self) -> bool:
-        """Get the is_aux_heat"""
+    def underlying_target_temperature(self) -> float:
+        """Get the target_temperature"""
        if not self.is_initialized:
-            return False
-        return self._underlying_climate.is_aux_heat
+            return None
+
+        if not hasattr(self._underlying_climate, "target_temperature"):
+            return None
+        else:
+            return self._underlying_climate.target_temperature
+
+        # return self._hass.states.get(self._entity_id).attributes.get(
+        #    "target_temperature"
+        # )

    @property
    def underlying_current_temperature(self) -> float | None:
@@ -735,8 +800,17 @@ class UnderlyingClimate(UnderlyingEntity):

        if not hasattr(self._underlying_climate, "current_temperature"):
            return None
+        else:
+            return self._underlying_climate.current_temperature

-        return self._hass.states.get(self._entity_id).attributes.get("current_temperature")
+        # return self._hass.states.get(self._entity_id).attributes.get("current_temperature")
+
+    @property
+    def is_aux_heat(self) -> bool:
+        """Get the is_aux_heat"""
+        if not self.is_initialized:
+            return False
+        return self._underlying_climate.is_aux_heat

    def turn_aux_heat_on(self) -> None:
        """Turn auxiliary heater on."""
@@ -794,11 +868,12 @@ class UnderlyingValve(UnderlyingEntity):
    _hvac_mode: HVACMode
    # This is the percentage of opening int integer (from 0 to 100)
    _percent_open: int
+    _last_sent_temperature = None

    def __init__(
        self, hass: HomeAssistant, thermostat: Any, valve_entity_id: str
    ) -> None:
-        """Initialize the underlying switch"""
+        """Initialize the underlying valve"""

        super().__init__(
            hass=hass,
@@ -812,13 +887,12 @@ class UnderlyingValve(UnderlyingEntity):
        self._percent_open = self._thermostat.valve_open_percent
        self._valve_entity_id = valve_entity_id

-    async def send_percent_open(self):
-        """Send the percent open to the underlying valve"""
-        # This may fails if called after shutdown
+    async def _send_value_to_number(self, number_entity_id: str, value: int):
+        """Send a value to a number entity"""
        try:
-            data = {"value": self._percent_open}
-            target = {ATTR_ENTITY_ID: self._entity_id}
-            domain = self._entity_id.split(".")[0]
+            data = {"value": value}
+            target = {ATTR_ENTITY_ID: number_entity_id}
+            domain = number_entity_id.split(".")[0]
            await self._hass.services.async_call(
                domain=domain,
                service=SERVICE_SET_VALUE,
@@ -830,6 +904,11 @@ class UnderlyingValve(UnderlyingEntity):
            # This could happens in unit test if input_number domain is not yet loaded
            # raise err

+    async def send_percent_open(self):
+        """Send the percent open to the underlying valve"""
+        # This may fails if called after shutdown
+        return await self._send_value_to_number(self._entity_id, self._percent_open)
+
    async def turn_off(self):
        """Turn heater toggleable device off."""
        _LOGGER.debug("%s - Stopping underlying valve entity %s", self, self._entity_id)
@@ -880,8 +959,10 @@ class UnderlyingValve(UnderlyingEntity):
    ):
        """We use this function to change the on_percent"""
        if force:
-            self._percent_open = self.cap_sent_value(self._percent_open)
-            await self.send_percent_open()
+            # self._percent_open = self.cap_sent_value(self._percent_open)
+            # await self.send_percent_open()
+            # avoid to send 2 times the same value at startup
+            self.set_valve_open_percent()

    @overrides
    def cap_sent_value(self, value) -> float:
@@ -933,3 +1014,88 @@ class UnderlyingValve(UnderlyingEntity):
    def remove_entity(self):
        """Remove the entity after stopping its cycle"""
        self._cancel_cycle()
+
+
+class UnderlyingSonoffTRVZB(UnderlyingValve):
+    """A specific underlying class for Sonoff TRVZB TRV"""
+
+    _offset_calibration_entity_id: str
+    _opening_degree_entity_id: str
+    _closing_degree_entity_id: str
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        thermostat: Any,
+        offset_calibration_entity_id: str,
+        opening_degree_entity_id: str,
+        closing_degree_entity_id: str,
+    ) -> None:
+        """Initialize the underlying Sonoff TRV"""
+        super().__init__(hass, thermostat, opening_degree_entity_id)
+        self._offset_calibration_entity_id = offset_calibration_entity_id
+        self._opening_degree_entity_id = opening_degree_entity_id
+        self._closing_degree_entity_id = closing_degree_entity_id
+        self._is_min_max_initialized = False
+        self._max_opening_degree = None
+        self._min_offset_calibration = None
+
+    async def send_percent_open(self):
+        """Send the percent open to the underlying valve"""
+        if not self._is_min_max_initialized:
+            _LOGGER.debug(
+                "%s - initialize min offset_calibration and max open_degree", self
+            )
+            self._max_opening_degree = self._hass.states.get(
+                self._opening_degree_entity_id
+            ).attributes.get("max")
+            self._min_offset_calibration = self._hass.states.get(
+                self._offset_calibration_entity_id
+            ).attributes.get("min")
+
+            self._is_min_max_initialized = (
+                self._max_opening_degree is not None
+                and self._min_offset_calibration is not None
+            )
+
+        if not self._is_min_max_initialized:
+            _LOGGER.warning(
+                "%s - impossible to initialize max_opening_degree or min_offset_calibration. Abort sending percent open to the valve. This could be a temporary message at startup."
+            )
+            return
+
+        # Send opening_degree
+        await super().send_percent_open()
+
+        # Send closing_degree. TODO 100 hard-coded or take the max of the _closing_degree_entity_id ?
+        await self._send_value_to_number(
+            self._closing_degree_entity_id,
+            self._max_opening_degree - self._percent_open,
+        )
+
+        # send offset_calibration to the min value
+        await self._send_value_to_number(
+            self._offset_calibration_entity_id, self._min_offset_calibration
+        )
+
+    @property
+    def offset_calibration_entity_id(self) -> str:
+        """The offset_calibration_entity_id"""
+        return self._offset_calibration_entity_id
+
+    @property
+    def opening_degree_entity_id(self) -> str:
+        """The offset_calibration_entity_id"""
+        return self._opening_degree_entity_id
+
+    @property
+    def closing_degree_entity_id(self) -> str:
+        """The offset_calibration_entity_id"""
+        return self._closing_degree_entity_id
+
+    @property
+    def hvac_modes(self) -> list[HVACMode]:
+        """Get the hvac_modes"""
+        if not self.is_initialized:
+            return []
+        return [HVACMode.OFF, HVACMode.HEAT]
--- a/custom_components/versatile_thermostat/vtherm_api.py
+++ b/custom_components/versatile_thermostat/vtherm_api.py
@@ -150,10 +150,11 @@ class VersatileThermostatAPI(dict):
                return entity.state
        return None

-    async def init_vtherm_links(self):
+    async def init_vtherm_links(self, entry_id=None):
        """Initialize all VTherms entities links
        This method is called when HA is fully started (and all entities should be initialized)
        Or when we need to reload all VTherm links (with Number temp entities, central boiler, ...)
+        If entry_id is set, only the VTherm of this entry will be reloaded
        """
        await self.reload_central_boiler_binary_listener()
        await self.reload_central_boiler_entities_list()
@@ -175,7 +176,8 @@ class VersatileThermostatAPI(dict):
                    entity.device_info
                    and entity.device_info.get("model", None) == DOMAIN
                ):
-                    await entity.async_startup(self.find_central_configuration())
+                    if entry_id is None or entry_id == entity.unique_id:
+                        await entity.async_startup(self.find_central_configuration())

    async def init_vtherm_preset_with_central(self):
        """Init all VTherm presets when the VTherm uses central temperature"""
--- a/hacs.json
+++ b/hacs.json
@@ -3,5 +3,5 @@
    "content_in_root": false,
    "render_readme": true,
    "hide_default_branch": false,
-    "homeassistant": "2024.9.3"
+    "homeassistant": "2024.10.4"
 }
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1 +1 @@
-homeassistant==2024.9.3
+homeassistant==2024.10.4
--- a/tests/commons.py
+++ b/tests/commons.py
@@ -1,4 +1,4 @@
-# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long, abstract-method
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long, abstract-method, too-many-lines, redefined-builtin

 """ Some common resources """
 import asyncio
@@ -552,7 +552,14 @@ class MockNumber(NumberEntity):
    """A fake switch to be used instead real switch"""

    def __init__(  # pylint: disable=unused-argument, dangerous-default-value
-        self, hass: HomeAssistant, unique_id, name, entry_infos={}
+        self,
+        hass: HomeAssistant,
+        unique_id,
+        name,
+        min=0,
+        max=100,
+        step=1,
+        entry_infos={},
    ):
        """Init the switch"""
        super().__init__()
@@ -562,7 +569,9 @@ class MockNumber(NumberEntity):
        self.entity_id = self.platform + "." + unique_id
        self._name = name
        self._attr_native_value = 0
-        self._attr_native_min_value = 0
+        self._attr_native_min_value = min
+        self._attr_native_max_value = max
+        self._attr_step = step

    @property
    def name(self) -> str:
@@ -922,6 +931,7 @@ async def send_climate_change_event_with_temperature(
    date,
    temperature,
    sleep=True,
+    underlying_entity_id=None,
 ):
    """Sending a new climate event simulating a change on the underlying climate state"""
    _LOGGER.info(
@@ -934,18 +944,21 @@ async def send_climate_change_event_with_temperature(
        temperature,
        entity,
    )
+    if not underlying_entity_id:
+        underlying_entity_id = entity.entity_id
+
    climate_event = Event(
        EVENT_STATE_CHANGED,
        {
            "new_state": State(
-                entity_id=entity.entity_id,
+                entity_id=underlying_entity_id,
                state=new_hvac_mode,
                attributes={"hvac_action": new_hvac_action, "temperature": temperature},
                last_changed=date,
                last_updated=date,
            ),
            "old_state": State(
-                entity_id=entity.entity_id,
+                entity_id=underlying_entity_id,
                state=old_hvac_mode,
                attributes={"hvac_action": old_hvac_action},
                last_changed=date,
@@ -992,3 +1005,26 @@ async def set_climate_preset_temp(
            "commons tests set_cliamte_preset_temp: cannot find number entity with entity_id '%s'",
            number_entity_id,
        )
+
+
+async def set_all_climate_preset_temp(
+    hass, vtherm: BaseThermostat, temps: dict, number_entity_base_name: str
+):
+    """Initialize all temp of preset for a VTherm entity"""
+    # We initialize
+    for preset_name, value in temps.items():
+
+        await set_climate_preset_temp(vtherm, preset_name, value)
+
+        # Search the number entity to control it is correctly set
+        number_entity_name = (
+            f"number.{number_entity_base_name}_preset_{preset_name}{PRESET_TEMP_SUFFIX}"
+        )
+        temp_entity: NumberEntity = search_entity(
+            hass,
+            number_entity_name,
+            NUMBER_DOMAIN,
+        )
+        assert temp_entity
+        # Because set_value is not implemented in Number class (really don't understand why...)
+        assert temp_entity.state == value
--- 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_HEATER: "switch.mock_switch",
+    CONF_UNDERLYING_LIST: ["switch.mock_switch"],
    CONF_HEATER_KEEP_ALIVE: 0,
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
    CONF_AC_MODE: False,
@@ -82,17 +82,14 @@ MOCK_TH_OVER_SWITCH_TYPE_CONFIG = {
 }

 MOCK_TH_OVER_SWITCH_AC_TYPE_CONFIG = {
-    CONF_HEATER: "switch.mock_air_conditioner",
+    CONF_UNDERLYING_LIST: ["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_HEATER: "switch.mock_4switch0",
-    CONF_HEATER_2: "switch.mock_4switch1",
-    CONF_HEATER_3: "switch.mock_4switch2",
-    CONF_HEATER_4: "switch.mock_4switch3",
+    CONF_UNDERLYING_LIST: ["switch.mock_4switch0", "switch.mock_4switch1","switch.mock_4switch2","switch.mock_4switch3"],
    CONF_HEATER_KEEP_ALIVE: 0,
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
    CONF_AC_MODE: False,
@@ -105,7 +102,7 @@ MOCK_TH_OVER_SWITCH_TPI_CONFIG = {
 }

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

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

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

 MOCK_TH_OVER_CLIMATE_TYPE_AC_CONFIG = {
-    CONF_CLIMATE: "climate.mock_climate",
+    CONF_UNDERLYING_LIST: ["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
--- a/tests/test_bugs.py
+++ b/tests/test_bugs.py
@@ -1,4 +1,4 @@
-# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long, too-many-lines

 """ Test the Window management """
 import asyncio
@@ -8,15 +8,15 @@ from datetime import datetime, timedelta

 import logging

+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.core import HomeAssistant
 from homeassistant.components.climate import (
    SERVICE_SET_TEMPERATURE,
 )

-
 from custom_components.versatile_thermostat.config_flow import (
    VersatileThermostatBaseConfigFlow,
 )
-from custom_components.versatile_thermostat.thermostat_valve import ThermostatOverValve
 from custom_components.versatile_thermostat.thermostat_climate import (
    ThermostatOverClimate,
 )
@@ -29,83 +29,6 @@ from .commons import *
 logging.getLogger().setLevel(logging.DEBUG)


-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_bug_56(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-    skip_turn_on_off_heater,
-    skip_send_event,
-):
-    """Test that in over_climate mode there is no error when underlying climate is not available"""
-
-    the_mock_underlying = MagicMockClimate()
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=None,  # dont find the underlying climate
-    ):
-        entry = MockConfigEntry(
-            domain=DOMAIN,
-            title="TheOverClimateMockName",
-            unique_id="uniqueId",
-            data={
-                CONF_NAME: "TheOverClimateMockName",
-                CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
-                CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-                CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-                CONF_CYCLE_MIN: 5,
-                CONF_TEMP_MIN: 15,
-                CONF_TEMP_MAX: 30,
-                "eco_temp": 17,
-                "comfort_temp": 18,
-                "boost_temp": 19,
-                CONF_USE_WINDOW_FEATURE: False,
-                CONF_USE_MOTION_FEATURE: False,
-                CONF_USE_POWER_FEATURE: False,
-                CONF_USE_PRESENCE_FEATURE: False,
-                CONF_CLIMATE: "climate.mock_climate",
-                CONF_MINIMAL_ACTIVATION_DELAY: 30,
-                CONF_SECURITY_DELAY_MIN: 5,
-                CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            },
-        )
-
-        entity: BaseThermostat = await create_thermostat(
-            hass, entry, "climate.theoverclimatemockname"
-        )
-        assert entity
-        # cause the underlying climate was not found
-        assert entity.is_over_climate is True
-        assert entity.underlying_entity(0)._underlying_climate is None
-
-        # Should not failed
-        entity.update_custom_attributes()
-
-        # try to call async_control_heating
-        try:
-            ret = await entity.async_control_heating()
-            # an exception should be send
-            assert ret is False
-        except Exception:  # pylint: disable=broad-exception-caught
-            assert False
-
-    # This time the underlying will be found
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=the_mock_underlying,  # dont find the underlying climate
-    ):
-        # try to call async_control_heating
-        try:
-            await entity.async_control_heating()
-        except UnknownEntity:
-            assert False
-        except Exception:  # pylint: disable=broad-exception-caught
-            assert False
-
-        # Should not failed
-        entity.update_custom_attributes()
-
-
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_bug_63(
@@ -205,391 +128,6 @@ async def test_bug_64(
    assert entity


-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_bug_66(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-    skip_turn_on_off_heater,
-    skip_send_event,
-):
-    """Test that it should be possible to open/close the window rapidly without side effect"""
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverSwitchMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverSwitchMockName",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 15,
-            CONF_TEMP_MAX: 30,
-            "eco_temp": 17,
-            "comfort_temp": 18,
-            "boost_temp": 19,
-            CONF_USE_WINDOW_FEATURE: True,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_HEATER: "switch.mock_switch",
-            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
-            CONF_TPI_COEF_INT: 0.3,
-            CONF_TPI_COEF_EXT: 0.01,
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SECURITY_DELAY_MIN: 5,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.5,
-            CONF_SECURITY_DEFAULT_ON_PERCENT: 0.1,  # !! here
-            CONF_DEVICE_POWER: 200,
-            CONF_WINDOW_SENSOR: "binary_sensor.mock_window_sensor",
-            CONF_WINDOW_DELAY: 0,  # important to not been obliged to wait
-        },
-    )
-
-    entity: BaseThermostat = await create_thermostat(
-        hass, entry, "climate.theoverswitchmockname"
-    )
-    assert entity
-
-    await entity.async_set_hvac_mode(HVACMode.HEAT)
-    await entity.async_set_preset_mode(PRESET_BOOST)
-
-    assert entity.hvac_mode is HVACMode.HEAT
-    assert entity.preset_mode is PRESET_BOOST
-    assert entity.target_temperature == 19
-    assert entity.window_state is STATE_OFF
-
-    # Open the window and let the thermostat shut down
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=True,
-    ):
-        await send_temperature_change_event(entity, 15, now)
-        try_window_condition = await send_window_change_event(
-            entity, True, False, now, False
-        )
-
-        # simulate the call to try_window_condition
-        await try_window_condition(None)
-
-        assert mock_send_event.call_count == 1
-        assert mock_heater_on.call_count == 1
-        assert mock_heater_off.call_count >= 1
-        assert mock_condition.call_count == 1
-
-        assert entity.window_state == STATE_ON
-
-    # Close the window but too shortly
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "homeassistant.helpers.condition.state", return_value=False
-    ) as mock_condition, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=False,
-    ):
-        event_timestamp = now + timedelta(minutes=1)
-        try_window_condition = await send_window_change_event(
-            entity, False, True, event_timestamp
-        )
-        # simulate the call to try_window_condition
-        await try_window_condition(None)
-
-        # window state should not have change
-        assert entity.window_state == STATE_ON
-
-    # Reopen immediatly with sufficient time
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=False,
-    ):
-        try_window_condition = await send_window_change_event(
-            entity, True, False, event_timestamp
-        )
-        # simulate the call to try_window_condition
-        await try_window_condition(None)
-
-        # still no change
-        assert entity.window_state == STATE_ON
-        assert entity.hvac_mode == HVACMode.OFF
-
-    # Close the window but with sufficient time this time
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ) as mock_condition, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=False,
-    ):
-        event_timestamp = now + timedelta(minutes=2)
-        try_window_condition = await send_window_change_event(
-            entity, False, True, event_timestamp
-        )
-        # simulate the call to try_window_condition
-        await try_window_condition(None)
-
-        # window state should be Off this time and old state should have been restored
-        assert entity.window_state == STATE_OFF
-        assert entity.hvac_mode is HVACMode.HEAT
-        assert entity.preset_mode is PRESET_BOOST
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_bug_82(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-    skip_turn_on_off_heater,
-    skip_send_event,
-):
-    """Test that when a underlying climate is not available the VTherm doesn't go into safety mode"""
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="uniqueId",
-        data=PARTIAL_CLIMATE_CONFIG,  # 5 minutes security delay
-    )
-
-    fake_underlying_climate = MockUnavailableClimate(
-        hass, "mockUniqueId", "MockClimateName", {}
-    )
-
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ) as mock_find_climate:
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname")
-        # entry.add_to_hass(hass)
-        # await hass.config_entries.async_setup(entry.entry_id)
-        # assert entry.state is ConfigEntryState.LOADED
-        #
-        # def find_my_entity(entity_id) -> ClimateEntity:
-        #     """Find my new entity"""
-        #     component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
-        #     for entity in component.entities:
-        #         if entity.entity_id == entity_id:
-        #             return entity
-        #
-        # entity = find_my_entity("climate.theoverclimatemockname")
-
-        assert entity
-
-        assert entity.name == "TheOverClimateMockName"
-        assert entity.is_over_climate is True
-        # assert entity.hvac_action is HVACAction.OFF
-        assert entity.hvac_mode is HVACMode.OFF
-        # assert entity.hvac_mode is None
-        assert entity.target_temperature == entity.min_temp
-        assert entity.preset_modes == [
-            PRESET_NONE,
-            PRESET_FROST_PROTECTION,
-            PRESET_ECO,
-            PRESET_COMFORT,
-            PRESET_BOOST,
-        ]
-        assert entity.preset_mode is PRESET_NONE
-        assert entity._security_state is False
-
-        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
-        assert mock_send_event.call_count == 2
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
-                call.send_event(
-                    EventType.HVAC_MODE_EVENT,
-                    {"hvac_mode": HVACMode.OFF},
-                ),
-            ]
-        )
-
-        assert mock_find_climate.call_count == 1
-        assert mock_find_climate.mock_calls[0] == call()
-        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
-
-        # Force safety mode
-        assert entity._last_ext_temperature_measure is not None
-        assert entity._last_temperature_measure is not None
-        assert (
-            entity._last_temperature_measure.astimezone(tz) - now
-        ).total_seconds() < 1
-        assert (
-            entity._last_ext_temperature_measure.astimezone(tz) - now
-        ).total_seconds() < 1
-
-        # Tries to turns on the Thermostat
-        await entity.async_set_hvac_mode(HVACMode.HEAT)
-        assert entity.hvac_mode == HVACMode.HEAT
-
-        # 2. activate security feature when date is expired
-        with patch(
-            "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-        ) as mock_send_event, patch(
-            "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-        ):
-            event_timestamp = now - timedelta(minutes=6)
-
-            # set temperature to 15 so that on_percent will be > security_min_on_percent (0.2)
-            await send_temperature_change_event(entity, 15, event_timestamp)
-            # Should stay False
-            assert entity.security_state is False
-            assert entity.preset_mode == "none"
-            assert entity._saved_preset_mode == "none"
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_bug_101(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-    skip_turn_on_off_heater,
-    skip_send_event,
-):
-    """Test that when a underlying climate target temp is changed, the VTherm change its own temperature target and switch to manual"""
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="uniqueId",
-        data=PARTIAL_CLIMATE_NOT_REGULATED_CONFIG,  # 5 minutes security delay
-    )
-
-    # Underlying is in HEAT mode but should be shutdown at startup
-    fake_underlying_climate = MockClimate(
-        hass, "mockUniqueId", "MockClimateName", {}, HVACMode.HEAT, HVACAction.HEATING
-    )
-
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ) as mock_find_climate, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
-    ) as mock_underlying_set_hvac_mode:
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname")
-        # entry.add_to_hass(hass)
-        # await hass.config_entries.async_setup(entry.entry_id)
-        # assert entry.state is ConfigEntryState.LOADED
-        #
-        # def find_my_entity(entity_id) -> ClimateEntity:
-        #     """Find my new entity"""
-        #     component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
-        #     for entity in component.entities:
-        #         if entity.entity_id == entity_id:
-        #             return entity
-        #
-        # entity = find_my_entity("climate.theoverclimatemockname")
-
-        assert entity
-
-        assert entity.name == "TheOverClimateMockName"
-        assert entity.is_over_climate is True
-        assert entity.hvac_mode is HVACMode.OFF
-        # because in MockClimate HVACAction is HEATING if hvac_mode is not set
-        assert entity.hvac_action is HVACAction.HEATING
-        # Underlying should have been shutdown
-        assert mock_underlying_set_hvac_mode.call_count == 1
-        mock_underlying_set_hvac_mode.assert_has_calls(
-            [
-                call.set_hvac_mode(HVACMode.OFF),
-            ]
-        )
-
-        assert entity.target_temperature == entity.min_temp
-        assert entity.preset_mode is PRESET_NONE
-
-        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
-        assert mock_send_event.call_count == 2
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
-                call.send_event(
-                    EventType.HVAC_MODE_EVENT,
-                    {"hvac_mode": HVACMode.OFF},
-                ),
-            ]
-        )
-
-        assert mock_find_climate.call_count == 1
-        assert mock_find_climate.mock_calls[0] == call()
-        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
-
-        # Force preset mode
-        await entity.async_set_hvac_mode(HVACMode.HEAT)
-        assert entity.hvac_mode == HVACMode.HEAT
-        await entity.async_set_preset_mode(PRESET_COMFORT)
-        assert entity.preset_mode == PRESET_COMFORT
-
-        # 2. Change the target temp of underlying thermostat at now -> the event will be disgarded because to fast (to avoid loop cf issue 121)
-        await send_climate_change_event_with_temperature(
-            entity,
-            HVACMode.HEAT,
-            HVACMode.HEAT,
-            HVACAction.OFF,
-            HVACAction.OFF,
-            now,
-            12.75,
-        )
-        # Should NOT have been switched to Manual preset
-        assert entity.target_temperature == 17
-        assert entity.preset_mode is PRESET_COMFORT
-
-        # 2. Change the target temp of underlying thermostat at 11 sec later -> the event will be taken
-        # Wait 11 sec
-        event_timestamp = now + timedelta(seconds=11)
-        assert entity.is_regulated is False
-        await send_climate_change_event_with_temperature(
-            entity,
-            HVACMode.HEAT,
-            HVACMode.HEAT,
-            HVACAction.OFF,
-            HVACAction.OFF,
-            event_timestamp,
-            12.75,
-        )
-        assert entity.target_temperature == 12.75
-        assert entity.preset_mode is PRESET_NONE
-
-
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_bug_272(
@@ -861,172 +399,6 @@ async def test_bug_407(hass: HomeAssistant, skip_hass_states_is_state):
        assert entity.overpowering_state is True


-async def test_bug_339(
-    hass: HomeAssistant,
-    # skip_hass_states_is_state,
-    init_central_config_with_boiler_fixture,
-):
-    """Test that the counter of active Vtherm in central boiler is
-    correctly updated with underlying is in auto and device is active
-    """
-
-    api = VersatileThermostatAPI.get_vtherm_api(hass)
-
-    climate1 = MockClimate(
-        hass=hass,
-        unique_id="climate1",
-        name="theClimate1",
-        hvac_mode=HVACMode.AUTO,
-        hvac_modes=[HVACMode.AUTO, HVACMode.OFF, HVACMode.HEAT, HVACMode.COOL],
-        hvac_action=HVACAction.HEATING,
-    )
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverClimateMockName",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 8,
-            CONF_TEMP_MAX: 18,
-            "frost_temp": 10,
-            "eco_temp": 17,
-            "comfort_temp": 18,
-            "boost_temp": 21,
-            CONF_USE_WINDOW_FEATURE: False,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_CLIMATE: climate1.entity_id,
-            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SECURITY_DELAY_MIN: 5,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            CONF_SECURITY_DEFAULT_ON_PERCENT: 0.1,
-            CONF_USE_MAIN_CENTRAL_CONFIG: True,
-            CONF_USE_PRESETS_CENTRAL_CONFIG: True,
-            CONF_USE_ADVANCED_CENTRAL_CONFIG: True,
-            CONF_USED_BY_CENTRAL_BOILER: True,
-        },
-    )
-
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=climate1,
-    ):
-        entity: ThermostatOverValve = await create_thermostat(
-            hass, entry, "climate.theoverclimatemockname"
-        )
-        assert entity
-        assert entity.name == "TheOverClimateMockName"
-        assert entity.is_over_climate
-        assert entity.underlying_entities[0].entity_id == "climate.climate1"
-        assert api.nb_active_device_for_boiler_threshold == 1
-
-    await entity.async_set_hvac_mode(HVACMode.AUTO)
-    # Simulate a state change in underelying
-    await api.nb_active_device_for_boiler_entity.calculate_nb_active_devices(None)
-
-    # The VTherm should be active
-    assert entity.underlying_entity(0).is_device_active is True
-    assert entity.is_device_active is True
-    assert api.nb_active_device_for_boiler == 1
-
-    entity.remove_thermostat()
-
-
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_bug_508(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-    skip_turn_on_off_heater,
-    skip_send_event,
-):
-    """Test that it not possible to set the target temperature under the min_temp setting"""
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverClimateMockName",
-        unique_id="uniqueId",
-        # default value are min 15°, max 31°, step 0.1
-        data=PARTIAL_CLIMATE_CONFIG,  # 5 minutes security delay
-    )
-
-    # Min_temp is 10 and max_temp is 31 and features contains TARGET_TEMPERATURE_RANGE
-    fake_underlying_climate = MagicMockClimateWithTemperatureRange()
-
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ), patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ), patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call:
-        entity = await create_thermostat(hass, entry, "climate.theoverclimatemockname")
-
-        assert entity
-
-        assert entity.name == "TheOverClimateMockName"
-        assert entity.is_over_climate is True
-        assert entity.hvac_mode is HVACMode.OFF
-        # The VTherm value and not the underlying value
-        assert entity.target_temperature_step == 0.1
-        assert entity.target_temperature == entity.min_temp
-        assert entity.is_regulated is True
-
-        assert mock_service_call.call_count == 0
-
-        # Set the hvac_mode to HEAT
-        await entity.async_set_hvac_mode(HVACMode.HEAT)
-
-        # Not In the accepted interval -> should be converted into 10 (the min) and send with target_temp_high and target_temp_low
-        await entity.async_set_temperature(temperature=8.5)
-
-        # MagicMock climate is already HEAT by default. So there is no SET_HAVC_MODE call
-        assert mock_service_call.call_count == 1
-        mock_service_call.assert_has_calls(
-            [
-                call.async_call(
-                    "climate",
-                    SERVICE_SET_TEMPERATURE,
-                    {
-                        "entity_id": "climate.mock_climate",
-                        # "temperature": 17.5,
-                        "target_temp_high": 10,
-                        "target_temp_low": 10,
-                    },
-                ),
-            ]
-        )
-
-    with patch("homeassistant.core.ServiceRegistry.async_call") as mock_service_call:
-        # Not In the accepted interval -> should be converted into 10 (the min) and send with target_temp_high and target_temp_low
-        await entity.async_set_temperature(temperature=32)
-
-        # MagicMock climate is already HEAT by default. So there is no SET_HAVC_MODE call
-        assert mock_service_call.call_count == 1
-        mock_service_call.assert_has_calls(
-            [
-                call.async_call(
-                    "climate",
-                    SERVICE_SET_TEMPERATURE,
-                    {
-                        "entity_id": "climate.mock_climate",
-                        "target_temp_high": 31,
-                        "target_temp_low": 31,
-                    },
-                ),
-            ]
-        )
-
-
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_bug_500_1(hass: HomeAssistant, init_vtherm_api) -> None:
@@ -1098,10 +470,10 @@ async def test_bug_500_3(hass: HomeAssistant, init_vtherm_api) -> None:

@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_bug_524(hass: HomeAssistant, skip_hass_states_is_state):
-    """Test when switching from Cool to Heat the new temperature in Heat mode should be used"""
+async def test_bug_465(hass: HomeAssistant, skip_hass_states_is_state):
+    """Test store and restore hvac_mode on toggle hvac state"""

-    vtherm_api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(hass)
+    # vtherm_api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(hass)

    # The temperatures to set
    temps = {
@@ -1121,6 +493,8 @@ async def test_bug_524(hass: HomeAssistant, skip_hass_states_is_state):
        "boost_ac_away": 23.1,
    }

+    # 0. initialisation
+
    config_entry = MockConfigEntry(
        domain=DOMAIN,
        title="TheOverClimateMockName",
@@ -1133,7 +507,10 @@ async def test_bug_524(hass: HomeAssistant, skip_hass_states_is_state):
            CONF_CYCLE_MIN: 5,
            CONF_TEMP_MIN: 15,
            CONF_TEMP_MAX: 30,
-            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_WINDOW_FEATURE: True,
+            CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
+            CONF_WINDOW_ACTION: CONF_WINDOW_TURN_OFF,
+            CONF_WINDOW_DELAY: 1,
            CONF_USE_MOTION_FEATURE: False,
            CONF_USE_POWER_FEATURE: False,
            CONF_USE_PRESENCE_FEATURE: True,
@@ -1145,7 +522,6 @@ async def test_bug_524(hass: HomeAssistant, skip_hass_states_is_state):
            CONF_AUTO_FAN_MODE: CONF_AUTO_FAN_TURBO,
            CONF_AC_MODE: True,
        },
-        # | temps,
    )

    fake_underlying_climate = MockClimate(
@@ -1162,52 +538,78 @@ async def test_bug_524(hass: HomeAssistant, skip_hass_states_is_state):
        vtherm: ThermostatOverClimate = await create_thermostat(
            hass, config_entry, "climate.overclimate"
        )
+        assert vtherm is not None

-    assert vtherm is not None
+        await set_all_climate_preset_temp(hass, vtherm, temps, "overclimate")

-    # We search for NumberEntities
-    for preset_name, value in temps.items():
-
-        await set_climate_preset_temp(vtherm, preset_name, value)
-
-        temp_entity: NumberEntity = search_entity(
-            hass,
-            "number.overclimate_preset_" + preset_name + PRESET_TEMP_SUFFIX,
-            NUMBER_DOMAIN,
-        )
-        assert temp_entity
-        # Because set_value is not implemented in Number class (really don't understand why...)
-        assert temp_entity.state == value
+    now: datetime = datetime.now(tz=get_tz(hass))

    # 1. Set mode to Heat and preset to Comfort
    await send_presence_change_event(vtherm, True, False, datetime.now())
    await vtherm.async_set_hvac_mode(HVACMode.HEAT)
-    await vtherm.async_set_preset_mode(PRESET_COMFORT)
+    await vtherm.async_set_preset_mode(PRESET_BOOST)
    await hass.async_block_till_done()

-    assert vtherm.target_temperature == 19.0
+    assert vtherm.target_temperature == 21.0

-    # 2. Only change the HVAC_MODE (and keep preset to comfort)
+    # 2. Toggle the VTherm state
+    await vtherm.async_toggle()
+    await hass.async_block_till_done()
+    assert vtherm.hvac_mode == HVACMode.OFF
+
+    # 3. (re)Toggle the VTherm state
+    await vtherm.async_toggle()
+    await hass.async_block_till_done()
+    assert vtherm.hvac_mode == HVACMode.HEAT
+
+    # 4. Toggle from COOL
    await vtherm.async_set_hvac_mode(HVACMode.COOL)
    await hass.async_block_till_done()
-    assert vtherm.target_temperature == 25.0

-    # 3. Only change the HVAC_MODE (and keep preset to comfort)
-    await vtherm.async_set_hvac_mode(HVACMode.HEAT)
-    await hass.async_block_till_done()
-    assert vtherm.target_temperature == 19.0
+    assert vtherm.target_temperature == 23.0

-    # 4. Change presence to off
-    await send_presence_change_event(vtherm, False, True, datetime.now())
+    # 5. Toggle the VTherm state
+    await vtherm.async_toggle()
    await hass.async_block_till_done()
-    assert vtherm.target_temperature == 19.1
+    assert vtherm.hvac_mode == HVACMode.OFF

-    # 5. Change hvac_mode to AC
-    await vtherm.async_set_hvac_mode(HVACMode.COOL)
+    # 6. (re)Toggle the VTherm state
+    await vtherm.async_toggle()
    await hass.async_block_till_done()
-    assert vtherm.target_temperature == 25.1
+    assert vtherm.hvac_mode == HVACMode.COOL

-    # 6. Change presence to on
-    await send_presence_change_event(vtherm, True, False, datetime.now())
+    ###
+    # Same test with an open window and initial state is COOL
+    #
+    # 7. open the window
+    with patch("homeassistant.helpers.condition.state", return_value=True):
+        try_window_condition = await send_window_change_event(
+            vtherm, True, False, now, False
+        )
+        await try_window_condition(None)
+        await hass.async_block_till_done()
+
+    assert vtherm.window_state is STATE_ON
+    assert vtherm.hvac_mode == HVACMode.OFF
+
+    # 8. call toggle -> we should stay in OFF (command is ignored)
+    await vtherm.async_toggle()
    await hass.async_block_till_done()
-    assert vtherm.target_temperature == 25
+    assert vtherm.hvac_mode == HVACMode.OFF
+
+    # 9. Close the window (we should come back to Cool this time)
+    now = now + timedelta(minutes=2)
+    with patch("homeassistant.helpers.condition.state", return_value=True):
+        try_window_condition = await send_window_change_event(
+            vtherm, False, True, now, False
+        )
+        await try_window_condition(None)
+        await hass.async_block_till_done()
+
+    assert vtherm.window_state is STATE_OFF
+    assert vtherm.hvac_mode == HVACMode.COOL
+
+    # 9. call toggle -> we should come back in OFF
+    await vtherm.async_toggle()
+    await hass.async_block_till_done()
+    assert vtherm.hvac_mode == HVACMode.OFF
--- a/tests/test_central_boiler.py
+++ b/tests/test_central_boiler.py
@@ -842,3 +842,80 @@ async def test_update_central_boiler_state_simple_climate(
        assert boiler_binary_sensor.state == STATE_OFF

    entity.remove_thermostat()
+
+
+async def test_bug_339(
+    hass: HomeAssistant,
+    # skip_hass_states_is_state,
+    init_central_config_with_boiler_fixture,
+):
+    """Test that the counter of active Vtherm in central boiler is
+    correctly updated with underlying is in auto and device is active
+    """
+
+    api = VersatileThermostatAPI.get_vtherm_api(hass)
+
+    climate1 = MockClimate(
+        hass=hass,
+        unique_id="climate1",
+        name="theClimate1",
+        hvac_mode=HVACMode.AUTO,
+        hvac_modes=[HVACMode.AUTO, HVACMode.OFF, HVACMode.HEAT, HVACMode.COOL],
+        hvac_action=HVACAction.HEATING,
+    )
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverClimateMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 8,
+            CONF_TEMP_MAX: 18,
+            "frost_temp": 10,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 21,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_CLIMATE: climate1.entity_id,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_SECURITY_DEFAULT_ON_PERCENT: 0.1,
+            CONF_USE_MAIN_CENTRAL_CONFIG: True,
+            CONF_USE_PRESETS_CENTRAL_CONFIG: True,
+            CONF_USE_ADVANCED_CENTRAL_CONFIG: True,
+            CONF_USED_BY_CENTRAL_BOILER: True,
+        },
+    )
+
+    with patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=climate1,
+    ):
+        entity: ThermostatOverValve = await create_thermostat(
+            hass, entry, "climate.theoverclimatemockname"
+        )
+        assert entity
+        assert entity.name == "TheOverClimateMockName"
+        assert entity.is_over_climate
+        assert entity.underlying_entities[0].entity_id == "climate.climate1"
+        assert api.nb_active_device_for_boiler_threshold == 1
+
+    await entity.async_set_hvac_mode(HVACMode.AUTO)
+    # Simulate a state change in underelying
+    await api.nb_active_device_for_boiler_entity.calculate_nb_active_devices(None)
+
+    # The VTherm should be active
+    assert entity.underlying_entity(0).is_device_active is True
+    assert entity.is_device_active is True
+    assert api.nb_active_device_for_boiler == 1
+
+    entity.remove_thermostat()
--- a/tests/test_central_mode.py
+++ b/tests/test_central_mode.py
@@ -630,6 +630,7 @@ async def test_climate_ac_only_change_central_mode_true(
        },
    )

+    # 1. set hvac_mode to COOL and preet ECO
    with patch("homeassistant.core.ServiceRegistry.async_call"), patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
        return_value=fake_underlying_climate,
@@ -982,7 +983,8 @@ 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
-        await entity.async_set_hvac_mode(HVACMode.OFF)
+        assert entity.hvac_mode is HVACMode.OFF
+        assert entity.hvac_off_reason == HVAC_OFF_REASON_MANUAL
        await entity.async_set_preset_mode(PRESET_ACTIVITY)
        assert entity._saved_hvac_mode == HVACMode.HEAT
        assert entity._saved_preset_mode == PRESET_ACTIVITY
@@ -1000,12 +1002,14 @@ async def test_switch_change_central_mode_true_with_cool_only_and_window(

        await try_function(None)

-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [call.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.OFF})]
-        )
+        # 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 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
@@ -1021,6 +1025,8 @@ 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
@@ -1046,6 +1052,7 @@ 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
--- a/tests/test_movement.py
+++ b/tests/test_movement.py
@@ -97,7 +97,12 @@ async def test_movement_management_time_not_enough(
        return_value=False,
    ), patch(
        "homeassistant.helpers.condition.state", return_value=False
-    ) as mock_condition:
+    ) as mock_condition, patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF
+        ),
+    ):
        event_timestamp = now - timedelta(minutes=4)
        try_condition = await send_motion_change_event(entity, True, False, event_timestamp)

@@ -109,8 +114,8 @@ async def test_movement_management_time_not_enough(
        # because no motion is detected yet
        assert entity.target_temperature == 18
        # state is not changed if time is not enough
-        assert entity.motion_state is None
-        assert entity.presence_state == "on"
+        assert entity.motion_state is STATE_OFF
+        assert entity.presence_state == STATE_ON

        assert mock_send_event.call_count == 0
        # Change is not confirmed
@@ -141,8 +146,8 @@ async def test_movement_management_time_not_enough(
        assert entity.preset_mode is PRESET_ACTIVITY
        # because motion is detected yet
        assert entity.target_temperature == 19
-        assert entity.motion_state == "on"
-        assert entity.presence_state == "on"
+        assert entity.motion_state == STATE_ON
+        assert entity.presence_state == STATE_ON

    # stop detecting motion with off delay too low
    with patch(
@@ -156,19 +161,24 @@ async def test_movement_management_time_not_enough(
        return_value=True,
    ) as mock_device_active, patch(
        "homeassistant.helpers.condition.state", return_value=False
-    ) as mock_condition:
+    ) as mock_condition, patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF
+        ),
+    ):
        event_timestamp = now - timedelta(minutes=2)
        try_condition = await send_motion_change_event(entity, False, True, event_timestamp)

-         # Will return False -> we will stay to movement On
+        # Will return False -> we will stay to movement On
        await try_condition(None)

        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_ACTIVITY
        # because no motion is detected yet
        assert entity.target_temperature == 19
-        assert entity.motion_state == "on"
-        assert entity.presence_state == "on"
+        assert entity.motion_state == STATE_ON
+        assert entity.presence_state == STATE_ON

        assert mock_send_event.call_count == 0
        # The heater must heat now
@@ -192,15 +202,15 @@ async def test_movement_management_time_not_enough(
        event_timestamp = now - timedelta(minutes=1)
        try_condition = await send_motion_change_event(entity, False, True, event_timestamp)

-         # Will return True -> we will switch to movement Off
+        # Will return True -> we will switch to movement Off
        await try_condition(None)

        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_ACTIVITY
        # because no motion is detected yet
        assert entity.target_temperature == 18
-        assert entity.motion_state == "off"
-        assert entity.presence_state == "on"
+        assert entity.motion_state == STATE_OFF
+        assert entity.presence_state == STATE_ON

        assert mock_send_event.call_count == 0
        # The heater must stop heating now
@@ -214,7 +224,7 @@ async def test_movement_management_time_not_enough(
 async def test_movement_management_time_enough_and_presence(
    hass: HomeAssistant, skip_hass_states_is_state
 ):
-    """Test the Presence management when time is not enough"""
+    """Test the Motion management when time is not enough"""

    entry = MockConfigEntry(
        domain=DOMAIN,
@@ -479,7 +489,7 @@ async def test_movement_management_time_enoughand_not_presence(
 async def test_movement_management_with_stop_during_condition(
    hass: HomeAssistant, skip_hass_states_is_state
 ):
-    """Test the Presence management when the movement sensor switch to off and then to on during the test condition"""
+    """Test the Motion management when the movement sensor switch to off and then to on during the test condition"""

    entry = MockConfigEntry(
        domain=DOMAIN,
@@ -558,9 +568,13 @@ async def test_movement_management_with_stop_during_condition(
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
        return_value=True,
-    ), patch("homeassistant.helpers.condition.state", return_value=True): # Not needed for this test
+    ), patch(
+        "homeassistant.helpers.condition.state", return_value=True
+    ):  # Not needed for this test
        event_timestamp = now - timedelta(minutes=5)
-        try_condition1 = await send_motion_change_event(entity, True, False, event_timestamp)
+        try_condition1 = await send_motion_change_event(
+            entity, True, False, event_timestamp
+        )

        assert try_condition1 is not None

@@ -573,8 +587,10 @@ async def test_movement_management_with_stop_during_condition(

        # Send a stop detection
        event_timestamp = now - timedelta(minutes=4)
-        try_condition = await send_motion_change_event(entity, False, True, event_timestamp)
-        assert try_condition is None    # The timer should not have been stopped
+        try_condition = await send_motion_change_event(
+            entity, False, True, event_timestamp
+        )
+        assert try_condition is None  # The timer should not have been stopped

        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_ACTIVITY
@@ -584,8 +600,12 @@ async def test_movement_management_with_stop_during_condition(

        # Resend a start detection
        event_timestamp = now - timedelta(minutes=3)
-        try_condition = await send_motion_change_event(entity, True, False, event_timestamp)
-        assert try_condition is None  # The timer should not have been restarted (we keep the first one)
+        try_condition = await send_motion_change_event(
+            entity, True, False, event_timestamp
+        )
+        assert (
+            try_condition is None
+        )  # The timer should not have been restarted (we keep the first one)

        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_ACTIVITY
@@ -596,6 +616,122 @@ async def test_movement_management_with_stop_during_condition(

        await try_condition1(None)
        # We should have switch this time
-        assert entity.target_temperature == 19 # Boost
-        assert entity.motion_state == "on"     # switch to movement on
+        assert entity.target_temperature == 19  # Boost
+        assert entity.motion_state == "on"  # switch to movement on
        assert entity.presence_state == "off"  # Non change
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_movement_management_with_stop_during_condition_last_state_on(
+    hass: HomeAssistant, skip_hass_states_is_state
+):
+    """Test the Motion management when the movement sensor switch to off and then to on during the test condition"""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverSwitchMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            "eco_away_temp": 17,
+            "comfort_away_temp": 18,
+            "boost_away_temp": 19,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: True,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_HEATER: "switch.mock_switch",
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.3,
+            CONF_TPI_COEF_EXT: 0.01,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_MOTION_SENSOR: "binary_sensor.mock_motion_sensor",
+            CONF_MOTION_DELAY: 10,
+            CONF_MOTION_OFF_DELAY: 30,
+            CONF_MOTION_PRESET: "boost",
+            CONF_NO_MOTION_PRESET: "comfort",
+        },
+    )
+
+    entity: BaseThermostat = await create_thermostat(
+        hass, entry, "climate.theoverswitchmockname"
+    )
+    assert entity
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    # 0. start heating, in boost mode. We block the control_heating to avoid running a cycle
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ):
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        await entity.async_set_preset_mode(PRESET_ACTIVITY)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        # because no motion is detected yet
+        assert entity.target_temperature == 18
+        assert entity.motion_state is None
+
+        event_timestamp = now - timedelta(minutes=6)
+        await send_temperature_change_event(entity, 18, event_timestamp)
+        await send_ext_temperature_change_event(entity, 10, event_timestamp)
+
+    # 1. starts detecting motion but the sensor is off
+    with patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        return_value=True,
+    ), patch("homeassistant.helpers.condition.state", return_value=False), patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_OFF
+        ),
+    ):
+        event_timestamp = now - timedelta(minutes=5)
+        try_condition1 = await send_motion_change_event(
+            entity, True, False, event_timestamp
+        )
+
+        assert try_condition1 is not None
+
+        await try_condition1(None)
+
+        # because no motion is detected yet -> condition.state is False and sensor is not active
+        assert entity.target_temperature == 18
+        assert entity.motion_state is STATE_OFF
+
+    # 2. starts detecting motion but the sensor is on
+    with patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        return_value=True,
+    ), patch("homeassistant.helpers.condition.state", return_value=False), patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="binary_sensor.mock_motion_sensor", state=STATE_ON
+        ),
+    ):
+        event_timestamp = now - timedelta(minutes=5)
+        try_condition1 = await send_motion_change_event(
+            entity, True, False, event_timestamp
+        )
+
+        assert try_condition1 is not None
+
+        await try_condition1(None)
+
+        # because no motion is detected yet -> condition.state is False and sensor is not active
+        assert entity.target_temperature == 19
+        assert entity.motion_state is STATE_ON
--- a/tests/test_multiple_switch.py
+++ b/tests/test_multiple_switch.py
@@ -596,6 +596,7 @@ async def test_multiple_climates_underlying_changes(
            HVACAction.IDLE,
            HVACAction.OFF,
            event_timestamp,
+            underlying_entity_id="switch.mock_climate3",
        )

        # Should be call for all Switch
--- a/tests/test_overclimate.py
+++ b/tests/test_overclimate.py
--- a/tests/test_power.py
+++ b/tests/test_power.py
@@ -433,6 +433,7 @@ async def test_power_management_energy_over_climate(
        new_hvac_action=HVACAction.HEATING,
        old_hvac_action=HVACAction.OFF,
        date=event_timestamp,
+        underlying_entity_id="climate.mock_climate",
    )
    # We have the start event and not the end event
    assert (entity._underlying_climate_start_hvac_action_date - now).total_seconds() < 1
@@ -448,6 +449,7 @@ async def test_power_management_energy_over_climate(
        new_hvac_action=HVACAction.IDLE,
        old_hvac_action=HVACAction.HEATING,
        date=now,
+        underlying_entity_id="climate.mock_climate",
    )
    # We have the end event -> we should have some power and on_percent
    assert entity._underlying_climate_start_hvac_action_date is None
--- a/tests/test_sensors.py
+++ b/tests/test_sensors.py
@@ -283,6 +283,7 @@ async def test_sensors_over_climate(
        new_hvac_action=HVACAction.HEATING,
        old_hvac_action=HVACAction.OFF,
        date=event_timestamp,
+        underlying_entity_id="climate.mock_climate",
    )

    # Send a climate_change event with HVACAction=IDLE (end of heating)
@@ -293,6 +294,7 @@ async def test_sensors_over_climate(
        new_hvac_action=HVACAction.IDLE,
        old_hvac_action=HVACAction.HEATING,
        date=now,
+        underlying_entity_id="climate.mock_climate",
    )

    # 60 minutes heating with 1.5 kW heating -> 1.5 kWh
--- a/tests/test_valve.py
+++ b/tests/test_valve.py
@@ -6,10 +6,6 @@ from datetime import datetime, timedelta

 from homeassistant.core import HomeAssistant, State
 from homeassistant.components.climate import HVACAction, HVACMode
-from homeassistant.config_entries import ConfigEntryState
-
-from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN

 from pytest_homeassistant_custom_component.common import MockConfigEntry

@@ -551,3 +547,168 @@ async def test_over_valve_regulation(

        assert mock_service_call.call_count == 0
        assert mock_send_event.call_count == 0
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_533(
+    hass: HomeAssistant, skip_hass_states_is_state
+):  # pylint: disable=unused-argument
+    """Test that with an over_valve and _auto_regulation_dpercent is set that the valve could close totally"""
+
+    # vtherm_api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(hass)
+
+    # The temperatures to set
+    temps = {
+        "frost": 7.0,
+        "eco": 17.0,
+        "comfort": 19.0,
+        "boost": 21.0,
+    }
+
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverValveMockName",
+        unique_id="overValveUniqueId",
+        data={
+            CONF_NAME: "overValve",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_VALVE,
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.5,
+            CONF_TPI_COEF_EXT: 0,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_VALVE: "number.mock_valve",
+            CONF_AUTO_REGULATION_DTEMP: 10,  # This parameter makes the bug
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 60,
+        },
+        # | temps,
+    )
+
+    # Not used because number is not registred so we can use directly the underlying number
+    # fake_underlying_number = MockNumber(
+    #     hass=hass, unique_id="mock_number", name="mock_number"
+    # )
+
+    vtherm: ThermostatOverValve = await create_thermostat(
+        hass, config_entry, "climate.overvalve"
+    )
+
+    assert vtherm is not None
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    # Set all temps and check they are correctly initialized
+    await set_all_climate_preset_temp(hass, vtherm, temps, "overvalve")
+    await send_temperature_change_event(vtherm, 15, now)
+    await send_ext_temperature_change_event(vtherm, 15, now)
+
+    # 1. Set mode to Heat and preset to Comfort
+    await vtherm.async_set_hvac_mode(HVACMode.HEAT)
+    with patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="number.mock_valve",
+            state="100",
+            attributes={"min": 0, "max": 100},
+        ),
+    ), patch("homeassistant.core.ServiceRegistry.async_call") as mock_service_call:
+        await vtherm.async_set_preset_mode(PRESET_COMFORT)
+        await hass.async_block_till_done()
+
+        assert vtherm.target_temperature == 19.0
+        assert mock_service_call.call_count == 1
+        mock_service_call.assert_has_calls(
+            [
+                call.async_call(
+                    domain="number",
+                    service="set_value",
+                    service_data={"value": 100},
+                    target={"entity_id": "number.mock_valve"},
+                ),
+            ]
+        )
+
+    # 2. set current temperature to 18 -> still 50% open, so there is a call
+    now = now + timedelta(minutes=1)
+    with patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="number.mock_valve",
+            state="100",
+            attributes={"min": 0, "max": 100},
+        ),
+    ), patch("homeassistant.core.ServiceRegistry.async_call") as mock_service_call:
+        await send_temperature_change_event(vtherm, 18, now)
+        await hass.async_block_till_done()
+
+        assert mock_service_call.call_count == 1
+        mock_service_call.assert_has_calls(
+            [
+                call.async_call(
+                    domain="number",
+                    service="set_value",
+                    service_data={"value": 50},
+                    target={"entity_id": "number.mock_valve"},
+                ),
+            ]
+        )
+
+    # 3. set current temperature to 18.8 -> still 10% open, so there is one call
+    now = now + timedelta(minutes=1)
+    with patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="number.mock_valve",
+            state="50",
+            attributes={"min": 0, "max": 100},
+        ),
+    ), patch("homeassistant.core.ServiceRegistry.async_call") as mock_service_call:
+        await send_temperature_change_event(vtherm, 18.8, now)
+        await hass.async_block_till_done()
+
+        assert mock_service_call.call_count == 1
+        mock_service_call.assert_has_calls(
+            [
+                call.async_call(
+                    domain="number",
+                    service="set_value",
+                    service_data={"value": 10},
+                    target={"entity_id": "number.mock_valve"},
+                ),
+            ]
+        )
+
+    # 4. set current temperature to 19 -> should have 0% open and one call to set the 0
+    now = now + timedelta(minutes=1)
+    with patch(
+        "homeassistant.core.StateMachine.get",
+        return_value=State(
+            entity_id="number.mock_valve",
+            state="10",  # the previous value
+            attributes={"min": 0, "max": 100},
+        ),
+    ), patch("homeassistant.core.ServiceRegistry.async_call") as mock_service_call:
+        await send_temperature_change_event(vtherm, 19, now)
+        await hass.async_block_till_done()
+
+        assert mock_service_call.call_count == 1
+        mock_service_call.assert_has_calls(
+            [
+                call.async_call(
+                    domain="number",
+                    service="set_value",
+                    service_data={"value": 0},
+                    target={"entity_id": "number.mock_valve"},
+                ),
+            ]
+        )
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -205,6 +205,8 @@ 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
@@ -242,6 +244,9 @@ 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()
@@ -1339,6 +1344,7 @@ 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
@@ -1357,7 +1363,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 asyncio.sleep(0.3)
+        await hass.async_block_till_done()

        assert entity.window_state == STATE_OFF
        assert mock_send_event.call_count == 1
@@ -1379,6 +1385,7 @@ 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()
@@ -1925,3 +1932,162 @@ async def test_window_action_frost_temp(hass: HomeAssistant, skip_hass_states_is

    # Clean the entity
    entity.remove_thermostat()
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_66(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_turn_on_off_heater,
+    skip_send_event,
+):
+    """Test that it should be possible to open/close the window rapidly without side effect"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverSwitchMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            CONF_USE_WINDOW_FEATURE: True,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_HEATER: "switch.mock_switch",
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.3,
+            CONF_TPI_COEF_EXT: 0.01,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.5,
+            CONF_SECURITY_DEFAULT_ON_PERCENT: 0.1,  # !! here
+            CONF_DEVICE_POWER: 200,
+            CONF_WINDOW_SENSOR: "binary_sensor.mock_window_sensor",
+            CONF_WINDOW_DELAY: 0,  # important to not been obliged to wait
+        },
+    )
+
+    entity: BaseThermostat = await create_thermostat(
+        hass, entry, "climate.theoverswitchmockname"
+    )
+    assert entity
+
+    await entity.async_set_hvac_mode(HVACMode.HEAT)
+    await entity.async_set_preset_mode(PRESET_BOOST)
+
+    assert entity.hvac_mode is HVACMode.HEAT
+    assert entity.preset_mode is PRESET_BOOST
+    assert entity.target_temperature == 19
+    assert entity.window_state is STATE_OFF
+
+    # Open the window and let the thermostat shut down
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
+        "homeassistant.helpers.condition.state", return_value=True
+    ) as mock_condition, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        return_value=True,
+    ):
+        await send_temperature_change_event(entity, 15, now)
+        try_window_condition = await send_window_change_event(
+            entity, True, False, now, False
+        )
+
+        # simulate the call to try_window_condition
+        await try_window_condition(None)
+
+        assert mock_send_event.call_count == 1
+        assert mock_heater_on.call_count == 1
+        assert mock_heater_off.call_count >= 1
+        assert mock_condition.call_count == 1
+
+        assert entity.window_state == STATE_ON
+
+    # Close the window but too shortly
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
+        "homeassistant.helpers.condition.state", return_value=False
+    ) as mock_condition, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        return_value=False,
+    ):
+        event_timestamp = now + timedelta(minutes=1)
+        try_window_condition = await send_window_change_event(
+            entity, False, True, event_timestamp
+        )
+        # simulate the call to try_window_condition
+        await try_window_condition(None)
+
+        # window state should not have change
+        assert entity.window_state == STATE_ON
+
+    # Reopen immediatly with sufficient time
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
+        "homeassistant.helpers.condition.state", return_value=True
+    ) as mock_condition, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        return_value=False,
+    ):
+        try_window_condition = await send_window_change_event(
+            entity, True, False, event_timestamp
+        )
+        # simulate the call to try_window_condition
+        await try_window_condition(None)
+
+        # still no change
+        assert entity.window_state == STATE_ON
+        assert entity.hvac_mode == HVACMode.OFF
+
+    # Close the window but with sufficient time this time
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+    ) as mock_heater_on, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
+    ) as mock_heater_off, patch(
+        "homeassistant.helpers.condition.state", return_value=True
+    ) as mock_condition, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        return_value=False,
+    ):
+        event_timestamp = now + timedelta(minutes=2)
+        try_window_condition = await send_window_change_event(
+            entity, False, True, event_timestamp
+        )
+        # simulate the call to try_window_condition
+        await try_window_condition(None)
+
+        # window state should be Off this time and old state should have been restored
+        assert entity.window_state == STATE_OFF
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_BOOST
Author	SHA1	Message	Date
Jean-Marc Collin	64968687f5	Release	2024-11-17 10:56:17 +00:00
Jean-Marc Collin	132c98a612	Fix Testus	2024-11-17 10:51:02 +00:00
Jean-Marc Collin	3113f3b57f	Work in simuated environment	2024-11-17 10:39:59 +00:00
Jean-Marc Collin	f0526a0c93	With 1rst implementation of VTherm TRVZB and underlying	2024-11-17 07:47:44 +00:00
Jean-Marc Collin	c2677bf7c5	Next (not finished)	2024-11-16 21:43:53 +00:00
Jean-Marc Collin	8e01e69585	Fix configuration	2024-11-16 21:22:13 +00:00
Jean-Marc Collin	643f061fe2	With Sonoff configuration ok	2024-11-16 18:31:11 +00:00
Jean-Marc Collin	c1d1e8f1db	Fix safety mode doc	2024-11-16 09:33:48 +00:00
Gernot Messow	71c35ecdc0	Fixed and extended unit test (#637 )	2024-11-14 22:29:04 +01:00
Gernot Messow	4f8e45dda6	Just ignore illegal target temp, do not throw away all data (#635 ) Co-authored-by: Gernot Messow <gmessow@insys-locks.de>	2024-11-14 21:54:15 +01:00
Jean-Marc Collin	d624c327b6	Issue #552 (#627 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-11-13 19:14:22 +01:00
Jean-Marc Collin	b46a24f834	Issue #628 add follow underlying temp change entity (#630 ) * First commit (no test) * With tests ok --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-11-13 19:14:03 +01:00
Jean-Marc Collin	d31376d55d	Add Overkiz incompatilibity	2024-11-10 15:29:35 +00:00
Jean-Marc Collin	dbfd294ff3	Issue #496 - precision on safety parameters for `over_climate`	2024-11-10 10:03:33 +00:00
Jean-Marc Collin	e111bd0647	Removes most of the collapsible section in README.	2024-11-10 09:48:45 +00:00
Jean-Marc Collin	ba69319198	Issue #619 - manual hvac_off should be prioritized over window and auto-start/stop hvac_off (#622 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-11-10 10:17:53 +01:00
Jean-Marc Collin	f9df925181	Issue #615 - VTherm switch to manual on its own (#618 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-11-09 18:44:13 +01:00
Jean-Marc Collin	2d72efe447	Issue 600 energy can be negative after configuration (#614 ) * Add logs to diagnose the case * Issue #552 (#608) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com> * Fix typo (#607) * - Force writing state when entity is removed - Fix bug with issue #552 on CONF_USE_CENTRAL_BOILER_FEATURE which should be proposed on a central configuration - Improve reload of entity to avoid reloading all VTherm. Only the reconfigured one will be reloaded --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com> Co-authored-by: Ludovic BOUÉ <lboue@users.noreply.github.com>	2024-11-07 21:57:08 +01:00
Ludovic BOUÉ	95af6eba97	Fix typo (#607 )	2024-11-05 22:47:42 +01:00
Jean-Marc Collin	06dc537767	Issue #552 (#608 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-11-05 22:39:26 +01:00
Joeri Colman	2d79d961dc	Update en.json (#604 ) fixed typo	2024-11-05 10:40:49 +01:00
Jean-Marc Collin	027bf8386b	Add message into issue template.	2024-11-05 06:37:27 +00:00
Jean-Marc Collin	a0e548ef71	Release	2024-11-03 22:16:15 +00:00
Jean-Marc Collin	132519b471	Merge #590 and fix some tests	2024-11-03 22:12:56 +00:00
hilburn	e6c330fc9d	Underlying config changes (#590 ) * Changes config_flow to allow dynamic length list of underlying entities Updates previously defined 4x entries to new config style Changes to thermostat_X to load underlying entities from list Changes to thermostat X to display underlying entities as a list - COULD BREAK EXISTING TEMPLATES * Modifies tests to use the new list format * Added English translation for UI * Removed all references to individual entities in strings/en.json * Fix merge mistake --------- Co-authored-by: Jean-Marc Collin <jm.collin.78@gmail.com>	2024-11-03 22:52:19 +01:00
Jean-Marc Collin	968e8286ea	Add some infos	2024-11-03 21:50:42 +00:00
hilburn	0f60c070ab	Preset display tweaks (#599 ) * Addded Frost Preset to translations Added Icons for Shedding, Safety, Manual and Frost Presets * Fixed French Translation	2024-11-03 11:50:37 +01:00
Jean-Marc Collin	810430f7b1	Update README.md #597	2024-11-02 19:16:24 +01:00
Jean-Marc Collin	b4860c2b8d	Issue 585 add auto start/stop feature (#594 ) * Migrate to HA 2024.10.4 * Auto start/stop alog and testu + ConfigFlow * With config flow ok * Change algo * All is fine * Add change_preset test * + comment * FIX too much start/stop * Change algo to take slop into account * Allow calculation even if slope is None * With enable + tests + hysteresis in calculation * Add hvac_off_reason and test with window interaction * Fix some tests * Restore saved_state * Release --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-11-01 18:54:22 +01:00
Gernot Messow	60bd522a97	Filter out-of-range target temperature sent from underlying climate devices (#581 ) * Filter out-of-range temperature from underlying climate * Fixed broken test case, added new test case for range filtering	2024-10-27 09:21:08 +01:00
Jean-Marc Collin	fc39cf5f40	Maia suggestion to README	2024-10-26 11:27:16 +02:00
Jean-Marc Collin	f6fb7487d5	Issue #467 - Always apply offset compensation (#567 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-16 19:33:55 +02:00
Jean-Marc Collin	0f585be0c9	issue #556 - enhance motion detection feature (2)	2024-10-16 05:08:57 +00:00
Jean-Marc Collin	492c95aff5	FIX issue #556 - enhance motion detection feature (#560 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-14 20:14:51 +02:00
Jean-Marc Collin	a530051bbd	FIX #518 TypeError: unsupported operand type(s) for -: 'int' and 'NoneType' (#559 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-14 19:29:34 +02:00
Jean-Marc Collin	4ef82af8ce	Merge branch 'issue_554-simulate-hvac-action'	2024-10-14 17:01:01 +00:00
Jean-Marc Collin	2ea5cf471b	Cleaning	2024-10-14 16:58:18 +00:00
Jean-Marc Collin	f6afaf2715	with local tests ok. (#555 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-14 09:02:50 +02:00
Jean-Marc Collin	f29b2f9b81	with local tests ok.	2024-10-14 07:01:27 +00:00
Jean-Marc Collin	de9b95903e	Add testu	2024-10-14 04:56:12 +00:00
Jean-Marc Collin	d112273c58	Fix preset temp is sommetimes lost on over_climate	2024-10-14 04:43:19 +00:00
Jean-Marc Collin	73a9ca4e53	Issue #478 vtherm doesn't follow underlying (#548 ) * Dispatch test_bugs into each own VTherm type tests * Local tests ok * With testus ok. --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-13 11:30:04 +02:00
Jean-Marc Collin	1334bdbd8f	FIX #465 and make this coherent with Windows open/close (#545 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-12 17:32:05 +02:00
Jean-Marc Collin	646ef47f6f	Fix issue #485 (#544 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-12 12:50:12 +02:00
Jean-Marc Collin	c344c43185	FIX #518 (#543 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-12 11:02:24 +02:00
Jean-Marc Collin	062f8a617d	Fix #533 (#542 ) Clean some pylint hints Avoid 2 times open percentage send at startup Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-10-12 10:46:13 +02:00