FIX #341 - when window state change, open_valve_percent should be resend

Add events in README
Documentation and release.
2024-01-14 23:02:23 +00:00 · 2024-01-14 16:50:59 +00:00 · 2024-01-14 16:44:38 +00:00 · 2024-01-14 12:37:09 +00:00 · 2024-01-14 00:33:52 +00:00 · 2024-01-13 17:46:41 +00:00
34 changed files with 229 additions and 2825 deletions
--- a/.devcontainer/configuration.yaml
+++ b/.devcontainer/configuration.yaml
@@ -28,8 +28,6 @@ versatile_thermostat:
        max_alpha: 0.6
        halflife_sec: 301
        precision: 3
-    safety_mode:
-        check_outdoor_sensor: false

 input_number:
    fake_temperature_sensor1:
@@ -69,10 +67,10 @@ input_number:
        icon: mdi:pipe-valve
        unit_of_measurement: percentage
    fake_boiler_temperature:
-        name: Central thermostat temp
+        name: Boiler temperature
        min: 0
        max: 30
-        icon: mdi:thermostat
+        icon: mdi:water-boiler
        unit_of_measurement: °C
        mode: box

--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -30,8 +30,7 @@
 				"waderyan.gitblame",
 				"keesschollaart.vscode-home-assistant",
 				"vscode.markdown-math",
-				"yzhang.markdown-all-in-one",
-				"github.vscode-github-actions"
+				"yzhang.markdown-all-in-one"
 			],
 			"settings": {
 				"files.eol": "\n",
--- a/.github/workflows/testus.yaml
+++ b/.github/workflows/testus.yaml
@@ -1,50 +0,0 @@
-name: Run Tests
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  testu:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.11
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip3 install -r requirements_test.txt
-
-      - name: Run Tests
-        run: |
-          pytest \
-            -qq \
-            --timeout=9 \
-            --durations=10 \
-            -n auto \
-            -o console_output_style=count \
-            -p no:sugar \
-            tests
-
-      - name: Coverage
-        run: |
-          coverage run -m pytest tests/
-          coverage report
-
-      - name: Generate HTML Coverage Report
-        run: coverage html
-
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./htmlcov
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,3 @@ __pycache__
 config/**
 custom_components/hacs
 custom_components/localtuya
-
-.coverage
-htmlcov
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,12 +13,6 @@
            "command": "./container restart",
            "problemMatcher": []
        },
-        {
-            "label": "Start coverage",
-            "type": "shell",
-            "command": "./container coverage",
-            "problemMatcher": []
-        },
        {
            "label": "Home Assistant translations update",
            "type": "shell",
--- a/README-fr.md
+++ b/README-fr.md
@@ -84,15 +84,14 @@ Ce composant personnalisé pour Home Assistant est une mise à niveau et est une


 > ![Nouveau](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/new-icon.png?raw=true) _*Nouveautés*_
-> * **Release 5.4** : Ajout du pas de température [#311](https://github.com/jmcollin78/versatile_thermostat/issues/311). 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)
-> * **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.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),
 > * **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).
 <details>
 <summary>Autres versions</summary>

-> * **Release 4.3** : Ajout d'un mode auto-fan pour le type `over_climate` permettant d'activer la ventilation si l'écart de température est important [#223](https://github.com/jmcollin78/versatile_thermostat/issues/223).
 > * **Release 4.2** : Le calcul de la pente de la courbe de température se fait maintenant en °/heure et non plus en °/min [#242](https://github.com/jmcollin78/versatile_thermostat/issues/242). Correction de la détection automatique des ouvertures par l'ajout d'un lissage de la courbe de température .
 > * **Release 4.1** : Ajout d'un mode de régulation **Expert** dans lequel l'utilisateur peut spécifier ses propres paramètres d'auto-régulation au lieu d'utiliser les pre-programmés [#194](https://github.com/jmcollin78/versatile_thermostat/issues/194).
 > * **Release 4.0** : Ajout de la prise en charge de la **Versatile Thermostat UI Card**. Voir [Versatile Thermostat UI Card](https://github.com/jmcollin78/versatile-thermostat-ui-card). Ajout d'un mode de régulation **Slow** pour les appareils de chauffage à latence lente [#168](https://github.com/jmcollin78/versatile_thermostat/issues/168). Changement de la façon dont **la puissance est calculée** dans le cas de VTherm avec des équipements multi-sous-jacents [#146](https://github.com/jmcollin78/versatile_thermostat/issues/146). Ajout de la prise en charge de AC et Heat pour VTherm via un interrupteur également [#144](https://github.com/jmcollin78/versatile_thermostat/pull/144)
@@ -128,7 +127,7 @@ En conséquence toute la phase de paramètrage d'un VTherm a été profondemment
 **Note :** les copies d'écran de la configuration d'un VTherm n'ont pas été mises à jour.

 # Merci pour la bière [buymecoffee](https://www.buymeacoffee.com/jmcollin78)
-Un grand merci à @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG @Mexx62, @Someone, @Lajull, @giopeco pour les bières. Ca fait très plaisir et ça m'encourage à continuer !
+Un grand merci à @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG @Mexx62, @Someone, @Lajull pour les bières. Ca fait très plaisir et ça m'encourage à continuer !


 # Quand l'utiliser et ne pas l'utiliser
@@ -534,18 +533,9 @@ 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.

-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:
-...
-    safety_mode:
-        check_outdoor_sensor: false
-```
-Par défaut, le thermomètre extérieur peut déclencher une mise en sécurité si il n'envoit plus de valeur.
-
 Voir [exemple de réglages](#examples-tuning) pour avoir des exemples de réglage communs

-> ![Astuce](/images/tips.png?raw=true) _*Notes*_
+> ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
 > 1. Lorsque le capteur de température viendra à la vie et renverra les températures, le préréglage sera restauré à sa valeur précédente,
 > 2. Attention, deux températures sont nécessaires : la température interne et la température externe et chacune doit donner la température, sinon le thermostat sera en préréglage "security",
 > 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,
@@ -572,18 +562,12 @@ Depuis la release 5.3, vous avez la possibilité de contrôler une chaudière ce

 Le principe mis en place est globalement le suivant :
 1. une nouvelle entité de type `binary_sensor` et nommée par défaut `binary_sensor.central_boiler` est ajoutée,
-2. dans la configuration des VTherms vous indiquez si le VTherm doit contrôler la chaudière. En effet, dans une installation hétérogène, certains VTherm doivent commander la chaudière et d'autres non. Vous devez donc indiquer dans chaque configuration de VTherm si il contrôle la chaudière ou pas,
-3. le `binary_sensor.central_boiler` écoute les changements d'états des équipements des VTherm marqués comme contrôlant la chaudière,
-4. dès que le nombre d'équipements pilotés par le VTherm demandant du chauffage (ie son `hvac_action` passe à `Heating`) dépasse un seuil paramétrable, alors le `binary_sensor.central_boiler` passe à `on` et **si un service d'activation a été configuré, alors ce service est appelé**,
-5. si le nombre d'équipements nécessitant du chauffage repasse en dessous du seuil, alors le `binary_sensor.central_boiler` passe à `off` et si **un service de désactivation a été configuré, alors ce service est appelé**,
-6. vous avez accès à deux entités :
-   - une de type `number` nommé par défaut `number.boiler_activation_threshold`, donne le seuil de déclenchement. Ce seuil est en nombre d'équipements (radiateurs) qui demande du chauffage.
-   - une de type `sensor` nommé par défaut `sensor.nb_device_active_for_boiler`, donne le nombre d'équipements qui demande du chauffage. Par exemple, un VTherm ayant 4 vannes dont 3 demandes du chauffage fera passé ce capteur à 3. Seuls les équipements des VTherms qui sont marqués pour contrôler la chaudière centrale sont comptabilisés.
+2. dans la configuration des VTherms vous indiqué si le VTherm doit contrôler la chaudière. En effet, dans une installation hétérogène, certains VTherm doivent commander la chaudière et d'autres non. Vous devez donc indiqué dans chaque configuration de VTherm si il contrôle la chaudière ou pas,
+3. le `binary_sensor.central_boiler` écoute les changements d'états des VTherm marqués comme contrôlant la chaudière,
+4. si l'un des VTherm écoutés demande du chauffage (ie son `hvac_action` passe à `Heating`), alors le `binary_sensor.central_boiler` passe à `on` et si un service d'activation a été configuré, alors ce service est appelé,
+5. si plus aucun VTherm écoutés ne demande du chauffage (ie aucun `hvac_action` n'est `Heating`), alors le `binary_sensor.central_boiler` passe à `off` et si un service de désactivation a été configuré, alors ce service est appelé.

-Vous avez donc en permanence, les informations qui permettent de piloter et régler le déclenchement de la chaudière.
-
-Toutes ces entités sont rattachés au service de configuration centrale :
-![Les entités pilotant la chaudière](/images/entitites-central-boiler.png?raw=true)
+Vous avez donc en permanence, un indicateur qui donne l'info que au moins un des radiateurs est à besoin de chauffer.

 ### Configuration
 Pour configurer cette fonction, vous devez avoir une configuration centralisée (cf. [Configuration](#configuration)) et cochez la case 'Ajouter une chuadière centrale' :
@@ -1329,7 +1313,7 @@ Avec un VTherm de type `over_switch` ou `over_valve`, ce défaut montre juste qu
 ### Type `over_climate`
 Avec un VTherm de type `over_climate`, la régulation est faite par le `climate` sous-jacent directement et VTherm se contente de lui transmettre les consignes. Donc si le radiateur chauffe alors que la température de consigne est dépassée, c'est certainement que sa mesure de température interne est biaisée. Ca arrive très souvent avec les TRV et les clims réversibles qui ont un capteur de température interne, soit trop près de l'élément de chauffe (donc trop froid l'hiver).

-Exemple de discussion autour de ces sujets: [#348](https://github.com/jmcollin78/versatile_thermostat/issues/348), [#316](https://github.com/jmcollin78/versatile_thermostat/issues/316), [#312](https://github.com/jmcollin78/versatile_thermostat/discussions/312), [#278](https://github.com/jmcollin78/versatile_thermostat/discussions/278)
+Exemple de discussion autour de ces sujets: [#316](https://github.com/jmcollin78/versatile_thermostat/issues/316), [#312](https://github.com/jmcollin78/versatile_thermostat/discussions/312), [#278](https://github.com/jmcollin78/versatile_thermostat/discussions/278)

 Pour s'en sortir, VTherm est équipé d'une fonction nommée auto-régulation qui permet d'adapter la consigne envoyée au sous-jacent jusqu'à ce que la consigne soit respectée. Cette fonction permet de compenser le biais de mesure des thermomètres internes. Si le biais est important la régulation doit être importante. Voir [L'auto-régulation](#lauto-régulation) pour configurer l'auto-régulation.

--- a/README.md
+++ b/README.md
@@ -84,15 +84,14 @@
 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](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/new-icon.png?raw=true) _*News*_
-> * **Release 5.4**: Added a temperature step [#311](https://github.com/jmcollin78/versatile_thermostat/issues/311). Added some regulation thresholdfor `over_valve` VTherm in order to avoid drowing the battery of TRV devices [#338](https://github.com/jmcollin78/versatile_thermostat/issues/338).
-> * **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.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),
 > * **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).
+> * **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).
 <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).
 > * **Release 4.0**: Added the support of **Versatile Thermostat UI Card**. See [Versatile Thermostat UI Card](https://github.com/jmcollin78/versatile-thermostat-ui-card). Added a **Slow** regulation mode for slow latency heating devices [#168](https://github.com/jmcollin78/versatile_thermostat/issues/168). Change the way **the power is calculated** in case of VTherm with multi-underlying equipements [#146](https://github.com/jmcollin78/versatile_thermostat/issues/146). Added the support of AC and Heat for VTherm over switch alse [#144](https://github.com/jmcollin78/versatile_thermostat/pull/144)
@@ -128,7 +127,7 @@ Consequently, the entire configuration phase of a VTherm has been profoundly mod
 **Note:** the VTherm configuration screenshots have not been updated.

 # Thanks for the beer [buymecoffee](https://www.buymeacoffee.com/jmcollin78)
-Many thanks to @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG, @MattG, @Mexx62, @Someone, @Lajull, @giopeco for the beers. It's very nice and encourages me to continue!
+Many thanks to @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG, @MattG, @Mexx62, @Someone, @Lajull for the beers. It's very nice and encourages me to continue!

 # When to use / not use
 This thermostat can control 3 types of equipment:
@@ -520,15 +519,6 @@ 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.

-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:
-...
-     safety_mode:
-         check_outdoor_sensor: false
-```
-By default, the outdoor thermometer can trigger a trip if it no longer sends a value.
-
 See [example tuning](#examples-tuning) for common tuning examples

 >![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
@@ -559,17 +549,11 @@ Since release 5.3, you have the possibility of controlling a centralized boiler.
 The principle put in place is generally as follows:
 1. a new entity of type `binary_sensor` and named by default `binary_sensor.central_boiler` is added,
 2. in the VTherms configuration you indicate whether the VTherm should control the boiler. Indeed, in a heterogeneous installation, some VTherm must control the boiler and others not. You must therefore indicate in each VTherm configuration whether it controls the boiler or not,
-3. the `binary_sensor.central_boiler` listens for changes in state of VTherm equipment marked as controlling the boiler,
-4. as soon as the number of devices controlled by the VTherm requesting heating (ie its `hvac_action` goes to `Heating`) exceeds a configurable threshold, then the `binary_sensor.central_boiler` goes to `on` and **if a activation service has been configured, then this service is called**,
-5. if the number of devices requiring heating falls below the threshold again, then the `binary_sensor.central_boiler` goes to `off` and if **a deactivation service has been configured, then this service is called**,
-6. you have access to two entities:
-    - one of type `number` named by default `number.boiler_activation_threshold`, gives the trigger threshold. This threshold is in number of equipment (radiators) which requires heating.
-    - one of type `sensor` named by default `sensor.nb_device_active_for_boiler`, gives the number of devices requiring heating. For example, a VTherm having 4 valves including 3 heating requests will increase this sensor to 3. Only VTherm equipment that is marked to control the central boiler is counted.
+3. the `binary_sensor.central_boiler` listens for changes in state of the VTherms marked as controlling the boiler,
+4. if one of the listened VTherms requests heating (ie its `hvac_action` changes to `Heating`), then the `binary_sensor.central_boiler` changes to `on` and if an activation service has been configured, then this service is called,
+5. if no more listened VTherm requests heating (ie no `hvac_action` is `Heating`), then the `binary_sensor.central_boiler` goes to `off` and if a deactivation service has been configured, then this service is called.

-You therefore always have the information which allows you to control and adjust the activation of the boiler.
-
-All these entities are attached to the central configuration service:
-![The entities controlling the boiler](/images/entitites-central-boiler.png?raw=true)
+You therefore always have an indicator which gives information that at least one of the radiators needs to be heated.

 ### Setup
 To configure this function, you must have a centralized configuration (see [Configuration](#configuration)) and check the 'Add a central boiler' box:
@@ -1314,7 +1298,7 @@ With a VTherm of type `over_switch` or `over_valve`, this fault just shows that
 ### Type `over_climate`
 With an `over_climate` type VTherm, the regulation is done by the underlying `climate` directly and VTherm simply transmits the instructions to it. So if the radiator heats up when the set temperature is exceeded, it is certainly because its internal temperature measurement is biased. This happens very often with TRVs and reversible air conditioning units which have an internal temperature sensor, or too close to the heating element (therefore too cold in winter).

-Example of discussion around these topics: [#348](https://github.com/jmcollin78/versatile_thermostat/issues/348), [#316](https://github.com/jmcollin78/versatile_thermostat/issues/316), [#312](https://github.com/jmcollin78/versatile_thermostat/discussions/312 ), [#278](https://github.com/jmcollin78/versatile_thermostat/discussions/278)
+Example of discussion around these topics: [#316](https://github.com/jmcollin78/versatile_thermostat/issues/316), [#312](https://github.com/jmcollin78/versatile_thermostat/discussions/312 ), [#278](https://github.com/jmcollin78/versatile_thermostat/discussions/278)

 To get around this, VTherm is equipped with a function called self-regulation which allows the instruction sent to the underlying to be adapted until the target temperature is respected. This function compensates for the measurement bias of internal thermometers. If the bias is important the regulation must be important. See [Self-regulation](#self-regulation) to configure self-regulation.

--- a/9
+++ b/9
@@ -43,13 +43,4 @@ case $1 in
        pwd
        ./scripts/starts_ha.sh
    ;;
-    coverage)
-        rm -rf htmlcov/*
-        echo "Starting coverage tests"
-        coverage run -m pytest tests/
-        echo "Starting coverage report"
-        coverage report
-        echo "Starting coverage html"
-        coverage html
-    ;;
 esac
--- a/custom_components/versatile_thermostat/init.py
+++ b/custom_components/versatile_thermostat/init.py
@@ -24,7 +24,6 @@ from .const import (
    CONF_AUTO_REGULATION_SLOW,
    CONF_AUTO_REGULATION_EXPERT,
    CONF_SHORT_EMA_PARAMS,
-    CONF_SAFETY_MODE,
    CONF_THERMOSTAT_CENTRAL_CONFIG,
    CONF_THERMOSTAT_TYPE,
 )
@@ -48,17 +47,12 @@ EMA_PARAM_SCHEMA = {
    vol.Required("precision"): cv.positive_int,
 }

-SAFETY_MODE_PARAM_SCHEMA = {
-    vol.Required("check_outdoor_sensor"): bool,
-}
-
 CONFIG_SCHEMA = vol.Schema(
    {
        DOMAIN: vol.Schema(
            {
                CONF_AUTO_REGULATION_EXPERT: vol.Schema(SELF_REGULATION_PARAM_SCHEMA),
                CONF_SHORT_EMA_PARAMS: vol.Schema(EMA_PARAM_SCHEMA),
-                CONF_SAFETY_MODE: vol.Schema(SAFETY_MODE_PARAM_SCHEMA),
            }
        ),
    },
@@ -133,8 +127,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

-    await api.reload_central_boiler_entities_list()
-
    return True


--- a/custom_components/versatile_thermostat/base_thermostat.py
+++ b/custom_components/versatile_thermostat/base_thermostat.py
@@ -145,6 +145,20 @@ def get_tz(hass: HomeAssistant):
 class BaseThermostat(ClimateEntity, RestoreEntity):
    """Representation of a base class for all Versatile Thermostat device."""

+    # The list of VersatileThermostat entities
+    _hass: HomeAssistant
+    _last_temperature_measure: datetime
+    _last_ext_temperature_measure: datetime
+    _total_energy: float
+    _overpowering_state: bool
+    _window_state: bool
+    _motion_state: bool
+    _presence_state: bool
+    _window_auto_state: bool
+    _window_bypass_state: bool
+    _underlyings: list[UnderlyingEntity]
+    _last_change_time: datetime
+
    _entity_component_unrecorded_attributes = (
        ClimateEntity._entity_component_unrecorded_attributes.union(
            frozenset(
@@ -183,7 +197,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
                    "window_auto_open_threshold",
                    "window_auto_close_threshold",
                    "window_auto_max_duration",
-                    "window_action",
                    "motion_sensor_entity_id",
                    "presence_sensor_entity_id",
                    "power_sensor_entity_id",
@@ -255,8 +268,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        self._window_auto_state = False
        self._window_auto_on = False
        self._window_auto_algo = None
+        # PR - Adding Window ByPass
        self._window_bypass_state = False
-        self._window_action = None

        self._current_tz = dt_util.get_time_zone(self._hass.config.time_zone)

@@ -273,7 +286,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        self._is_central_mode = None
        self._last_central_mode = None
        self._is_used_by_central_boiler = False
-
        self.post_init(entry_infos)

    def clean_central_config_doublon(self, config_entry, central_config) -> dict:
@@ -341,8 +353,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        self._ac_mode = entry_infos.get(CONF_AC_MODE) is True
        self._attr_max_temp = entry_infos.get(CONF_TEMP_MAX)
        self._attr_min_temp = entry_infos.get(CONF_TEMP_MIN)
-        if (step := entry_infos.get(CONF_STEP_TEMPERATURE)) is not None:
-            self._attr_target_temperature_step = step

        # convert entry_infos into usable attributes
        presets = {}
@@ -388,6 +398,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        self._proportional_function = entry_infos.get(CONF_PROP_FUNCTION)
        self._temp_sensor_entity_id = entry_infos.get(CONF_TEMP_SENSOR)
        self._ext_temp_sensor_entity_id = entry_infos.get(CONF_EXTERNAL_TEMP_SENSOR)
+        # Default value not configurable
+        self._attr_target_temperature_step = 0.1
        self._power_sensor_entity_id = entry_infos.get(CONF_POWER_SENSOR)
        self._max_power_sensor_entity_id = entry_infos.get(CONF_MAX_POWER_SENSOR)
        self._window_sensor_entity_id = entry_infos.get(CONF_WINDOW_SENSOR)
@@ -463,7 +475,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        self._saved_preset_mode = PRESET_NONE

        # Power management
-        self._device_power = entry_infos.get(CONF_DEVICE_POWER) or 0
+        self._device_power = entry_infos.get(CONF_DEVICE_POWER)
        self._pmax_on = False
        self._current_power = None
        self._current_power_max = None
@@ -564,10 +576,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            entry_infos.get(CONF_USED_BY_CENTRAL_BOILER) is True
        )

-        self._window_action = (
-            entry_infos.get(CONF_WINDOW_ACTION) or CONF_WINDOW_TURN_OFF
-        )
-
        _LOGGER.debug(
            "%s - Creation of a new VersatileThermostat entity: unique_id=%s",
            self,
@@ -1084,11 +1092,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        """Get the Window Bypass"""
        return self._window_bypass_state

-    @property
-    def window_action(self) -> bool | None:
-        """Get the Window Action"""
-        return self._window_action
-
    @property
    def security_state(self) -> bool | None:
        """Get the security_state"""
@@ -1152,11 +1155,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        """Returns the number of underlying entities"""
        return len(self._underlyings)

-    @property
-    def underlying_entities(self) -> int:
-        """Returns the underlying entities"""
-        return self._underlyings
-
    @property
    def is_on(self) -> bool:
        """True if the VTherm is on (! HVAC_OFF)"""
@@ -1483,14 +1481,29 @@ class BaseThermostat(ClimateEntity, RestoreEntity):

            self._window_state = new_state.state == STATE_ON

+            # PR - Adding Window ByPass
            _LOGGER.debug("%s - Window ByPass is : %s", self, self._window_bypass_state)
            if self._window_bypass_state:
                _LOGGER.info(
                    "%s - Window ByPass is activated. Ignore window event", self
                )
            else:
-                await self.change_window_detection_state(self._window_state)
+                if not self._window_state:
+                    _LOGGER.info(
+                        "%s - Window is closed. Restoring hvac_mode '%s' if central_mode is not STOPPED",
+                        self,
+                        self._saved_hvac_mode,
+                    )
+                    if self.last_central_mode != CENTRAL_MODE_STOPPED:
+                        await self.restore_hvac_mode(True)
+                elif self._window_state:
+                    _LOGGER.info(
+                        "%s - Window is open. Set hvac_mode to '%s'", self, HVACMode.OFF
+                    )
+                    if self.last_central_mode in [CENTRAL_MODE_AUTO, None]:
+                        self.save_hvac_mode()

+                    await self.async_set_hvac_mode(HVACMode.OFF)
            self.update_custom_attributes()

        if new_state is None or old_state is None or new_state.state == old_state.state:
@@ -1619,9 +1632,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        for under in self._underlyings:
            await under.check_initial_state(self._hvac_mode)

-        # Starts the initial control loop (don't wait for an update of temperature)
-        await self.async_control_heating(force=True)
-
    @callback
    async def _async_update_temp(self, state: State):
        """Update thermostat with latest state from sensor."""
@@ -1647,7 +1657,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):

            # try to restart if we were in safety mode
            if self._security_state:
-                await self.check_safety()
+                await self.check_security()

            # check window_auto
            return await self._async_manage_window_auto()
@@ -1674,7 +1684,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):

            # try to restart if we were in safety mode
            if self._security_state:
-                await self.check_safety()
+                await self.check_security()
        except ValueError as ex:
            _LOGGER.error("Unable to update external temperature from sensor: %s", ex)

@@ -1831,8 +1841,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            )
            # Set attributes
            self._window_auto_state = False
-            await self.change_window_detection_state(self._window_auto_state)
-            # await self.restore_hvac_mode(True)
+            await self.restore_hvac_mode(True)

            if self._window_call_cancel:
                self._window_call_cancel()
@@ -1892,9 +1901,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            )
            # Set attributes
            self._window_auto_state = True
-            await self.change_window_detection_state(self._window_auto_state)
-            # self.save_hvac_mode()
-            # await self.async_set_hvac_mode(HVACMode.OFF)
+            self.save_hvac_mode()
+            await self.async_set_hvac_mode(HVACMode.OFF)

            # Arm the end trigger
            if self._window_call_cancel:
@@ -2114,7 +2122,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        """Get now. The local datetime or the overloaded _set_now date"""
        return self._now if self._now is not None else datetime.now(self._current_tz)

-    async def check_safety(self) -> bool:
+    async def check_security(self) -> bool:
        """Check if last temperature date is too long"""
        now = self.now
        delta_temp = (
@@ -2126,14 +2134,9 @@ class BaseThermostat(ClimateEntity, RestoreEntity):

        mode_cond = self._hvac_mode != HVACMode.OFF

-        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api()
-        is_outdoor_checked = (
-            not api.safety_mode
-            or api.safety_mode.get("check_outdoor_sensor") is not False
-        )
-
-        temp_cond: bool = delta_temp > self._security_delay_min or (
-            is_outdoor_checked and delta_ext_temp > self._security_delay_min
+        temp_cond: bool = (
+            delta_temp > self._security_delay_min
+            or delta_ext_temp > self._security_delay_min
        )
        climate_cond: bool = self.is_over_climate and self.hvac_action not in [
            HVACAction.COOLING,
@@ -2277,63 +2280,6 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        should have found the underlying climate to be operational"""
        return True

-    async def change_window_detection_state(self, new_state):
-        """Change the window detection state.
-        new_state is on if an open window have been detected or off else
-        """
-        if not new_state:
-            _LOGGER.info(
-                "%s - Window is closed. Restoring hvac_mode '%s' if central_mode is not STOPPED",
-                self,
-                self._saved_hvac_mode,
-            )
-            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]:
-                if self.last_central_mode != CENTRAL_MODE_STOPPED:
-                    await self.restore_hvac_mode(True)
-            else:
-                _LOGGER.error(
-                    "%s - undefined window_action %s. Please open a bug in the github of this project with this log",
-                    self,
-                    self._window_action,
-                )
-        else:
-            _LOGGER.info(
-                "%s - Window is open. Set hvac_mode to '%s'", self, HVACMode.OFF
-            )
-            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()
-                elif self._window_action in [
-                    CONF_WINDOW_FROST_TEMP,
-                    CONF_WINDOW_ECO_TEMP,
-                ]:
-                    self._saved_target_temp = self._target_temp
-
-            if (
-                self._window_action == CONF_WINDOW_FAN_ONLY
-                and HVACMode.FAN_ONLY in self.hvac_modes
-            ):
-                await self.async_set_hvac_mode(HVACMode.FAN_ONLY)
-            elif (
-                self._window_action == CONF_WINDOW_FROST_TEMP
-                and self._presets.get(PRESET_FROST_PROTECTION) is not None
-            ):
-                await self._async_internal_set_temperature(
-                    self.find_preset_temp(PRESET_FROST_PROTECTION)
-                )
-            elif (
-                self._window_action == CONF_WINDOW_ECO_TEMP
-                and self._presets.get(PRESET_ECO) is not None
-            ):
-                await self._async_internal_set_temperature(
-                    self.find_preset_temp(PRESET_ECO)
-                )
-            else:  # default is to turn_off
-                await self.async_set_hvac_mode(HVACMode.OFF)
-
    async def async_control_heating(self, force=False, _=None):
        """The main function used to run the calculation at each cycle"""

@@ -2361,7 +2307,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            _LOGGER.debug("%s - End of cycle (overpowering)", self)
            return True

-        security: bool = await self.check_safety()
+        security: bool = await self.check_security()
        if security and self.is_over_climate:
            _LOGGER.debug("%s - End of cycle (security and over climate)", self)
            return True
@@ -2427,6 +2373,8 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
                self.get_preset_away_name(PRESET_COMFORT)
            ),
            "power_temp": self._power_temp,
+            # Already in super class - "target_temp": self.target_temperature,
+            # Already in super class - "current_temp": self._cur_temp,
            "target_temperature_step": self.target_temperature_step,
            "ext_current_temperature": self._cur_ext_temp,
            "ac_mode": self._ac_mode,
@@ -2435,23 +2383,12 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            "saved_preset_mode": self._saved_preset_mode,
            "saved_target_temp": self._saved_target_temp,
            "saved_hvac_mode": self._saved_hvac_mode,
-            "motion_sensor_entity_id": self._motion_sensor_entity_id,
-            "motion_state": self._motion_state,
-            "power_sensor_entity_id": self._power_sensor_entity_id,
-            "max_power_sensor_entity_id": self._max_power_sensor_entity_id,
-            "overpowering_state": self.overpowering_state,
-            "presence_sensor_entity_id": self._presence_sensor_entity_id,
-            "presence_state": self._presence_state,
            "window_state": self.window_state,
+            "motion_state": self._motion_state,
+            "overpowering_state": self.overpowering_state,
+            "presence_state": self._presence_state,
            "window_auto_state": self.window_auto_state,
            "window_bypass_state": self._window_bypass_state,
-            "window_sensor_entity_id": self._window_sensor_entity_id,
-            "window_delay_sec": self._window_delay_sec,
-            "window_auto_enabled": self.is_window_auto_enabled,
-            "window_auto_open_threshold": self._window_auto_open_threshold,
-            "window_auto_close_threshold": self._window_auto_close_threshold,
-            "window_auto_max_duration": self._window_auto_max_duration,
-            "window_action": self.window_action,
            "security_delay_min": self._security_delay_min,
            "security_min_on_percent": self._security_min_on_percent,
            "security_default_on_percent": self._security_default_on_percent,
@@ -2470,6 +2407,16 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            .astimezone(self._current_tz)
            .isoformat(),
            "timezone": str(self._current_tz),
+            "window_sensor_entity_id": self._window_sensor_entity_id,
+            "window_delay_sec": self._window_delay_sec,
+            "window_auto_enabled": self.is_window_auto_enabled,
+            "window_auto_open_threshold": self._window_auto_open_threshold,
+            "window_auto_close_threshold": self._window_auto_close_threshold,
+            "window_auto_max_duration": self._window_auto_max_duration,
+            "motion_sensor_entity_id": self._motion_sensor_entity_id,
+            "presence_sensor_entity_id": self._presence_sensor_entity_id,
+            "power_sensor_entity_id": self._power_sensor_entity_id,
+            "max_power_sensor_entity_id": self._max_power_sensor_entity_id,
            "temperature_unit": self.temperature_unit,
            "is_device_active": self.is_device_active,
            "ema_temp": self._ema_temp,
--- a/custom_components/versatile_thermostat/binary_sensor.py
+++ b/custom_components/versatile_thermostat/binary_sensor.py
@@ -1,5 +1,5 @@
 """ Implements the VersatileThermostat binary sensors component """
-# pylint: disable=unused-argument, line-too-long
+# pylint: disable=unused-argument

 import logging

@@ -14,6 +14,7 @@ from homeassistant.core import (
 from homeassistant.const import STATE_ON, STATE_OFF, EVENT_HOMEASSISTANT_START

 from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
+from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_change_event

 from homeassistant.components.binary_sensor import (
@@ -24,6 +25,14 @@ from homeassistant.config_entries import ConfigEntry

 from homeassistant.helpers.entity_platform import AddEntitiesCallback

+from homeassistant.components.climate import (
+    ClimateEntity,
+    HVACMode,
+    HVACAction,
+    DOMAIN as CLIMATE_DOMAIN,
+)
+
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
 from .vtherm_api import VersatileThermostatAPI
 from .commons import (
    VersatileThermostatBaseEntity,
@@ -383,13 +392,14 @@ class CentralBoilerBinarySensor(BinarySensorEntity):
    async def async_added_to_hass(self) -> None:
        await super().async_added_to_hass()

-        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(self._hass)
-        api.register_central_boiler(self)
-
        @callback
        async def _async_startup_internal(*_):
            _LOGGER.debug("%s - Calling async_startup_internal", self)
-            await self.listen_nb_active_vtherm_entity()
+            api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(
+                self._hass
+            )
+            api.register_central_boiler(self)
+            await self.listen_vtherms_entities()

        if self.hass.state == CoreState.running:
            await _async_startup_internal()
@@ -398,28 +408,29 @@ class CentralBoilerBinarySensor(BinarySensorEntity):
                EVENT_HOMEASSISTANT_START, _async_startup_internal
            )

-    async def listen_nb_active_vtherm_entity(self):
+    async def listen_vtherms_entities(self):
        """Initialize the listening of state change of VTherms"""

        # Listen to all VTherm state change
-        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(self._hass)
+        self._entities = []
+        entities_id = []

-        if (
-            api.nb_active_device_for_boiler_entity
-            and api.nb_active_device_for_boiler_threshold_entity
-        ):
+        component: EntityComponent[ClimateEntity] = self.hass.data[CLIMATE_DOMAIN]
+        for entity in component.entities:
+            if isinstance(entity, BaseThermostat) and entity.is_used_by_central_boiler:
+                self._entities.append(entity)
+                entities_id.append(entity.entity_id)
+        if len(self._entities) > 0:
+            # Arme l'écoute de la première entité
            listener_cancel = async_track_state_change_event(
                self._hass,
-                [
-                    api.nb_active_device_for_boiler_entity.entity_id,
-                    api.nb_active_device_for_boiler_threshold_entity.entity_id,
-                ],
+                entities_id,
                self.calculate_central_boiler_state,
            )
-            _LOGGER.debug(
-                "%s - entity to get the nb of active VTherm is %s",
+            _LOGGER.info(
+                "%s - VTherm that could controls the central boiler are %s",
                self,
-                api.nb_active_device_for_boiler_entity.entity_id,
+                entities_id,
            )
            self.async_on_remove(listener_cancel)
        else:
@@ -432,20 +443,18 @@ class CentralBoilerBinarySensor(BinarySensorEntity):
        controls this central boiler"""

        _LOGGER.debug("%s - calculating the new central boiler state", self)
-        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(self._hass)
-        if (
-            api.nb_active_device_for_boiler is None
-            or api.nb_active_device_for_boiler_threshold is None
-        ):
-            _LOGGER.warning(
-                "%s - the entities to calculate the boiler state are not initialized. Boiler state cannot be calculated",
-                self,
+        active = False
+        for entity in self._entities:
+            _LOGGER.debug(
+                "Examining the hvac_action of %s",
+                entity.name,
            )
-            return False
-
-        active = (
-            api.nb_active_device_for_boiler >= api.nb_active_device_for_boiler_threshold
-        )
+            if (
+                entity.hvac_mode == HVACMode.HEAT
+                and entity.hvac_action == HVACAction.HEATING
+            ):
+                active = True
+                break

        if self._attr_is_on != active:
            try:
--- a/custom_components/versatile_thermostat/config_schema.py
+++ b/custom_components/versatile_thermostat/config_schema.py
@@ -28,9 +28,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
            CONF_THERMOSTAT_TYPE, default=CONF_THERMOSTAT_SWITCH
        ): selector.SelectSelector(
            selector.SelectSelectorConfig(
-                options=CONF_THERMOSTAT_TYPES,
-                translation_key="thermostat_type",
-                mode="list",
+                options=CONF_THERMOSTAT_TYPES, translation_key="thermostat_type"
            )
        )
    }
@@ -61,7 +59,6 @@ STEP_CENTRAL_MAIN_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
        ),
        vol.Required(CONF_TEMP_MIN, default=7): vol.Coerce(float),
        vol.Required(CONF_TEMP_MAX, default=35): vol.Coerce(float),
-        vol.Required(CONF_STEP_TEMPERATURE, default=0.1): vol.Coerce(float),
        vol.Required(CONF_ADD_CENTRAL_BOILER_CONTROL, default=False): cv.boolean,
    }
 )
@@ -73,7 +70,6 @@ STEP_CENTRAL_SPEC_MAIN_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
        ),
        vol.Required(CONF_TEMP_MIN, default=7): vol.Coerce(float),
        vol.Required(CONF_TEMP_MAX, default=35): vol.Coerce(float),
-        vol.Required(CONF_STEP_TEMPERATURE, default=0.1): vol.Coerce(float),
    }
 )

@@ -129,7 +125,6 @@ STEP_THERMOSTAT_CLIMATE = vol.Schema(  # pylint: disable=invalid-name
            selector.SelectSelectorConfig(
                options=CONF_AUTO_REGULATION_MODES,
                translation_key="auto_regulation_mode",
-                mode="dropdown",
            )
        ),
        vol.Optional(CONF_AUTO_REGULATION_DTEMP, default=0.5): vol.Coerce(float),
@@ -140,7 +135,6 @@ STEP_THERMOSTAT_CLIMATE = vol.Schema(  # pylint: disable=invalid-name
            selector.SelectSelectorConfig(
                options=CONF_AUTO_FAN_MODES,
                translation_key="auto_fan_mode",
-                mode="dropdown",
            )
        ),
    }
@@ -166,8 +160,6 @@ STEP_THERMOSTAT_VALVE = vol.Schema(  # pylint: disable=invalid-name
            ]
        ),
        vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
-        vol.Optional(CONF_AUTO_REGULATION_DTEMP, default=0.5): vol.Coerce(float),
-        vol.Optional(CONF_AUTO_REGULATION_PERIOD_MIN, default=5): cv.positive_int,
    }
 )

@@ -220,30 +212,12 @@ STEP_CENTRAL_WINDOW_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
        vol.Optional(CONF_WINDOW_AUTO_OPEN_THRESHOLD, default=3): vol.Coerce(float),
        vol.Optional(CONF_WINDOW_AUTO_CLOSE_THRESHOLD, default=0): vol.Coerce(float),
        vol.Optional(CONF_WINDOW_AUTO_MAX_DURATION, default=30): cv.positive_int,
-        vol.Optional(
-            CONF_WINDOW_ACTION, default=CONF_WINDOW_TURN_OFF
-        ): selector.SelectSelector(
-            selector.SelectSelectorConfig(
-                options=CONF_WINDOW_ACTIONS,
-                translation_key="window_action",
-                mode="dropdown",
-            )
-        ),
    }
 )

 STEP_CENTRAL_WINDOW_WO_AUTO_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
    {
        vol.Optional(CONF_WINDOW_DELAY, default=30): cv.positive_int,
-        vol.Optional(
-            CONF_WINDOW_ACTION, default=CONF_WINDOW_TURN_OFF
-        ): selector.SelectSelector(
-            selector.SelectSelectorConfig(
-                options=CONF_WINDOW_ACTIONS,
-                translation_key="window_action",
-                mode="dropdown",
-            )
-        ),
    }
 )

@@ -262,19 +236,11 @@ STEP_CENTRAL_MOTION_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
    {
        vol.Optional(CONF_MOTION_DELAY, default=30): cv.positive_int,
        vol.Optional(CONF_MOTION_OFF_DELAY, default=300): cv.positive_int,
-        vol.Optional(CONF_MOTION_PRESET, default="comfort"): selector.SelectSelector(
-            selector.SelectSelectorConfig(
-                options=CONF_PRESETS_SELECTIONABLE,
-                translation_key="presets",
-                mode="dropdown",
-            )
+        vol.Optional(CONF_MOTION_PRESET, default="comfort"): vol.In(
+            CONF_PRESETS_SELECTIONABLE
        ),
-        vol.Optional(CONF_NO_MOTION_PRESET, default="eco"): selector.SelectSelector(
-            selector.SelectSelectorConfig(
-                options=CONF_PRESETS_SELECTIONABLE,
-                translation_key="presets",
-                mode="dropdown",
-            )
+        vol.Optional(CONF_NO_MOTION_PRESET, default="eco"): vol.In(
+            CONF_PRESETS_SELECTIONABLE
        ),
    }
 )
--- a/custom_components/versatile_thermostat/const.py
+++ b/custom_components/versatile_thermostat/const.py
@@ -40,11 +40,10 @@ HIDDEN_PRESETS = [PRESET_POWER, PRESET_SECURITY]
 DOMAIN = "versatile_thermostat"

 PLATFORMS: list[Platform] = [
-    Platform.NUMBER,
-    Platform.SELECT,
    Platform.CLIMATE,
-    Platform.SENSOR,
    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+    Platform.SELECT,
 ]

 CONF_HEATER = "heater_entity_id"
@@ -106,17 +105,13 @@ CONF_AUTO_REGULATION_EXPERT = "auto_regulation_expert"
 CONF_AUTO_REGULATION_DTEMP = "auto_regulation_dtemp"
 CONF_AUTO_REGULATION_PERIOD_MIN = "auto_regulation_periode_min"
 CONF_INVERSE_SWITCH = "inverse_switch_command"
+CONF_SHORT_EMA_PARAMS = "short_ema_params"
 CONF_AUTO_FAN_MODE = "auto_fan_mode"
 CONF_AUTO_FAN_NONE = "auto_fan_none"
 CONF_AUTO_FAN_LOW = "auto_fan_low"
 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"
-
-# Global params into configuration.yaml
-CONF_SHORT_EMA_PARAMS = "short_ema_params"
-CONF_SAFETY_MODE = "safety_mode"

 CONF_USE_MAIN_CENTRAL_CONFIG = "use_main_central_config"
 CONF_USE_TPI_CENTRAL_CONFIG = "use_tpi_central_config"
@@ -134,7 +129,6 @@ CONF_CENTRAL_BOILER_ACTIVATION_SRV = "central_boiler_activation_service"
 CONF_CENTRAL_BOILER_DEACTIVATION_SRV = "central_boiler_deactivation_service"

 CONF_USED_BY_CENTRAL_BOILER = "used_by_controls_central_boiler"
-CONF_WINDOW_ACTION = "window_action"

 DEFAULT_SHORT_EMA_PARAMS = {
    "max_alpha": 0.5,
@@ -270,8 +264,6 @@ ALL_CONF = (
        CONF_USED_BY_CENTRAL_BOILER,
        CONF_CENTRAL_BOILER_ACTIVATION_SRV,
        CONF_CENTRAL_BOILER_DEACTIVATION_SRV,
-        CONF_WINDOW_ACTION,
-        CONF_STEP_TEMPERATURE,
    ]
    + CONF_PRESETS_VALUES
    + CONF_PRESETS_AWAY_VALUES
@@ -307,18 +299,6 @@ CONF_AUTO_FAN_MODES = [
    CONF_AUTO_FAN_TURBO,
 ]

-CONF_WINDOW_TURN_OFF = "window_turn_off"
-CONF_WINDOW_FAN_ONLY = "window_fan_only"
-CONF_WINDOW_FROST_TEMP = "window_frost_temp"
-CONF_WINDOW_ECO_TEMP = "window_eco_temp"
-
-CONF_WINDOW_ACTIONS = [
-    CONF_WINDOW_TURN_OFF,
-    CONF_WINDOW_FAN_ONLY,
-    CONF_WINDOW_FROST_TEMP,
-    CONF_WINDOW_ECO_TEMP,
-]
-
 SUPPORT_FLAGS = ClimateEntityFeature.TARGET_TEMPERATURE

 SERVICE_SET_PRESENCE = "set_presence"
--- a/custom_components/versatile_thermostat/manifest.json
+++ b/custom_components/versatile_thermostat/manifest.json
@@ -14,6 +14,6 @@
  "quality_scale": "silver",
  "requirements": [],
  "ssdp": [],
-  "version": "5.4.0",
+  "version": "5.3.0",
  "zeroconf": []
 }
--- a/custom_components/versatile_thermostat/number.py
+++ b/custom_components/versatile_thermostat/number.py
@@ -1,117 +0,0 @@
-# pylint: disable=unused-argument
-
-""" Implements the VersatileThermostat select component """
-import logging
-
-# from homeassistant.const import EVENT_HOMEASSISTANT_START
-from homeassistant.core import HomeAssistant, CoreState  # , callback
-
-from homeassistant.components.number import NumberEntity, NumberMode
-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 custom_components.versatile_thermostat.vtherm_api import VersatileThermostatAPI
-from .const import (
-    DOMAIN,
-    DEVICE_MANUFACTURER,
-    CONF_NAME,
-    CONF_THERMOSTAT_TYPE,
-    CONF_THERMOSTAT_CENTRAL_CONFIG,
-    CONF_ADD_CENTRAL_BOILER_CONTROL,
-    overrides,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the VersatileThermostat selects 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)
-    is_central_boiler = entry.data.get(CONF_ADD_CENTRAL_BOILER_CONTROL)
-
-    if vt_type != CONF_THERMOSTAT_CENTRAL_CONFIG or not is_central_boiler:
-        return
-
-    entities = [
-        ActivateBoilerThresholdNumber(hass, unique_id, name, entry.data),
-    ]
-
-    async_add_entities(entities, True)
-
-
-class ActivateBoilerThresholdNumber(NumberEntity, RestoreEntity):
-    """Representation of the threshold of the number of VTherm
-    which should be active to activate the boiler"""
-
-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
-        """Initialize the energy sensor"""
-        self._hass = hass
-        self._config_id = unique_id
-        self._device_name = entry_infos.get(CONF_NAME)
-        self._attr_name = "Boiler Activation threshold"
-        self._attr_unique_id = "boiler_activation_threshold"
-        self._attr_value = self._attr_native_value = 1  # default value
-        self._attr_native_min_value = 1
-        self._attr_native_max_value = 9
-        self._attr_step = 1  # default value
-        self._attr_mode = NumberMode.AUTO
-
-    @property
-    def icon(self) -> str | None:
-        if isinstance(self._attr_native_value, int):
-            val = int(self._attr_native_value)
-            return f"mdi:numeric-{val}-box-outline"
-        else:
-            return "mdi:numeric-0-box-outline"
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return the device info."""
-        return DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, self._config_id)},
-            name=self._device_name,
-            manufacturer=DEVICE_MANUFACTURER,
-            model=DOMAIN,
-        )
-
-    @overrides
-    async def async_added_to_hass(self) -> None:
-        await super().async_added_to_hass()
-
-        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(self._hass)
-        api.register_central_boiler_activation_number_threshold(self)
-
-        old_state: CoreState = await self.async_get_last_state()
-        _LOGGER.debug(
-            "%s - Calling async_added_to_hass old_state is %s", self, old_state
-        )
-        if old_state is not None:
-            self._attr_value = self._attr_native_value = int(float(old_state.state))
-
-    @overrides
-    def set_native_value(self, value: float) -> None:
-        """Change the value"""
-        int_value = int(value)
-        old_value = int(self._attr_native_value)
-
-        if int_value == old_value:
-            return
-
-        self._attr_value = self._attr_native_value = int_value
-
-    def __str__(self):
-        return f"VersatileThermostat-{self.name}"
--- a/custom_components/versatile_thermostat/select.py
+++ b/custom_components/versatile_thermostat/select.py
@@ -55,7 +55,7 @@ async def async_setup_entry(


 class CentralModeSelect(SelectEntity, RestoreEntity):
-    """Representation of the central mode choice"""
+    """Representation of a Energy sensor which exposes the energy"""

    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
        """Initialize the energy sensor"""
--- a/custom_components/versatile_thermostat/sensor.py
+++ b/custom_components/versatile_thermostat/sensor.py
@@ -3,15 +3,9 @@
 import logging
 import math

-from homeassistant.core import HomeAssistant, callback, Event, CoreState
+from homeassistant.core import HomeAssistant, callback, Event

-from homeassistant.const import (
-    UnitOfTime,
-    UnitOfPower,
-    UnitOfEnergy,
-    PERCENTAGE,
-    EVENT_HOMEASSISTANT_START,
-)
+from homeassistant.const import UnitOfTime, UnitOfPower, UnitOfEnergy, PERCENTAGE

 from homeassistant.components.sensor import (
    SensorEntity,
@@ -22,24 +16,9 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry

 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
-from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.event import async_track_state_change_event

-from homeassistant.components.climate import (
-    ClimateEntity,
-    DOMAIN as CLIMATE_DOMAIN,
-    HVACAction,
-    HVACMode,
-)
-
-
-from .base_thermostat import BaseThermostat
-from .vtherm_api import VersatileThermostatAPI
 from .commons import VersatileThermostatBaseEntity
 from .const import (
-    DOMAIN,
-    DEVICE_MANUFACTURER,
    CONF_NAME,
    CONF_DEVICE_POWER,
    CONF_PROP_FUNCTION,
@@ -49,8 +28,6 @@ from .const import (
    CONF_THERMOSTAT_CLIMATE,
    CONF_THERMOSTAT_TYPE,
    CONF_THERMOSTAT_CENTRAL_CONFIG,
-    CONF_ADD_CENTRAL_BOILER_CONTROL,
-    overrides,
 )

 THRESHOLD_WATT_KILO = 100
@@ -72,43 +49,35 @@ async def async_setup_entry(
    name = entry.data.get(CONF_NAME)
    vt_type = entry.data.get(CONF_THERMOSTAT_TYPE)

-    entities = None
-
    if vt_type == CONF_THERMOSTAT_CENTRAL_CONFIG:
-        if entry.data.get(CONF_ADD_CENTRAL_BOILER_CONTROL):
-            entities = [
-                NbActiveDeviceForBoilerSensor(hass, unique_id, name, entry.data)
-            ]
-            async_add_entities(entities, True)
-    else:
-        entities = [
-            LastTemperatureSensor(hass, unique_id, name, entry.data),
-            LastExtTemperatureSensor(hass, unique_id, name, entry.data),
-            TemperatureSlopeSensor(hass, unique_id, name, entry.data),
-            EMATemperatureSensor(hass, unique_id, name, entry.data),
-        ]
-        if entry.data.get(CONF_DEVICE_POWER):
-            entities.append(EnergySensor(hass, unique_id, name, entry.data))
-            if entry.data.get(CONF_THERMOSTAT_TYPE) in [
-                CONF_THERMOSTAT_SWITCH,
-                CONF_THERMOSTAT_VALVE,
-            ]:
-                entities.append(MeanPowerSensor(hass, unique_id, name, entry.data))
+        return

-        if entry.data.get(CONF_PROP_FUNCTION) == PROPORTIONAL_FUNCTION_TPI:
-            entities.append(OnPercentSensor(hass, unique_id, name, entry.data))
-            entities.append(OnTimeSensor(hass, unique_id, name, entry.data))
-            entities.append(OffTimeSensor(hass, unique_id, name, entry.data))
+    entities = [
+        LastTemperatureSensor(hass, unique_id, name, entry.data),
+        LastExtTemperatureSensor(hass, unique_id, name, entry.data),
+        TemperatureSlopeSensor(hass, unique_id, name, entry.data),
+        EMATemperatureSensor(hass, unique_id, name, entry.data),
+    ]
+    if entry.data.get(CONF_DEVICE_POWER):
+        entities.append(EnergySensor(hass, unique_id, name, entry.data))
+        if entry.data.get(CONF_THERMOSTAT_TYPE) in [
+            CONF_THERMOSTAT_SWITCH,
+            CONF_THERMOSTAT_VALVE,
+        ]:
+            entities.append(MeanPowerSensor(hass, unique_id, name, entry.data))

-        if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE:
-            entities.append(ValveOpenPercentSensor(hass, unique_id, name, entry.data))
+    if entry.data.get(CONF_PROP_FUNCTION) == PROPORTIONAL_FUNCTION_TPI:
+        entities.append(OnPercentSensor(hass, unique_id, name, entry.data))
+        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_CLIMATE:
-            entities.append(
-                RegulatedTemperatureSensor(hass, unique_id, name, entry.data)
-            )
+    if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE:
+        entities.append(ValveOpenPercentSensor(hass, unique_id, name, entry.data))

-        async_add_entities(entities, True)
+    if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_CLIMATE:
+        entities.append(RegulatedTemperatureSensor(hass, unique_id, name, entry.data))
+
+    async_add_entities(entities, True)


 class EnergySensor(VersatileThermostatBaseEntity, SensorEntity):
@@ -628,116 +597,3 @@ class EMATemperatureSensor(VersatileThermostatBaseEntity, SensorEntity):
    def suggested_display_precision(self) -> int | None:
        """Return the suggested number of decimal digits for display."""
        return 2
-
-
-class NbActiveDeviceForBoilerSensor(SensorEntity):
-    """Representation of the threshold of the number of VTherm
-    which should be active to activate the boiler"""
-
-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
-        """Initialize the energy sensor"""
-        self._hass = hass
-        self._config_id = unique_id
-        self._device_name = entry_infos.get(CONF_NAME)
-        self._attr_name = "Nb device active for boiler"
-        self._attr_unique_id = "nb_device_active_boiler"
-        self._attr_value = self._attr_native_value = None  # default value
-        self._entities = []
-
-    @property
-    def icon(self) -> str | None:
-        return "mdi:heat-wave"
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return the device info."""
-        return DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, self._config_id)},
-            name=self._device_name,
-            manufacturer=DEVICE_MANUFACTURER,
-            model=DOMAIN,
-        )
-
-    @property
-    def state_class(self) -> SensorStateClass | None:
-        return SensorStateClass.MEASUREMENT
-
-    @property
-    def suggested_display_precision(self) -> int | None:
-        """Return the suggested number of decimal digits for display."""
-        return 0
-
-    @overrides
-    async def async_added_to_hass(self) -> None:
-        await super().async_added_to_hass()
-
-        api: VersatileThermostatAPI = VersatileThermostatAPI.get_vtherm_api(self._hass)
-        api.register_nb_device_active_boiler(self)
-
-        @callback
-        async def _async_startup_internal(*_):
-            _LOGGER.debug("%s - Calling async_startup_internal", self)
-            await self.listen_vtherms_entities()
-
-        if self.hass.state == CoreState.running:
-            await _async_startup_internal()
-        else:
-            self.hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_START, _async_startup_internal
-            )
-
-    async def listen_vtherms_entities(self):
-        """Initialize the listening of state change of VTherms"""
-
-        # Listen to all VTherm state change
-        self._entities = []
-        underlying_entities_id = []
-
-        component: EntityComponent[ClimateEntity] = self.hass.data[CLIMATE_DOMAIN]
-        for entity in component.entities:
-            if isinstance(entity, BaseThermostat) and entity.is_used_by_central_boiler:
-                self._entities.append(entity)
-                for under in entity.underlying_entities:
-                    underlying_entities_id.append(under.entity_id)
-        if len(underlying_entities_id) > 0:
-            # Arme l'écoute de la première entité
-            listener_cancel = async_track_state_change_event(
-                self._hass,
-                underlying_entities_id,
-                self.calculate_nb_active_devices,
-            )
-            _LOGGER.info(
-                "%s - the underlyings that could controls the central boiler are %s",
-                self,
-                underlying_entities_id,
-            )
-            self.async_on_remove(listener_cancel)
-        else:
-            _LOGGER.debug("%s - no VTherm could controls the central boiler", self)
-
-        await self.calculate_nb_active_devices(None)
-
-    async def calculate_nb_active_devices(self, _):
-        """Calculate the number of active VTherm that have an
-        influence on central boiler"""
-
-        _LOGGER.debug("%s - calculating the number of active VTherm", self)
-        nb_active = 0
-        for entity in self._entities:
-            _LOGGER.debug(
-                "Examining the hvac_action of %s",
-                entity.name,
-            )
-            if (
-                entity.hvac_mode == HVACMode.HEAT
-                and entity.hvac_action == HVACAction.HEATING
-            ):
-                for under in entity.underlying_entities:
-                    nb_active += 1 if under.is_device_active else 0
-
-        self._attr_native_value = nb_active
-        self.async_write_ha_state()
-
-    def __str__(self):
-        return f"VersatileThermostat-{self.name}"
--- a/custom_components/versatile_thermostat/strings.json
+++ b/custom_components/versatile_thermostat/strings.json
@@ -23,7 +23,6 @@
          "cycle_min": "Cycle duration (minutes)",
          "temp_min": "Minimal temperature allowed",
          "temp_max": "Maximal temperature allowed",
-          "step_temperature": "Temperature step",
          "device_power": "Device power",
          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_window_feature": "Use window detection",
@@ -78,7 +77,7 @@
          "valve_entity3_id": "3rd valve number entity id",
          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
-          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
+          "auto_regulation_dtemp": "The threshold in ° under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
          "inverse_switch_command": "For switch with pilot wire and diode you may need to inverse the command",
          "auto_fan_mode": " Automatically activate fan when huge heating/cooling is necessary"
@@ -131,8 +130,7 @@
          "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
          "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
          "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
-          "use_window_central_config": "Use central window configuration",
-          "window_action": "Action"
+          "use_window_central_config": "Use central window configuration"
        },
        "data_description": {
          "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
@@ -140,8 +138,7 @@
          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
          "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
          "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
-          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
-          "window_action": "Action to do if window is deteted as open"
+          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm"
        }
      },
      "motion": {
@@ -258,7 +255,6 @@
          "cycle_min": "Cycle duration (minutes)",
          "temp_min": "Minimal temperature allowed",
          "temp_max": "Maximal temperature allowed",
-          "step_temperature": "Temperature step",
          "device_power": "Device power",
          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_window_feature": "Use window detection",
@@ -313,7 +309,7 @@
          "valve_entity3_id": "3rd valve number entity id",
          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
-          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
+          "auto_regulation_dtemp": "The threshold in ° under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
          "inverse_switch_command": "For switch with pilot wire and diode you may need to invert the command",
          "auto_fan_mode": " Automatically activate fan when huge heating/cooling is necessary"
@@ -366,8 +362,7 @@
          "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
          "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
          "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
-          "use_window_central_config": "Use central window configuration",
-          "window_action": "Action"
+          "use_window_central_config": "Use central window configuration"
        },
        "data_description": {
          "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
@@ -375,8 +370,7 @@
          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
          "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
          "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
-          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
-          "window_action": "Action to do if window is deteted as open"
+          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm"
        }
      },
      "motion": {
@@ -498,22 +492,6 @@
        "auto_fan_high": "High",
        "auto_fan_turbo": "Turbo"
      }
-    },
-    "window_action": {
-      "options": {
-        "window_turn_off": "Turn off",
-        "window_fan_only": "Fan only",
-        "window_frost_temp": "Frost protect",
-        "window_eco_temp": "Eco"
-      }
-    },
-    "presets": {
-      "options": {
-        "frost": "Frost protect",
-        "eco": "Eco",
-        "comfort": "Comfort",
-        "boost": "Boost"
-      }
    }
  },
  "entity": {
--- a/custom_components/versatile_thermostat/thermostat_climate.py
+++ b/custom_components/versatile_thermostat/thermostat_climate.py
@@ -162,6 +162,7 @@ class ThermostatOverClimate(BaseThermostat):
            self._regulated_target_temp = self.target_temperature

        _LOGGER.info("%s - regulation calculation will be done", self)
+        self._last_regulation_change = now

        new_regulated_temp = round_to_nearest(
            self._regulation_algo.calculate_regulated_temperature(
@@ -187,7 +188,6 @@ class ThermostatOverClimate(BaseThermostat):
            new_regulated_temp,
        )

-        self._last_regulation_change = now
        for under in self._underlyings:
            await under.set_temperature(
                self.regulated_target_temp, self._attr_max_temp, self._attr_min_temp
@@ -526,11 +526,7 @@ class ThermostatOverClimate(BaseThermostat):
            return

        added_energy = 0
-        if (
-            self.is_over_climate
-            and self._underlying_climate_delta_t is not None
-            and self._device_power
-        ):
+        if self.is_over_climate and self._underlying_climate_delta_t is not None:
            added_energy = self._device_power * self._underlying_climate_delta_t

        self._total_energy += added_energy
@@ -850,14 +846,13 @@ class ThermostatOverClimate(BaseThermostat):

        return self._support_flags

-    # We keep the step configured for the VTherm and not the step of the underlying
-    # @property
-    # def target_temperature_step(self) -> float | None:
-    #     """Return the supported step of target temperature."""
-    #     if self.underlying_entity(0):
-    #         return self.underlying_entity(0).target_temperature_step
-    #
-    #     return None
+    @property
+    def target_temperature_step(self) -> float | None:
+        """Return the supported step of target temperature."""
+        if self.underlying_entity(0):
+            return self.underlying_entity(0).target_temperature_step
+
+        return None

    @property
    def target_temperature_high(self) -> float | None:
--- a/custom_components/versatile_thermostat/thermostat_valve.py
+++ b/custom_components/versatile_thermostat/thermostat_valve.py
@@ -1,13 +1,13 @@
 # pylint: disable=line-too-long
 """ A climate over switch classe """
 import logging
-from datetime import timedelta, datetime
+from datetime import timedelta

 from homeassistant.helpers.event import (
    async_track_state_change_event,
    async_track_time_interval,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import callback
 from homeassistant.components.climate import HVACMode

 from .base_thermostat import BaseThermostat
@@ -18,9 +18,6 @@ from .const import (
    CONF_VALVE_2,
    CONF_VALVE_3,
    CONF_VALVE_4,
-    # This is not really self-regulation but regulation here
-    CONF_AUTO_REGULATION_DTEMP,
-    CONF_AUTO_REGULATION_PERIOD_MIN,
    overrides,
 )

@@ -47,23 +44,15 @@ class ThermostatOverValve(BaseThermostat):
                    "function",
                    "tpi_coef_int",
                    "tpi_coef_ext",
-                    "auto_regulation_dpercent",
-                    "auto_regulation_period_min",
-                    "last_calculation_timestamp",
                }
            )
        )
    )

-    def __init__(self, hass: HomeAssistant, unique_id, name, config_entry) -> None:
-        """Initialize the thermostat over switch."""
-        self._valve_open_percent: int = 0
-        self._last_calculation_timestamp: datetime = None
-        self._auto_regulation_dpercent: float = None
-        self._auto_regulation_period_min: int = None
-
-        # Call to super must be done after initialization because it calls post_init at the end
-        super().__init__(hass, unique_id, name, config_entry)
+    # Useless for now
+    # def __init__(self, hass: HomeAssistant, unique_id, name, config_entry) -> None:
+    #    """Initialize the thermostat over switch."""
+    #    super().__init__(hass, unique_id, name, config_entry)

    @property
    def is_over_valve(self) -> bool:
@@ -76,25 +65,13 @@ class ThermostatOverValve(BaseThermostat):
        if self._hvac_mode == HVACMode.OFF:
            return 0
        else:
-            return self._valve_open_percent
+            return round(max(0, min(self.proportional_algorithm.on_percent, 1)) * 100)

    @overrides
    def post_init(self, config_entry):
        """Initialize the Thermostat"""

        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
-        )
-
        self._prop_algorithm = PropAlgorithm(
            self._proportional_function,
            self._tpi_coef_int,
@@ -187,17 +164,6 @@ class ThermostatOverValve(BaseThermostat):
        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[
-            "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(
@@ -211,21 +177,7 @@ class ThermostatOverValve(BaseThermostat):
        """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)
-
-        # 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
-
+        _LOGGER.debug("%s - recalculate all", self)
        self._prop_algorithm.calculate(
            self._target_temp,
            self._cur_temp,
@@ -233,34 +185,9 @@ class ThermostatOverValve(BaseThermostat):
            self._hvac_mode == HVACMode.COOL,
        )

-        new_valve_percent = round(
-            max(0, min(self.proportional_algorithm.on_percent, 1)) * 100
-        )
-
-        dpercent = new_valve_percent - self.valve_open_percent
-        if (
-            dpercent >= -1 * self._auto_regulation_dpercent
-            and 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:
            under.set_valve_open_percent()

-        self._last_calculation_timestamp = now
-
        self.update_custom_attributes()
        self.async_write_ha_state()

--- a/custom_components/versatile_thermostat/translations/en.json
+++ b/custom_components/versatile_thermostat/translations/en.json
@@ -23,7 +23,6 @@
          "cycle_min": "Cycle duration (minutes)",
          "temp_min": "Minimal temperature allowed",
          "temp_max": "Maximal temperature allowed",
-          "step_temperature": "Temperature step",
          "device_power": "Device power",
          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_window_feature": "Use window detection",
@@ -78,7 +77,7 @@
          "valve_entity3_id": "3rd valve number entity id",
          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
-          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
+          "auto_regulation_dtemp": "The threshold in ° under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
          "inverse_switch_command": "For switch with pilot wire and diode you may need to inverse the command",
          "auto_fan_mode": " Automatically activate fan when huge heating/cooling is necessary"
@@ -131,8 +130,7 @@
          "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
          "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
          "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
-          "use_window_central_config": "Use central window configuration",
-          "window_action": "Action"
+          "use_window_central_config": "Use central window configuration"
        },
        "data_description": {
          "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
@@ -140,8 +138,7 @@
          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
          "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
          "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
-          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
-          "window_action": "Action to do if window is deteted as open"
+          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm"
        }
      },
      "motion": {
@@ -258,7 +255,6 @@
          "cycle_min": "Cycle duration (minutes)",
          "temp_min": "Minimal temperature allowed",
          "temp_max": "Maximal temperature allowed",
-          "step_temperature": "Temperature step",
          "device_power": "Device power",
          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_window_feature": "Use window detection",
@@ -313,7 +309,7 @@
          "valve_entity3_id": "3rd valve number entity id",
          "valve_entity4_id": "4th valve number entity id",
          "auto_regulation_mode": "Auto adjustment of the target temperature",
-          "auto_regulation_dtemp": "The threshold in ° (or % for valve) under which the temperature change will not be sent",
+          "auto_regulation_dtemp": "The threshold in ° under which the temperature change will not be sent",
          "auto_regulation_periode_min": "Duration in minutes between two regulation update",
          "inverse_switch_command": "For switch with pilot wire and diode you may need to invert the command",
          "auto_fan_mode": " Automatically activate fan when huge heating/cooling is necessary"
@@ -366,8 +362,7 @@
          "window_auto_open_threshold": "Temperature decrease threshold for automatic window open detection (in °/hours)",
          "window_auto_close_threshold": "Temperature increase threshold for end of automatic detection (in °/hours)",
          "window_auto_max_duration": "Maximum duration of automatic window open detection (in min)",
-          "use_window_central_config": "Use central window configuration",
-          "window_action": "Action"
+          "use_window_central_config": "Use central window configuration"
        },
        "data_description": {
          "window_sensor_entity_id": "Leave empty if no window sensor should be used and to use the automatic detection",
@@ -375,8 +370,7 @@
          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
          "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
          "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
-          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
-          "window_action": "Action to do if window is deteted as open"
+          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm"
        }
      },
      "motion": {
@@ -498,22 +492,6 @@
        "auto_fan_high": "High",
        "auto_fan_turbo": "Turbo"
      }
-    },
-    "window_action": {
-      "options": {
-        "window_turn_off": "Turn off",
-        "window_fan_only": "Fan only",
-        "window_frost_temp": "Frost protect",
-        "window_eco_temp": "Eco"
-      }
-    },
-    "presets": {
-      "options": {
-        "frost": "Frost protect",
-        "eco": "Eco",
-        "comfort": "Comfort",
-        "boost": "Boost"
-      }
    }
  },
  "entity": {
--- a/custom_components/versatile_thermostat/translations/fr.json
+++ b/custom_components/versatile_thermostat/translations/fr.json
@@ -23,7 +23,6 @@
          "cycle_min": "Durée du cycle (minutes)",
          "temp_min": "Température minimale permise",
          "temp_max": "Température maximale permise",
-          "step_temperature": "Pas de température",
          "device_power": "Puissance de l'équipement",
          "use_central_mode": "Autoriser le controle par une entity centrale ('nécessite une config. centrale`). Cochez pour autoriser le contrôle du VTherm par la liste déroulante 'central_mode' de l'entité configuration centrale.",
          "use_window_feature": "Avec détection des ouvertures",
@@ -78,7 +77,7 @@
          "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 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_dtemp": "Le seuil en ° au-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",
          "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"
@@ -131,8 +130,7 @@
          "window_auto_open_threshold": "Seuil haut de chute de température pour la détection automatique (en °/heure)",
          "window_auto_close_threshold": "Seuil bas de chute de température pour la fin de détection automatique (en °/heure)",
          "window_auto_max_duration": "Durée maximum d'une extinction automatique (en min)",
-          "use_window_central_config": "Utiliser la configuration centrale des ouvertures",
-          "window_action": "Action"
+          "use_window_central_config": "Utiliser la configuration centrale des ouvertures"
        },
        "data_description": {
          "window_sensor_entity_id": "Laissez vide si vous n'avez de détecteur et pour utiliser la détection automatique",
@@ -140,8 +138,7 @@
          "window_auto_open_threshold": "Valeur recommandée: entre 3 et 10. Laissez vide si vous n'utilisez pas la détection automatique",
          "window_auto_close_threshold": "Valeur recommandée: 0. Laissez vide si vous n'utilisez pas la détection automatique",
          "window_auto_max_duration": "Valeur recommandée: 60 (1 heure). Laissez vide si vous n'utilisez pas la détection automatique",
-          "use_window_central_config": "Cochez pour utiliser la configuration centrale des ouvertures. Décochez et saisissez les attributs pour utiliser une configuration spécifique des ouvertures",
-          "window_action": "Action a effectuer si la fenêtre est détectée comme ouverte"
+          "use_window_central_config": "Cochez pour utiliser la configuration centrale des ouvertures. Décochez et saisissez les attributs pour utiliser une configuration spécifique des ouvertures"
        }
      },
      "motion": {
@@ -270,7 +267,6 @@
          "cycle_min": "Durée du cycle (minutes)",
          "temp_min": "Température minimale permise",
          "temp_max": "Température maximale permise",
-          "step_temperature": "Pas de température",
          "device_power": "Puissance de l'équipement",
          "use_central_mode": "Autoriser le controle par une entity centrale ('nécessite une config. centrale`). Cochez pour autoriser le contrôle du VTherm par la liste déroulante 'central_mode' de l'entité configuration centrale.",
          "use_window_feature": "Avec détection des ouvertures",
@@ -325,7 +321,7 @@
          "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",
-          "auto_regulation_dtemp": "Le seuil en ° (ou % pour les valves) en-dessous duquel la régulation ne sera pas envoyée",
+          "auto_regulation_dtemp": "Le seuil en ° au-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",
          "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"
@@ -372,8 +368,7 @@
          "window_auto_open_threshold": "Seuil haut de chute de température pour la détection automatique (en °/heure)",
          "window_auto_close_threshold": "Seuil bas de chute de température pour la fin de détection automatique (en °/heure)",
          "window_auto_max_duration": "Durée maximum d'une extinction automatique (en min)",
-          "use_window_central_config": "Utiliser la configuration centrale des ouvertures",
-          "window_action": "Action"
+          "use_window_central_config": "Utiliser la configuration centrale des ouvertures"
        },
        "data_description": {
          "window_sensor_entity_id": "Laissez vide si vous n'avez de détecteur et pour utiliser la détection automatique",
@@ -381,8 +376,7 @@
          "window_auto_open_threshold": "Valeur recommandée: entre 3 et 10. Laissez vide si vous n'utilisez pas la détection automatique",
          "window_auto_close_threshold": "Valeur recommandée: 0. Laissez vide si vous n'utilisez pas la détection automatique",
          "window_auto_max_duration": "Valeur recommandée: 60 (1 heure). Laissez vide si vous n'utilisez pas la détection automatique",
-          "use_window_central_config": "Cochez pour utiliser la configuration centrale des ouvertures. Décochez et saisissez les attributs pour utiliser une configuration spécifique des ouvertures",
-          "window_action": "Action a effectuer si la fenêtre est détectée comme ouverte"
+          "use_window_central_config": "Cochez pour utiliser la configuration centrale des ouvertures. Décochez et saisissez les attributs pour utiliser une configuration spécifique des ouvertures"
        }
      },
      "motion": {
@@ -516,22 +510,6 @@
        "auto_fan_high": "Forte",
        "auto_fan_turbo": "Turbo"
      }
-    },
-    "window_action": {
-      "options": {
-        "window_turn_off": "Eteindre",
-        "window_fan_only": "Ventilateur seul",
-        "window_frost_temp": "Hors gel",
-        "window_eco_temp": "Eco"
-      }
-    },
-    "presets": {
-      "options": {
-        "frost": "Hors-gel",
-        "eco": "Eco",
-        "comfort": "Confort",
-        "boost": "Renforcé (boost)"
-      }
    }
  },
  "entity": {
--- a/custom_components/versatile_thermostat/underlyings.py
+++ b/custom_components/versatile_thermostat/underlyings.py
@@ -133,14 +133,14 @@ class UnderlyingEntity:
    async def check_initial_state(self, hvac_mode: HVACMode):
        """Prevent the underlying to be on but thermostat is off"""
        if hvac_mode == HVACMode.OFF and self.is_device_active:
-            _LOGGER.info(
+            _LOGGER.warning(
                "%s - The hvac mode is OFF, but the underlying device is ON. Turning off device %s",
                self,
                self._entity_id,
            )
            await self.set_hvac_mode(hvac_mode)
        elif hvac_mode != HVACMode.OFF and not self.is_device_active:
-            _LOGGER.info(
+            _LOGGER.warning(
                "%s - The hvac mode is %s, but the underlying device is not ON. Turning on device %s if needed",
                self,
                hvac_mode,
@@ -356,7 +356,7 @@ class UnderlyingSwitch(UnderlyingEntity):
            _LOGGER.debug("%s - End of cycle (3)", self)
            return
        # safety mode could have change the on_time percent
-        await self._thermostat.check_safety()
+        await self._thermostat.check_security()
        time = self._on_time_sec

        action_label = "start"
@@ -765,20 +765,18 @@ class UnderlyingValve(UnderlyingEntity):
            await self.send_percent_open()

    async def turn_on(self):
-        """Nothing to do for Valve because it cannot be turned on"""
+        """Nothing to do for Valve because it cannot be turned off"""
        self.set_valve_open_percent()

    async def set_hvac_mode(self, hvac_mode: HVACMode) -> bool:
        """Set the HVACmode. Returns true if something have change"""

-        if hvac_mode == HVACMode.OFF and self.is_device_active:
-            await self.turn_off()
-
-        if hvac_mode != HVACMode.OFF and not self.is_device_active:
-            await self.turn_on()
-
        if self._hvac_mode != hvac_mode:
            self._hvac_mode = hvac_mode
+            if hvac_mode == HVACMode.OFF:
+                await self.turn_off()
+            else:
+                await self.turn_on()
            return True
        else:
            return False
--- a/custom_components/versatile_thermostat/vtherm_api.py
+++ b/custom_components/versatile_thermostat/vtherm_api.py
@@ -7,7 +7,6 @@ from .const import (
    DOMAIN,
    CONF_AUTO_REGULATION_EXPERT,
    CONF_SHORT_EMA_PARAMS,
-    CONF_SAFETY_MODE,
    CONF_THERMOSTAT_TYPE,
    CONF_THERMOSTAT_CENTRAL_CONFIG,
 )
@@ -47,10 +46,7 @@ class VersatileThermostatAPI(dict):
        super().__init__()
        self._expert_params = None
        self._short_ema_params = None
-        self._safety_mode = None
        self._central_boiler_entity = None
-        self._threshold_number_entity = None
-        self._nb_active_number_entity = None

    def find_central_configuration(self):
        """Search for a central configuration"""
@@ -92,29 +88,15 @@ class VersatileThermostatAPI(dict):
        if self._short_ema_params:
            _LOGGER.debug("We have found short ema params %s", self._short_ema_params)

-        self._safety_mode = config.get(CONF_SAFETY_MODE)
-        if self._safety_mode:
-            _LOGGER.debug("We have found safet_mode params %s", self._safety_mode)
-
    def register_central_boiler(self, central_boiler_entity):
        """Register the central boiler entity. This is used by the CentralBoilerBinarySensor
        class to register itself at creation"""
        self._central_boiler_entity = central_boiler_entity

-    def register_central_boiler_activation_number_threshold(
-        self, threshold_number_entity
-    ):
-        """register the two number entities needed for boiler activation"""
-        self._threshold_number_entity = threshold_number_entity
-
-    def register_nb_device_active_boiler(self, nb_active_number_entity):
-        """register the two number entities needed for boiler activation"""
-        self._nb_active_number_entity = nb_active_number_entity
-
    async def reload_central_boiler_entities_list(self):
        """Reload the central boiler list of entities if a central boiler is used"""
-        if self._nb_active_number_entity is not None:
-            await self._nb_active_number_entity.listen_vtherms_entities()
+        if self._central_boiler_entity is not None:
+            await self._central_boiler_entity.listen_vtherms_entities()

    @property
    def self_regulation_expert(self):
@@ -123,48 +105,9 @@ class VersatileThermostatAPI(dict):

    @property
    def short_ema_params(self):
-        """Get the short EMA params in expert mode"""
+        """Get the self regulation params"""
        return self._short_ema_params

-    @property
-    def safety_mode(self):
-        """Get the safety_mode params"""
-        return self._safety_mode
-
-    @property
-    def central_boiler_entity(self):
-        """Get the central boiler binary_sensor entity"""
-        return self._central_boiler_entity
-
-    @property
-    def nb_active_device_for_boiler(self):
-        """Returns the number of active VTherm which have an
-        influence on boiler"""
-        if self._nb_active_number_entity is None:
-            return None
-        else:
-            return self._nb_active_number_entity.native_value
-
-    @property
-    def nb_active_device_for_boiler_entity(self):
-        """Returns the number of active VTherm entity which have an
-        influence on boiler"""
-        return self._nb_active_number_entity
-
-    @property
-    def nb_active_device_for_boiler_threshold_entity(self):
-        """Returns the number of active VTherm entity which have an
-        influence on boiler"""
-        return self._threshold_number_entity
-
-    @property
-    def nb_active_device_for_boiler_threshold(self):
-        """Returns the number of active VTherm entity which have an
-        influence on boiler"""
-        if self._threshold_number_entity is None:
-            return None
-        return int(self._threshold_number_entity.native_value)
-
    @property
    def hass(self):
        """Get the HomeAssistant object"""
--- a/images/entitites-central-boiler.png
+++ b/images/entitites-central-boiler.png
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -2,7 +2,5 @@
 -r requirements_dev.txt
 aiodiscover
 ulid_transform
-pytest
-coverage
 pytest-asyncio
 pytest-homeassistant-custom-component
--- a/tests/commons.py
+++ b/tests/commons.py
@@ -19,14 +19,6 @@ from homeassistant.components.climate import (
    ClimateEntityFeature,
 )

-from homeassistant.components.switch import (
-    SwitchEntity,
-)
-
-from homeassistant.components.number import (
-    NumberEntity,
-)
-
 from pytest_homeassistant_custom_component.common import MockConfigEntry

 from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
@@ -68,7 +60,6 @@ from .const import (  # pylint: disable=unused-import
    PRESET_NONE,
    PRESET_ECO,
    PRESET_ACTIVITY,
-    overrides,
 )


@@ -146,7 +137,6 @@ FULL_CENTRAL_CONFIG = {
    CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
    CONF_TEMP_MIN: 15,
    CONF_TEMP_MAX: 30,
-    CONF_STEP_TEMPERATURE: 0.1,
    CONF_TPI_COEF_INT: 0.5,
    CONF_TPI_COEF_EXT: 0.02,
    "frost_temp": 10,
@@ -178,53 +168,8 @@ FULL_CENTRAL_CONFIG = {
    CONF_SECURITY_DELAY_MIN: 61,
    CONF_SECURITY_MIN_ON_PERCENT: 0.5,
    CONF_SECURITY_DEFAULT_ON_PERCENT: 0.2,
-    CONF_ADD_CENTRAL_BOILER_CONTROL: False,
 }

-FULL_CENTRAL_CONFIG_WITH_BOILER = {
-    CONF_NAME: CENTRAL_CONFIG_NAME,
-    CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CENTRAL_CONFIG,
-    CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-    CONF_TEMP_MIN: 15,
-    CONF_TEMP_MAX: 30,
-    CONF_STEP_TEMPERATURE: 0.1,
-    CONF_TPI_COEF_INT: 0.5,
-    CONF_TPI_COEF_EXT: 0.02,
-    "frost_temp": 10,
-    "eco_temp": 17.1,
-    "comfort_temp": 0,
-    "boost_temp": 19.1,
-    "eco_ac_temp": 25.1,
-    "comfort_ac_temp": 23.1,
-    "boost_ac_temp": 21.1,
-    "frost_away_temp": 15.1,
-    "eco_away_temp": 15.2,
-    "comfort_away_temp": 0,
-    "boost_away_temp": 15.4,
-    "eco_ac_away_temp": 30.5,
-    "comfort_ac_away_temp": 0,
-    "boost_ac_away_temp": 30.7,
-    CONF_WINDOW_DELAY: 15,
-    CONF_WINDOW_AUTO_OPEN_THRESHOLD: 4,
-    CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 1,
-    CONF_WINDOW_AUTO_MAX_DURATION: 31,
-    CONF_MOTION_DELAY: 31,
-    CONF_MOTION_OFF_DELAY: 301,
-    CONF_MOTION_PRESET: "boost",
-    CONF_NO_MOTION_PRESET: "frost",
-    CONF_POWER_SENSOR: "sensor.mock_power_sensor",
-    CONF_MAX_POWER_SENSOR: "sensor.mock_max_power_sensor",
-    CONF_PRESET_POWER: 14,
-    CONF_MINIMAL_ACTIVATION_DELAY: 11,
-    CONF_SECURITY_DELAY_MIN: 61,
-    CONF_SECURITY_MIN_ON_PERCENT: 0.5,
-    CONF_SECURITY_DEFAULT_ON_PERCENT: 0.2,
-    CONF_ADD_CENTRAL_BOILER_CONTROL: True,
-    CONF_CENTRAL_BOILER_ACTIVATION_SRV: "switch.pompe_chaudiere/switch.turn_on",
-    CONF_CENTRAL_BOILER_DEACTIVATION_SRV: "switch.pompe_chaudiere/switch.turn_off",
-}
-
-
 _LOGGER = logging.getLogger(__name__)


@@ -265,15 +210,9 @@ class MockClimate(ClimateEntity):
        self._attr_target_temperature = 20
        self._attr_current_temperature = 15
        self._attr_hvac_action = hvac_action
-        self._attr_target_temperature_step = 0.2
        self._fan_modes = fan_modes if fan_modes else None
        self._attr_fan_mode = None

-    @property
-    def name(self) -> str:
-        """The name"""
-        return self._name
-
    @property
    def hvac_action(self):
        """The hvac action of the mock climate"""
@@ -305,10 +244,6 @@ class MockClimate(ClimateEntity):
        """The hvac mode"""
        self._attr_hvac_mode = hvac_mode

-    def set_hvac_mode(self, hvac_mode):
-        """The hvac mode"""
-        self._attr_hvac_mode = hvac_mode
-
    def set_hvac_action(self, hvac_action: HVACAction):
        """Set the HVACaction"""
        self._attr_hvac_action = hvac_action
@@ -415,66 +350,6 @@ class MagicMockClimate(MagicMock):
        return 19


-class MockSwitch(SwitchEntity):
-    """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={}
-    ):
-        """Init the switch"""
-        super().__init__()
-
-        self.hass = hass
-        self.platform = "switch"
-        self.entity_id = self.platform + "." + unique_id
-        self._name = name
-        self._attr_is_on = False
-
-    @property
-    def name(self) -> str:
-        """The name"""
-        return self._name
-
-    @overrides
-    def turn_on(self, **kwargs: Any):
-        """Turns the switch on and notify the state change"""
-        self._attr_is_on = True
-        # self.async_write_ha_state()
-
-    @overrides
-    def turn_off(self, **kwargs: Any):
-        """Turns the switch on and notify the state change"""
-        self._attr_is_on = False
-        # self.async_write_ha_state()
-
-
-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={}
-    ):
-        """Init the switch"""
-        super().__init__()
-
-        self.hass = hass
-        self.platform = "number"
-        self.entity_id = self.platform + "." + unique_id
-        self._name = name
-        self._attr_native_value = 0
-        self._attr_native_min_value = 0
-
-    @property
-    def name(self) -> str:
-        """The name"""
-        return self._name
-
-    @overrides
-    def set_native_value(self, value: float):
-        """Change the value"""
-        self._attr_native_value = value
-
-
 async def create_thermostat(
    hass: HomeAssistant, entry: MockConfigEntry, entity_id: str
 ) -> BaseThermostat:
@@ -486,6 +361,13 @@ async def create_thermostat(
        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
+
        return search_entity(hass, entity_id, CLIMATE_DOMAIN)


--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -29,11 +29,7 @@ from custom_components.versatile_thermostat.config_flow import (
 from custom_components.versatile_thermostat.vtherm_api import VersatileThermostatAPI
 from custom_components.versatile_thermostat.base_thermostat import BaseThermostat

-from .commons import (
-    create_central_config,
-    FULL_CENTRAL_CONFIG,
-    FULL_CENTRAL_CONFIG_WITH_BOILER,
-)
+from .commons import create_central_config

 pytest_plugins = "pytest_homeassistant_custom_component"  # pylint: disable=invalid-name

@@ -131,16 +127,6 @@ async def init_central_config_fixture(
    hass, init_vtherm_api
 ):  # pylint: disable=unused-argument
    """Initialize the VTherm API"""
-    await create_central_config(hass, FULL_CENTRAL_CONFIG)
-
-    yield
-
-
-@pytest.fixture(name="init_central_config_with_boiler_fixture")
-async def init_central_config_with_boiler_fixture(
-    hass, init_vtherm_api
-):  # pylint: disable=unused-argument
-    """Initialize the VTherm API"""
-    await create_central_config(hass, FULL_CENTRAL_CONFIG_WITH_BOILER)
+    await create_central_config(hass)

    yield
--- a/tests/const.py
+++ b/tests/const.py
@@ -33,7 +33,6 @@ MOCK_TH_OVER_4SWITCH_USER_CONFIG = {
    CONF_CYCLE_MIN: 8,
    CONF_TEMP_MIN: 15,
    CONF_TEMP_MAX: 30,
-    CONF_STEP_TEMPERATURE: 0.1,
    CONF_DEVICE_POWER: 1,
    CONF_USE_WINDOW_FEATURE: True,
    CONF_USE_MOTION_FEATURE: True,
@@ -60,7 +59,6 @@ MOCK_TH_OVER_CLIMATE_CENTRAL_MAIN_CONFIG = {
    CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
    CONF_TEMP_MIN: 15,
    CONF_TEMP_MAX: 30,
-    CONF_STEP_TEMPERATURE: 0.1,
    # Keep default values which are False
 }

@@ -68,7 +66,6 @@ MOCK_TH_OVER_SWITCH_CENTRAL_MAIN_CONFIG = {
    CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
    CONF_TEMP_MIN: 15,
    CONF_TEMP_MAX: 30,
-    CONF_STEP_TEMPERATURE: 0.1,
    # Keep default values which are False
 }

@@ -155,7 +152,6 @@ MOCK_WINDOW_AUTO_CONFIG = {
    CONF_WINDOW_AUTO_OPEN_THRESHOLD: 1.0,
    CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 0.0,
    CONF_WINDOW_AUTO_MAX_DURATION: 5.0,
-    CONF_WINDOW_ACTION: CONF_WINDOW_FAN_ONLY,
 }

 MOCK_MOTION_CONFIG = {
--- a/tests/test_bugs.py
+++ b/tests/test_bugs.py
@@ -591,7 +591,6 @@ async def test_bug_272(
        domain=DOMAIN,
        title="TheOverClimateMockName",
        unique_id="uniqueId",
-        # default value are min 15°, max 30°, step 0.1
        data=PARTIAL_CLIMATE_CONFIG,  # 5 minutes security delay
    )

@@ -624,8 +623,6 @@ async def test_bug_272(
        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

--- a/tests/test_central_boiler.py
+++ b/tests/test_central_boiler.py
@@ -1,838 +0,0 @@
-# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
-
-""" Test the central_configuration """
-import asyncio
-from datetime import datetime
-
-from unittest.mock import patch, call
-
-from homeassistant.core import HomeAssistant
-
-from homeassistant.config_entries import ConfigEntryState
-
-from pytest_homeassistant_custom_component.common import MockConfigEntry
-
-from custom_components.versatile_thermostat.thermostat_switch import (
-    ThermostatOverSwitch,
-)
-
-from custom_components.versatile_thermostat.thermostat_valve import (
-    ThermostatOverValve,
-)
-
-from custom_components.versatile_thermostat.thermostat_climate import (
-    ThermostatOverClimate,
-)
-
-from custom_components.versatile_thermostat.vtherm_api import VersatileThermostatAPI
-from custom_components.versatile_thermostat.binary_sensor import (
-    CentralBoilerBinarySensor,
-)
-
-from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
-from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
-
-
-# @pytest.mark.parametrize("expected_lingering_tasks", [True])
-# @pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_add_a_central_config_with_boiler(
-    hass: HomeAssistant,
-    skip_hass_states_is_state,
-):
-    """Tests the clean_central_config_doubon of base_thermostat"""
-    central_config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheCentralConfigMockName",
-        unique_id="centralConfigUniqueId",
-        data=FULL_CENTRAL_CONFIG_WITH_BOILER,
-    )
-
-    central_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(central_config_entry.entry_id)
-    assert central_config_entry.state is ConfigEntryState.LOADED
-
-    entity: ThermostatOverClimate = search_entity(
-        hass, "climate.thecentralconfigmockname", "climate"
-    )
-
-    assert entity is None
-
-    assert count_entities(hass, "climate.thecentralconfigmockname", "climate") == 0
-
-    # Test that VTherm API find the CentralConfig
-    api = VersatileThermostatAPI.get_vtherm_api(hass)
-    central_configuration = api.find_central_configuration()
-    assert central_configuration is not None
-
-    # Test that VTherm API have any central boiler entities
-    assert api.nb_active_device_for_boiler_entity is not None
-    assert api.nb_active_device_for_boiler == 0
-
-    assert api.nb_active_device_for_boiler_threshold_entity is not None
-    assert api.nb_active_device_for_boiler_threshold is 1  # the default value is 1
-
-
-async def test_update_central_boiler_state_simple(
-    hass: HomeAssistant,
-    # skip_hass_states_is_state,
-    init_central_config_with_boiler_fixture,
-):
-    """Test that the central boiler state behavoir"""
-
-    api = VersatileThermostatAPI.get_vtherm_api(hass)
-
-    switch1 = MockSwitch(hass, "switch1", "theSwitch1")
-
-    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: 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_HEATER: switch1.entity_id,
-            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
-            CONF_INVERSE_SWITCH: False,
-            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_SECURITY_DEFAULT_ON_PERCENT: 0.1,
-            CONF_USE_MAIN_CENTRAL_CONFIG: True,
-            CONF_USE_TPI_CENTRAL_CONFIG: True,
-            CONF_USE_PRESETS_CENTRAL_CONFIG: True,
-            CONF_USE_ADVANCED_CENTRAL_CONFIG: True,
-            CONF_USED_BY_CENTRAL_BOILER: True,
-        },
-    )
-
-    entity: ThermostatOverSwitch = await create_thermostat(
-        hass, entry, "climate.theoverswitchmockname"
-    )
-    assert entity
-    assert entity.name == "TheOverSwitchMockName"
-    assert entity.is_over_switch
-    assert entity.underlying_entities[0].entity_id == "switch.switch1"
-
-    assert api.nb_active_device_for_boiler_threshold == 1
-    assert api.nb_active_device_for_boiler == 0
-
-    # Force the VTherm to heat
-    await entity.async_set_hvac_mode(HVACMode.HEAT)
-    await entity.async_set_preset_mode(PRESET_BOOST)
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-    await send_temperature_change_event(entity, 10, now)
-
-    assert entity.hvac_mode == HVACMode.HEAT
-
-    boiler_binary_sensor: CentralBoilerBinarySensor = search_entity(
-        hass, "binary_sensor.central_boiler", "binary_sensor"
-    )
-    assert boiler_binary_sensor is not None
-    assert boiler_binary_sensor.state == STATE_OFF
-
-    # 1. start a heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch1.async_turn_on()
-        switch1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count >= 1
-
-        # Sometimes this test fails
-        # mock_service_call.assert_has_calls(
-        #     [
-        #         call.service_call(
-        #             "switch",
-        #             "turn_on",
-        #             service_data={},
-        #             target={"entity_id": "switch.pompe_chaudiere"},
-        #         ),
-        #     ]
-        # )
-
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": True},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 1
-        assert boiler_binary_sensor.state == STATE_ON
-
-    # 2. stop a heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch1.async_turn_off()
-        switch1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.IDLE
-
-        assert mock_service_call.call_count >= 1
-        mock_service_call.assert_has_calls(
-            [
-                call(
-                    "switch",
-                    "turn_off",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                )
-            ]
-        )
-
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": False},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 0
-        assert boiler_binary_sensor.state == STATE_OFF
-
-    entity.remove_thermostat()
-
-
-async def test_update_central_boiler_state_multiple(
-    hass: HomeAssistant,
-    # skip_hass_states_is_state,
-    init_central_config_with_boiler_fixture,
-):
-    """Test that the central boiler state behavoir"""
-
-    api = VersatileThermostatAPI.get_vtherm_api(hass)
-
-    switch1 = MockSwitch(hass, "switch1", "theSwitch1")
-    switch2 = MockSwitch(hass, "switch2", "theSwitch2")
-    switch3 = MockSwitch(hass, "switch3", "theSwitch3")
-    switch4 = MockSwitch(hass, "switch4", "theSwitch4")
-
-    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: 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_HEATER: switch1.entity_id,
-            CONF_HEATER_2: switch2.entity_id,
-            CONF_HEATER_3: switch3.entity_id,
-            CONF_HEATER_4: switch4.entity_id,
-            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
-            CONF_INVERSE_SWITCH: False,
-            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_SECURITY_DEFAULT_ON_PERCENT: 0.1,
-            CONF_USE_MAIN_CENTRAL_CONFIG: True,
-            CONF_USE_TPI_CENTRAL_CONFIG: True,
-            CONF_USE_PRESETS_CENTRAL_CONFIG: True,
-            CONF_USE_ADVANCED_CENTRAL_CONFIG: True,
-            CONF_USED_BY_CENTRAL_BOILER: True,
-        },
-    )
-
-    entity: ThermostatOverSwitch = await create_thermostat(
-        hass, entry, "climate.theoverswitchmockname"
-    )
-    assert entity
-    assert entity.name == "TheOverSwitchMockName"
-    assert entity.is_over_switch
-    assert entity.underlying_entities[0].entity_id == "switch.switch1"
-    assert entity.underlying_entities[1].entity_id == "switch.switch2"
-    assert entity.underlying_entities[2].entity_id == "switch.switch3"
-    assert entity.underlying_entities[3].entity_id == "switch.switch4"
-
-    assert api.nb_active_device_for_boiler_threshold == 1
-    assert api.nb_active_device_for_boiler == 0
-    # Force the VTherm to heat
-    await entity.async_set_hvac_mode(HVACMode.HEAT)
-    await entity.async_set_preset_mode(PRESET_BOOST)
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-    await send_temperature_change_event(entity, 10, now)
-
-    assert entity.hvac_mode == HVACMode.HEAT
-
-    # 0. set threshold to 3
-    api.nb_active_device_for_boiler_threshold_entity.set_native_value(3)
-    assert api.nb_active_device_for_boiler_threshold == 3
-
-    boiler_binary_sensor: CentralBoilerBinarySensor = search_entity(
-        hass, "binary_sensor.central_boiler", "binary_sensor"
-    )
-    assert boiler_binary_sensor is not None
-    assert boiler_binary_sensor.state == STATE_OFF
-
-    # 1. start a first heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch1.async_turn_on()
-        switch1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count == 1
-        # No switch of the boiler
-        mock_service_call.assert_has_calls(
-            [
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    {"entity_id": "switch.switch1"},
-                ),
-            ]
-        )
-        assert mock_send_event.call_count == 0
-
-        assert api.nb_active_device_for_boiler == 1
-        assert boiler_binary_sensor.state == STATE_OFF
-
-    # 2. start a 2nd heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch2.async_turn_on()
-        switch2.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        # Only the first heater is started by the algo
-        assert mock_service_call.call_count == 1
-        # No switch of the boiler. Caution: each time a underlying heater state change itself,
-        # the cycle restarts. So it is always the first heater that is started
-        mock_service_call.assert_has_calls(
-            [
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    {"entity_id": "switch.switch1"},
-                ),
-            ]
-        )
-        assert mock_send_event.call_count == 0
-
-        assert api.nb_active_device_for_boiler == 2
-        assert boiler_binary_sensor.state == STATE_OFF
-
-    # 3. start a 3rd heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch3.async_turn_on()
-        switch3.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        # Only the first heater is started by the algo
-        assert mock_service_call.call_count == 2
-        # No switch of the boiler. Caution: each time a underlying heater state change itself,
-        # the cycle restarts. So it is always the first heater that is started
-        mock_service_call.assert_has_calls(
-            [
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                ),
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    {"entity_id": "switch.switch1"},
-                ),
-            ],
-            any_order=True,
-        )
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": True},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 3
-        assert boiler_binary_sensor.state == STATE_ON
-
-    # 4. start a 4th heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch4.async_turn_on()
-        switch4.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        # Only the first heater is started by the algo
-        assert mock_service_call.call_count == 1
-        # No switch of the boiler. Caution: each time a underlying heater state change itself,
-        # the cycle restarts. So it is always the first heater that is started
-        mock_service_call.assert_has_calls(
-            [
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    {"entity_id": "switch.switch1"},
-                ),
-            ]
-        )
-        assert mock_send_event.call_count == 0
-        assert api.nb_active_device_for_boiler == 4
-        assert boiler_binary_sensor.state == STATE_ON
-
-    # 5. stop a heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch1.async_turn_off()
-        switch1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count == 0
-        assert mock_send_event.call_count == 0
-        assert api.nb_active_device_for_boiler == 3
-        assert boiler_binary_sensor.state == STATE_ON
-
-    # 6. stop a 2nd heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await switch4.async_turn_off()
-        switch4.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count >= 1
-        mock_service_call.assert_has_calls(
-            [
-                call(
-                    "switch",
-                    "turn_off",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                )
-            ]
-        )
-
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": False},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 2
-        assert boiler_binary_sensor.state == STATE_OFF
-
-    entity.remove_thermostat()
-
-
-async def test_update_central_boiler_state_simple_valve(
-    hass: HomeAssistant,
-    # skip_hass_states_is_state,
-    init_central_config_with_boiler_fixture,
-):
-    """Test that the central boiler state behavoir"""
-
-    api = VersatileThermostatAPI.get_vtherm_api(hass)
-
-    valve1 = MockNumber(hass, "valve1", "theValve1")
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverValveMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverValveMockName",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_VALVE,
-            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_VALVE: valve1.entity_id,
-            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
-            CONF_INVERSE_SWITCH: False,
-            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_SECURITY_DEFAULT_ON_PERCENT: 0.1,
-            CONF_USE_MAIN_CENTRAL_CONFIG: True,
-            CONF_USE_TPI_CENTRAL_CONFIG: True,
-            CONF_USE_PRESETS_CENTRAL_CONFIG: True,
-            CONF_USE_ADVANCED_CENTRAL_CONFIG: True,
-            CONF_USED_BY_CENTRAL_BOILER: True,
-        },
-    )
-
-    entity: ThermostatOverValve = await create_thermostat(
-        hass, entry, "climate.theovervalvemockname"
-    )
-    assert entity
-    assert entity.name == "TheOverValveMockName"
-    assert entity.is_over_valve
-    assert entity.underlying_entities[0].entity_id == "number.valve1"
-
-    assert api.nb_active_device_for_boiler_threshold == 1
-    assert api.nb_active_device_for_boiler == 0
-
-    # Force the VTherm to heat
-    await entity.async_set_hvac_mode(HVACMode.HEAT)
-    await entity.async_set_preset_mode(PRESET_BOOST)
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    assert entity.hvac_mode == HVACMode.HEAT
-
-    boiler_binary_sensor: CentralBoilerBinarySensor = search_entity(
-        hass, "binary_sensor.central_boiler", "binary_sensor"
-    )
-    assert boiler_binary_sensor is not None
-    assert boiler_binary_sensor.state == STATE_OFF
-
-    # 1. start a valve
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await send_temperature_change_event(entity, 10, now)
-        # we have to simulate the valve also else the test don't work
-        valve1.set_native_value(10)
-        valve1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count >= 1
-        mock_service_call.assert_has_calls(
-            [
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                ),
-            ]
-        )
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": True},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 1
-        assert boiler_binary_sensor.state == STATE_ON
-
-    # 2. stop a heater
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await send_temperature_change_event(entity, 25, now)
-        # Change the valve value to 0
-        valve1.set_native_value(0)
-        valve1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.1)
-
-        assert entity.hvac_action == HVACAction.IDLE
-
-        assert mock_service_call.call_count >= 1
-        mock_service_call.assert_has_calls(
-            [
-                call(
-                    "switch",
-                    "turn_off",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                )
-            ]
-        )
-
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": False},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 0
-        assert boiler_binary_sensor.state == STATE_OFF
-
-    entity.remove_thermostat()
-
-
-async def test_update_central_boiler_state_simple_climate(
-    hass: HomeAssistant,
-    # skip_hass_states_is_state,
-    init_central_config_with_boiler_fixture,
-):
-    """Test that the central boiler state behavoir"""
-
-    api = VersatileThermostatAPI.get_vtherm_api(hass)
-
-    climate1 = MockClimate(hass, "climate1", "theClimate1")
-
-    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
-    assert api.nb_active_device_for_boiler == 0
-
-    # Force the VTherm to heat
-    await entity.async_set_hvac_mode(HVACMode.HEAT)
-    await entity.async_set_preset_mode(PRESET_BOOST)
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    assert entity.hvac_mode == HVACMode.HEAT
-
-    boiler_binary_sensor: CentralBoilerBinarySensor = search_entity(
-        hass, "binary_sensor.central_boiler", "binary_sensor"
-    )
-    assert boiler_binary_sensor is not None
-    assert boiler_binary_sensor.state == STATE_OFF
-
-    # 1. start a climate
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await send_temperature_change_event(entity, 10, now)
-        # we have to simulate the climate also else the test don't work
-        climate1.set_hvac_mode(HVACMode.HEAT)
-        climate1.set_hvac_action(HVACAction.HEATING)
-        climate1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.5)
-
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count >= 1
-        mock_service_call.assert_has_calls(
-            [
-                call.service_call(
-                    "switch",
-                    "turn_on",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                ),
-            ]
-        )
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": True},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 1
-        assert boiler_binary_sensor.state == STATE_ON
-
-    # 2. stop a climate
-    with patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "custom_components.versatile_thermostat.binary_sensor.send_vtherm_event"
-    ) as mock_send_event:
-        await send_temperature_change_event(entity, 25, now)
-        climate1.set_hvac_mode(HVACMode.HEAT)
-        climate1.set_hvac_action(HVACAction.IDLE)
-        climate1.async_write_ha_state()
-        # Wait for state event propagation
-        await asyncio.sleep(0.5)
-
-        assert entity.hvac_action == HVACAction.IDLE
-
-        assert mock_service_call.call_count >= 1
-        mock_service_call.assert_has_calls(
-            [
-                call(
-                    "switch",
-                    "turn_off",
-                    service_data={},
-                    target={"entity_id": "switch.pompe_chaudiere"},
-                )
-            ]
-        )
-
-        assert mock_send_event.call_count >= 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_vtherm_event(
-                    hass=hass,
-                    event_type=EventType.CENTRAL_BOILER_EVENT,
-                    entity=api.central_boiler_entity,
-                    data={"central_boiler": False},
-                )
-            ]
-        )
-
-        assert api.nb_active_device_for_boiler == 0
-        assert boiler_binary_sensor.state == STATE_OFF
-
-    entity.remove_thermostat()
--- a/tests/test_central_config.py
+++ b/tests/test_central_config.py
@@ -31,8 +31,8 @@ from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-impor
 from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import


-# @pytest.mark.parametrize("expected_lingering_tasks", [True])
-# @pytest.mark.parametrize("expected_lingering_timers", [True])
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_add_a_central_config(hass: HomeAssistant, skip_hass_states_is_state):
    """Tests the clean_central_config_doubon of base_thermostat"""
    central_config_entry = MockConfigEntry(
@@ -76,7 +76,6 @@ async def test_add_a_central_config(hass: HomeAssistant, skip_hass_states_is_sta
            CONF_SECURITY_DELAY_MIN: 61,
            CONF_SECURITY_MIN_ON_PERCENT: 0.5,
            CONF_SECURITY_DEFAULT_ON_PERCENT: 0.2,
-            CONF_ADD_CENTRAL_BOILER_CONTROL: False,
        },
    )

@@ -97,15 +96,8 @@ async def test_add_a_central_config(hass: HomeAssistant, skip_hass_states_is_sta
    central_configuration = api.find_central_configuration()
    assert central_configuration is not None

-    # Test that VTherm API doesn't have any central boiler entities
-    assert api.nb_active_device_for_boiler_entity is None
-    assert api.nb_active_device_for_boiler is None

-    assert api.nb_active_device_for_boiler_threshold_entity is None
-    assert api.nb_active_device_for_boiler_threshold is None
-
-
-# @pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_minimal_over_switch_wo_central_config(
    hass: HomeAssistant, skip_hass_states_is_state, init_vtherm_api
@@ -124,7 +116,6 @@ async def test_minimal_over_switch_wo_central_config(
            CONF_CYCLE_MIN: 5,
            CONF_TEMP_MIN: 8,
            CONF_TEMP_MAX: 18,
-            CONF_STEP_TEMPERATURE: 0.3,
            "frost_temp": 10,
            "eco_temp": 17,
            "comfort_temp": 18,
@@ -166,9 +157,8 @@ async def test_minimal_over_switch_wo_central_config(
        assert entity._temp_sensor_entity_id == "sensor.mock_temp_sensor"
        assert entity._ext_temp_sensor_entity_id == "sensor.mock_ext_temp_sensor"
        assert entity._cycle_min == 5
-        assert entity.min_temp == 8
-        assert entity.max_temp == 18
-        assert entity.target_temperature_step == 0.3
+        assert entity._attr_min_temp == 8
+        assert entity._attr_max_temp == 18
        assert entity.preset_modes == ["none", "frost", "eco", "comfort", "boost"]
        assert entity.is_window_auto_enabled is False
        assert entity.nb_underlying_entities == 1
@@ -182,11 +172,9 @@ async def test_minimal_over_switch_wo_central_config(
        assert entity._security_default_on_percent == 0.1
        assert entity.is_inversed

-    entity.remove_thermostat()

-
-# @pytest.mark.parametrize("expected_lingering_tasks", [True])
-# @pytest.mark.parametrize("expected_lingering_timers", [True])
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_full_over_switch_wo_central_config(
    hass: HomeAssistant, skip_hass_states_is_state, init_vtherm_api
 ):
@@ -204,7 +192,6 @@ async def test_full_over_switch_wo_central_config(
            CONF_CYCLE_MIN: 5,
            CONF_TEMP_MIN: 8,
            CONF_TEMP_MAX: 18,
-            CONF_STEP_TEMPERATURE: 0.3,
            "frost_temp": 10,
            "eco_temp": 17,
            "comfort_temp": 18,
@@ -260,9 +247,8 @@ async def test_full_over_switch_wo_central_config(
        assert entity._temp_sensor_entity_id == "sensor.mock_temp_sensor"
        assert entity._ext_temp_sensor_entity_id == "sensor.mock_ext_temp_sensor"
        assert entity._cycle_min == 5
-        assert entity.min_temp == 8
-        assert entity.max_temp == 18
-        assert entity.target_temperature_step == 0.3
+        assert entity._attr_min_temp == 8
+        assert entity._attr_max_temp == 18
        assert entity.preset_modes == [
            "none",
            "frost",
@@ -300,11 +286,9 @@ async def test_full_over_switch_wo_central_config(

        assert entity._presence_sensor_entity_id == "binary_sensor.mock_presence_sensor"

-    entity.remove_thermostat()

-
-# @pytest.mark.parametrize("expected_lingering_tasks", [True])
-# @pytest.mark.parametrize("expected_lingering_timers", [True])
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_full_over_switch_with_central_config(
    hass: HomeAssistant, skip_hass_states_is_state, init_central_config
 ):
@@ -322,7 +306,6 @@ async def test_full_over_switch_with_central_config(
            CONF_CYCLE_MIN: 5,
            CONF_TEMP_MIN: 8,
            CONF_TEMP_MAX: 18,
-            CONF_STEP_TEMPERATURE: 0.3,
            "frost_temp": 10,
            "eco_temp": 17,
            "comfort_temp": 18,
@@ -374,9 +357,8 @@ async def test_full_over_switch_with_central_config(
        assert entity._temp_sensor_entity_id == "sensor.mock_temp_sensor"
        assert entity._ext_temp_sensor_entity_id == "sensor.mock_ext_temp_sensor"
        assert entity._cycle_min == 5
-        assert entity.min_temp == 15
-        assert entity.max_temp == 30
-        assert entity.target_temperature_step == 0.1
+        assert entity._attr_min_temp == 15
+        assert entity._attr_max_temp == 30
        assert entity.preset_modes == [
            "none",
            "frost",
@@ -414,11 +396,9 @@ async def test_full_over_switch_with_central_config(

        assert entity._presence_sensor_entity_id == "binary_sensor.mock_presence_sensor"

-    entity.remove_thermostat()

-
-# @pytest.mark.parametrize("expected_lingering_tasks", [True])
-# @pytest.mark.parametrize("expected_lingering_timers", [True])
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_over_switch_with_central_config_but_no_central_config(
    hass: HomeAssistant, skip_hass_states_get, init_vtherm_api
 ):
--- a/tests/test_valve.py
+++ b/tests/test_valve.py
@@ -1,4 +1,4 @@
-# pylint: disable=line-too-long, disable=protected-access
+# pylint: disable=line-too-long

 """ Test the normal start of a Switch AC Thermostat """
 from unittest.mock import patch, call
@@ -324,232 +324,3 @@ async def test_over_valve_full_start(
            assert entity.hvac_action is HVACAction.HEATING
            assert entity.target_temperature == 17.1  # eco
            assert entity.valve_open_percent == 10
-
-
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_over_valve_regulation(
-    hass: HomeAssistant, skip_hass_states_is_state
-):  # pylint: disable=unused-argument
-    """Test the normal full start of a thermostat in thermostat_over_switch type"""
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="TheOverValveMockName",
-        unique_id="uniqueId",
-        data={
-            CONF_NAME: "TheOverValveMockName",
-            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_VALVE,
-            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
-            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
-            CONF_VALVE: "number.mock_valve",
-            CONF_CYCLE_MIN: 5,
-            CONF_TEMP_MIN: 15,
-            CONF_TEMP_MAX: 30,
-            PRESET_FROST_PROTECTION + "_temp": 7,
-            PRESET_ECO + "_temp": 17,
-            PRESET_COMFORT + "_temp": 19,
-            PRESET_BOOST + "_temp": 21,
-            CONF_USE_WINDOW_FEATURE: False,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_PRESENCE_FEATURE: False,
-            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: 60,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            # only send new valve open percent if dtemp is > 30%
-            CONF_AUTO_REGULATION_DTEMP: 5,
-            # only send new valve open percent last mesure was more than 5 min ago
-            CONF_AUTO_REGULATION_PERIOD_MIN: 5,
-        },
-    )
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    # 1. prepare the Valve at now
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event:
-        entity: ThermostatOverValve = await create_thermostat(
-            hass, entry, "climate.theovervalvemockname"
-        )
-        assert entity
-        assert isinstance(entity, ThermostatOverValve)
-
-        assert entity.name == "TheOverValveMockName"
-        assert entity.is_over_valve is True
-        assert entity._auto_regulation_dpercent == 5
-        assert entity._auto_regulation_period_min == 5
-        assert entity.target_temperature == entity.min_temp
-        assert entity._prop_algorithm is not None
-
-    # 2. Set the HVACMode to HEAT, with manual preset and target_temp to 18 before receiving temperature
-    # at now +1
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event:
-        now = now + timedelta(minutes=1)
-        entity._set_now(now)
-
-        # Select a hvacmode, presence and preset
-        await entity.async_set_hvac_mode(HVACMode.HEAT)
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No heating now
-        assert entity.valve_open_percent == 0
-        assert entity.hvac_action == HVACAction.IDLE
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.HVAC_MODE_EVENT,
-                    {"hvac_mode": HVACMode.HEAT},
-                ),
-            ]
-        )
-
-    # 3. Set the preset
-    # at now +1
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event:
-        now = now + timedelta(minutes=1)
-        entity._set_now(now)
-
-        # set preset
-        await entity.async_set_preset_mode(PRESET_BOOST)
-        assert entity.preset_mode == PRESET_BOOST
-        assert entity.target_temperature == 21
-        # the preset have changed
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.PRESET_EVENT,
-                    {"preset": PRESET_BOOST},
-                ),
-            ]
-        )
-
-        await entity.async_set_hvac_mode(HVACMode.HEAT)
-        assert entity.hvac_mode is HVACMode.HEAT
-        # Still no heating because we don't have temperature
-        assert entity.valve_open_percent == 0
-        assert entity.hvac_action == HVACAction.IDLE
-
-    # 4. Set temperature and external temperature
-    # at now + 1 (but the _last_calculation_timestamp is still not send)
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="number.mock_valve", state="90"),
-    ):
-        # Change temperature
-        now = now + timedelta(minutes=1)
-        entity._set_now(now)
-
-        await send_temperature_change_event(entity, 18, now)
-        assert entity.valve_open_percent == 90
-
-        assert entity.is_device_active is True
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count == 1
-        mock_service_call.assert_has_calls(
-            [
-                call.async_call(
-                    "number",
-                    "set_value",
-                    {"entity_id": "number.mock_valve", "value": 90},
-                ),
-            ]
-        )
-
-        assert mock_send_event.call_count == 0
-
-    # 5. Set external temperature
-    # at now + 1
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="number.mock_valve", state="90"),
-    ):
-        # Change external temperature
-        now = now + timedelta(minutes=1)
-        entity._set_now(now)
-
-        await send_ext_temperature_change_event(entity, 10, now)
-
-        # Should not have change due to regulation (period_min !)
-        assert entity.valve_open_percent == 90
-        assert entity.is_device_active is True
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count == 0
-        assert mock_send_event.call_count == 0
-
-    # 6. Set temperature
-    # at now + 5 (to avoid the period_min threshold)
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="number.mock_valve", state="90"),
-    ):
-        # Change external temperature
-        now = now + timedelta(minutes=5)
-        entity._set_now(now)
-
-        await send_ext_temperature_change_event(entity, 15, now)
-
-        # Should have change this time to 96
-        assert entity.valve_open_percent == 96
-        assert entity.is_device_active is True
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count == 1
-        mock_service_call.assert_has_calls(
-            [
-                call.async_call(
-                    "number",
-                    "set_value",
-                    {"entity_id": "number.mock_valve", "value": 96},
-                ),
-            ]
-        )
-        assert mock_send_event.call_count == 0
-
-    # 7. Set small temperature update to test dtemp threshold
-    # at now + 5
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.core.ServiceRegistry.async_call"
-    ) as mock_service_call, patch(
-        "homeassistant.core.StateMachine.get",
-        return_value=State(entity_id="number.mock_valve", state="96"),
-    ):
-        # Change external temperature
-        now = now + timedelta(minutes=5)
-        entity._set_now(now)
-
-        # this generate a delta percent of -3
-        await send_temperature_change_event(entity, 18.1, now)
-
-        # Should not have due to dtemp
-        assert entity.valve_open_percent == 96
-        assert entity.is_device_active is True
-        assert entity.hvac_action == HVACAction.HEATING
-
-        assert mock_service_call.call_count == 0
-        assert mock_send_event.call_count == 0
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -6,9 +6,6 @@ from unittest.mock import patch, call, PropertyMock
 from datetime import datetime, timedelta

 from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
-from custom_components.versatile_thermostat.thermostat_climate import (
-    ThermostatOverClimate,
-)
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import

 logging.getLogger().setLevel(logging.DEBUG)
@@ -49,7 +46,6 @@ async def test_window_management_time_not_enough(
            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
            CONF_WINDOW_SENSOR: "binary_sensor.mock_window_sensor",
            CONF_WINDOW_DELAY: 0,  # important to not been obliged to wait
-            CONF_WINDOW_ACTION: CONF_WINDOW_TURN_OFF,
        },
    )

@@ -138,7 +134,6 @@ async def test_window_management_time_enough(
            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
            CONF_WINDOW_SENSOR: "binary_sensor.mock_window_sensor",
            CONF_WINDOW_DELAY: 0,  # important to not been obliged to wait
-            CONF_WINDOW_ACTION: CONF_WINDOW_TURN_OFF,
        },
    )

@@ -247,7 +242,7 @@ async def test_window_management_time_enough(
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
-    """Test the auto Window management with fast slope down"""
+    """Test the Window management"""

    entry = MockConfigEntry(
        domain=DOMAIN,
@@ -827,6 +822,7 @@ async def test_window_auto_no_on_percent(
    entity.remove_thermostat()


+# PR - Adding Window Bypass
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_window_bypass(hass: HomeAssistant, skip_hass_states_is_state):
@@ -1211,694 +1207,3 @@ async def test_window_bypass_reactivate(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_window_action_fan_only(hass: HomeAssistant, skip_hass_states_is_state):
-    """Test the Window management with the fan_only option"""
-
-    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: True,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_CLIMATE: "climate.mock_climate",
-            CONF_SECURITY_DELAY_MIN: 5,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            CONF_WINDOW_SENSOR: "binary_sensor.mock_window_sensor",
-            CONF_WINDOW_DELAY: 1,
-            CONF_WINDOW_ACTION: CONF_WINDOW_FAN_ONLY,
-            # CONF_WINDOW_AUTO_OPEN_THRESHOLD: 6,
-            # CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 6,
-            # CONF_WINDOW_AUTO_MAX_DURATION: 1,  # 0 will deactivate window auto detection
-        },
-    )
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    fake_underlying_climate = MockClimate(
-        hass=hass,
-        unique_id="mockUniqueId",
-        name="MockClimateName",
-        hvac_modes=[HVACMode.HEAT, HVACMode.COOL, HVACMode.FAN_ONLY],
-    )
-
-    # 1. intialize climate entity
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ):
-        entry.add_to_hass(hass)
-        await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.LOADED
-
-        entity: ThermostatOverClimate = search_entity(
-            hass, "climate.theoverclimatemockname", "climate"
-        )
-
-        assert entity
-
-        assert entity.is_over_climate is True
-        assert entity.window_action == CONF_WINDOW_FAN_ONLY
-
-        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
-        assert entity.target_temperature == 18
-
-        assert entity.window_state is STATE_OFF
-
-    # 2. Open the window, condition of time is satisfied, check the thermostat and heater turns off
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ), patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
-    ) as mock_underlying_set_hvac_mode:
-        event_timestamp = now - timedelta(minutes=2)
-        try_window_condition = await send_window_change_event(
-            entity, True, False, event_timestamp
-        )
-        await try_window_condition(None)
-
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.FAN_ONLY}
-                )
-            ]
-        )
-
-        # The underlying should be in OFF hvac_mode
-        assert mock_underlying_set_hvac_mode.call_count == 1
-        mock_underlying_set_hvac_mode.assert_has_calls(
-            [
-                call.set_hvac_mode(HVACMode.FAN_ONLY),
-            ]
-        )
-
-        assert entity.window_state == STATE_ON
-        # 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.preset_mode is PRESET_COMFORT
-
-    # 3. Close the window
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ), patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
-    ) as mock_underlying_set_hvac_mode:
-        event_timestamp = now - timedelta(minutes=1)
-        try_function = await send_window_change_event(
-            entity, False, True, event_timestamp, sleep=False
-        )
-
-        await try_function(None)
-
-        # Wait for initial delay of heater
-        await asyncio.sleep(0.3)
-
-        assert entity.window_state == STATE_OFF
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.HEAT}
-                ),
-            ],
-            any_order=False,
-        )
-
-        # The underlying should be in OFF hvac_mode
-        assert mock_underlying_set_hvac_mode.call_count == 1
-        mock_underlying_set_hvac_mode.assert_has_calls(
-            [
-                call.set_hvac_mode(HVACMode.HEAT),
-            ]
-        )
-        assert entity.hvac_mode is HVACMode.HEAT
-        assert entity.preset_mode is PRESET_COMFORT
-
-    # Clean the entity
-    entity.remove_thermostat()
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_window_action_fan_only_ko(
-    hass: HomeAssistant, skip_hass_states_is_state
-):
-    """Test the Window management with the fan_only option but the underlyings doesn't have the FAN_ONLY mode
-    So the VTherm switch to OFF which is the fallback mode"""
-
-    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: True,
-            CONF_USE_MOTION_FEATURE: False,
-            CONF_USE_POWER_FEATURE: False,
-            CONF_USE_PRESENCE_FEATURE: False,
-            CONF_CLIMATE: "climate.mock_climate",
-            CONF_SECURITY_DELAY_MIN: 5,
-            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
-            CONF_WINDOW_SENSOR: "binary_sensor.mock_window_sensor",
-            CONF_WINDOW_DELAY: 1,
-            CONF_WINDOW_ACTION: CONF_WINDOW_FAN_ONLY,
-            # CONF_WINDOW_AUTO_OPEN_THRESHOLD: 6,
-            # CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 6,
-            # CONF_WINDOW_AUTO_MAX_DURATION: 1,  # 0 will deactivate window auto detection
-        },
-    )
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now: datetime = datetime.now(tz=tz)
-
-    fake_underlying_climate = MockClimate(
-        hass=hass,
-        unique_id="mockUniqueId",
-        name="MockClimateName",
-        hvac_modes=[HVACMode.HEAT, HVACMode.COOL, HVACMode.AUTO],
-    )
-
-    # 1. intialize climate entity
-    with patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
-        return_value=fake_underlying_climate,
-    ):
-        entry.add_to_hass(hass)
-        await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.LOADED
-
-        entity: ThermostatOverClimate = search_entity(
-            hass, "climate.theoverclimatemockname", "climate"
-        )
-
-        assert entity
-
-        assert entity.is_over_climate is True
-        assert entity.window_action == CONF_WINDOW_FAN_ONLY
-
-        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
-        assert entity.target_temperature == 18
-
-        assert entity.window_state is STATE_OFF
-
-    # 2. Open the window, condition of time is satisfied, check the thermostat and heater turns off
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ), patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
-    ) as mock_underlying_set_hvac_mode:
-        event_timestamp = now - timedelta(minutes=2)
-        try_window_condition = await send_window_change_event(
-            entity, True, False, event_timestamp
-        )
-        await try_window_condition(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})]
-        )
-
-        assert entity.window_state == STATE_ON
-        assert entity.hvac_mode is HVACMode.OFF
-        # The underlying should be in OFF hvac_mode
-        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._saved_hvac_mode is HVACMode.HEAT
-        assert entity.preset_mode is PRESET_COMFORT
-
-    # 3. Close the window
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "homeassistant.helpers.condition.state", return_value=True
-    ), patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
-    ) as mock_underlying_set_hvac_mode:
-        event_timestamp = now - timedelta(minutes=1)
-        try_function = await send_window_change_event(
-            entity, False, True, event_timestamp, sleep=False
-        )
-
-        await try_function(None)
-
-        # Wait for initial delay of heater
-        await asyncio.sleep(0.3)
-
-        assert entity.window_state == STATE_OFF
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.HVAC_MODE_EVENT, {"hvac_mode": HVACMode.HEAT}
-                ),
-            ],
-            any_order=False,
-        )
-
-        # The underlying should be in OFF hvac_mode
-        assert mock_underlying_set_hvac_mode.call_count == 1
-        mock_underlying_set_hvac_mode.assert_has_calls(
-            [
-                call.set_hvac_mode(HVACMode.HEAT),
-            ]
-        )
-        assert entity.hvac_mode is HVACMode.HEAT
-        assert entity.preset_mode is PRESET_COMFORT
-
-    # Clean the entity
-    entity.remove_thermostat()
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_window_action_eco_temp(hass: HomeAssistant, skip_hass_states_is_state):
-    """Test the Window management with the eco_temp option"""
-
-    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": 21,
-            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.3,
-            CONF_WINDOW_AUTO_OPEN_THRESHOLD: 0.1,
-            CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 0.1,
-            CONF_WINDOW_AUTO_MAX_DURATION: 10,  # Should be 0 for test
-            CONF_WINDOW_ACTION: CONF_WINDOW_ECO_TEMP,
-        },
-    )
-
-    entity: BaseThermostat = await create_thermostat(
-        hass, entry, "climate.theoverswitchmockname"
-    )
-    assert entity
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now = datetime.now(tz)
-
-    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.overpowering_state is None
-    assert entity.target_temperature == 21
-
-    assert entity.window_state is STATE_OFF
-    assert entity.is_window_auto_enabled is True
-
-    # 1. Initialize the slope algo with 2 measurements
-    event_timestamp = now + timedelta(minutes=1)
-    await send_temperature_change_event(entity, 19, event_timestamp)
-    event_timestamp = event_timestamp + timedelta(minutes=1)
-    await send_temperature_change_event(entity, 19, event_timestamp)
-    event_timestamp = event_timestamp + timedelta(minutes=1)
-    await send_temperature_change_event(entity, 19, event_timestamp)
-
-    # 2. Make the temperature 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(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=True,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 19, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 0
-        assert entity.is_device_active is True
-        assert entity.hvac_mode is HVACMode.HEAT
-        assert entity.window_state is STATE_OFF
-        assert entity.window_auto_state is STATE_OFF
-
-    # 3. send one degre down in one minute
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=True,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 18, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 1
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 0
-        assert entity.last_temperature_slope == -6.24
-        assert entity.window_auto_state == STATE_ON
-        assert entity.window_state == STATE_OFF
-        # No change on HVACMode
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No change on preset
-        assert entity.preset_mode is PRESET_BOOST
-        # The eco temp
-        assert entity.target_temperature == 17
-
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.WINDOW_AUTO_EVENT,
-                    {"type": "start", "cause": "slope alert", "curve_slope": -6.24},
-                ),
-            ],
-            any_order=True,
-        )
-
-    # 4. send another 0.1 degre in one minute -> no change
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
-        return_value=False,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 17.9, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 0
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 0
-        assert round(entity.last_temperature_slope, 3) == -7.49
-        assert entity.window_auto_state == STATE_ON
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No change on preset
-        assert entity.preset_mode is PRESET_BOOST
-        # The eco temp
-        assert entity.target_temperature == 17
-
-    # 5. send another plus 1.1 degre in one minute -> restore state
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
-        return_value=False,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 19, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.WINDOW_AUTO_EVENT,
-                    {
-                        "type": "end",
-                        "cause": "end of slope alert",
-                        "curve_slope": 0.42,
-                    },
-                ),
-            ],
-            any_order=True,
-        )
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 0
-        assert entity.last_temperature_slope == 0.42
-        assert entity.window_auto_state == STATE_OFF
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No change on preset
-        assert entity.preset_mode is PRESET_BOOST
-        # The eco temp
-        assert entity.target_temperature == 21
-
-    # Clean the entity
-    entity.remove_thermostat()
-
-
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_window_action_frost_temp(hass: HomeAssistant, skip_hass_states_is_state):
-    """Test the Window management with the frost_temp option"""
-
-    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": 21,
-            "frost_temp": 10,
-            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.3,
-            CONF_WINDOW_AUTO_OPEN_THRESHOLD: 0.1,
-            CONF_WINDOW_AUTO_CLOSE_THRESHOLD: 0.1,
-            CONF_WINDOW_AUTO_MAX_DURATION: 10,  # Should be 0 for test
-            CONF_WINDOW_ACTION: CONF_WINDOW_FROST_TEMP,
-        },
-    )
-
-    entity: BaseThermostat = await create_thermostat(
-        hass, entry, "climate.theoverswitchmockname"
-    )
-    assert entity
-
-    tz = get_tz(hass)  # pylint: disable=invalid-name
-    now = datetime.now(tz)
-
-    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.overpowering_state is None
-    assert entity.target_temperature == 21
-
-    assert entity.window_state is STATE_OFF
-    assert entity.is_window_auto_enabled is True
-
-    # 1. Initialize the slope algo with 2 measurements
-    event_timestamp = now + timedelta(minutes=1)
-    await send_temperature_change_event(entity, 19, event_timestamp)
-    event_timestamp = event_timestamp + timedelta(minutes=1)
-    await send_temperature_change_event(entity, 19, event_timestamp)
-    event_timestamp = event_timestamp + timedelta(minutes=1)
-    await send_temperature_change_event(entity, 19, event_timestamp)
-
-    # 2. Make the temperature 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(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=True,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 19, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 0
-        assert entity.is_device_active is True
-        assert entity.hvac_mode is HVACMode.HEAT
-        assert entity.window_state is STATE_OFF
-        assert entity.window_auto_state is STATE_OFF
-
-    # 3. send one degre down in one minute
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=True,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 18, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 1
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 0
-        assert entity.last_temperature_slope == -6.24
-        assert entity.window_auto_state == STATE_ON
-        assert entity.window_state == STATE_OFF
-        # No change on HVACMode
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No change on preset
-        assert entity.preset_mode is PRESET_BOOST
-        # The eco temp
-        assert entity.target_temperature == 10
-
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.WINDOW_AUTO_EVENT,
-                    {"type": "start", "cause": "slope alert", "curve_slope": -6.24},
-                ),
-            ],
-            any_order=True,
-        )
-
-    # 4. send another 0.1 degre in one minute -> no change
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
-        return_value=False,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 17.9, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 0
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 0
-        assert round(entity.last_temperature_slope, 3) == -7.49
-        assert entity.window_auto_state == STATE_ON
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No change on preset
-        assert entity.preset_mode is PRESET_BOOST
-        # The eco temp
-        assert entity.target_temperature == 10
-
-    # 5. send another plus 1.1 degre in one minute -> restore state
-    with patch(
-        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
-    ) as mock_send_event, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-    ) as mock_heater_on, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
-    ) as mock_heater_off, patch(
-        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        new_callable=PropertyMock,
-        return_value=False,
-    ):
-        event_timestamp = event_timestamp + timedelta(minutes=1)
-        await send_temperature_change_event(entity, 19, event_timestamp)
-
-        # The heater turns on
-        assert mock_send_event.call_count == 1
-        mock_send_event.assert_has_calls(
-            [
-                call.send_event(
-                    EventType.WINDOW_AUTO_EVENT,
-                    {
-                        "type": "end",
-                        "cause": "end of slope alert",
-                        "curve_slope": 0.42,
-                    },
-                ),
-            ],
-            any_order=True,
-        )
-        assert mock_heater_on.call_count == 0
-        assert mock_heater_off.call_count == 0
-        assert entity.last_temperature_slope == 0.42
-        assert entity.window_auto_state == STATE_OFF
-        assert entity.hvac_mode is HVACMode.HEAT
-        # No change on preset
-        assert entity.preset_mode is PRESET_BOOST
-        # The eco temp
-        assert entity.target_temperature == 21
-
-    # Clean the entity
-    entity.remove_thermostat()
Author	SHA1	Message	Date
Jean-Marc Collin	67844d4ae8	FIX #341 - when window state change, open_valve_percent should be resend	2024-01-14 23:02:23 +00:00
Jean-Marc Collin	513e65f79c	Add events in README	2024-01-14 16:50:59 +00:00
Jean-Marc Collin	31f782ffa3	Documentation and release.	2024-01-14 16:44:38 +00:00
Jean-Marc Collin	2831257732	Full featured but without testu	2024-01-14 12:37:09 +00:00
Jean-Marc Collin	0343d0f0e8	Fonctional before testu. Miss the service call	2024-01-14 00:33:52 +00:00
Jean-Marc Collin	208c80752c	Creation of the central boiler config + binary_sensor entity	2024-01-13 17:46:41 +00:00