Add _entity_component_unrecorded_attributes to exclude attributes from record

Removes old docs
Feature 131 control trv valve (#139 )
2023-10-28 18:04:51 +02:00 · 2023-10-28 11:30:49 +02:00 · 2023-10-28 11:30:14 +02:00 · 2023-10-22 09:59:29 +02:00 · 2023-10-22 00:17:32 +02:00 · 2023-10-21 22:13:25 +00:00
60 changed files with 6322 additions and 3263 deletions
--- a/.bashrc
+++ b/.bashrc
@@ -1,6 +1,4 @@

 echo "Sourcing .bashrc"
 alias ll='ls -l'
-export HA='/home/vscode/core'
-cd $HA
-source venv/bin/activate
+# source venv/bin/activate
--- a/.devcontainer/configuration.yaml
+++ b/.devcontainer/configuration.yaml
@@ -1,196 +1,221 @@
 default_config:

 logger:
-  default: info
-  logs:
-    custom_components.versatile_thermostat: info
-    custom_components.versatile_thermostat.underlyings: debug
-    custom_components.versatile_thermostat.climate: debug
+    default: info
+    logs:
+        custom_components.versatile_thermostat: debug
+        custom_components.versatile_thermostat.underlyings: debug
+        custom_components.versatile_thermostat.climate: debug

 # If you need to debug uncommment the line below (doc: https://www.home-assistant.io/integrations/debugpy/)
 debugpy:
-  start: true
-  wait: false
-  port: 5678
+    start: true
+    wait: false
+    port: 5678

 input_number:
-  fake_temperature_sensor1:
-    name: Temperature
-    min: 0
-    max: 35
-    step: .1
-    icon: mdi:thermometer
-    unit_of_measurement: °C
-    mode: box
-  fake_external_temperature_sensor1:
-    name: Ext Temperature
-    min: -10
-    max: 35
-    step: .1
-    icon: mdi:home-thermometer
-    unit_of_measurement: °C
-    mode: box
-  fake_current_power:
-    name: Current power
-    min: 0
-    max: 1000
-    step: 10
-    icon: mdi:flash
-    unit_of_measurement: kW
-  fake_current_power_max:
-    name: Current power max threshold
-    min: 0
-    max: 1000
-    step: 10
-    icon: mdi:flash
-    unit_of_measurement: kW
+    fake_temperature_sensor1:
+        name: Temperature
+        min: 0
+        max: 35
+        step: .1
+        icon: mdi:thermometer
+        unit_of_measurement: °C
+        mode: box
+    fake_external_temperature_sensor1:
+        name: Ext Temperature
+        min: -10
+        max: 35
+        step: .1
+        icon: mdi:home-thermometer
+        unit_of_measurement: °C
+        mode: box
+    fake_current_power:
+        name: Current power
+        min: 0
+        max: 1000
+        step: 10
+        icon: mdi:flash
+        unit_of_measurement: kW
+    fake_current_power_max:
+        name: Current power max threshold
+        min: 0
+        max: 1000
+        step: 10
+        icon: mdi:flash
+        unit_of_measurement: kW
+    fake_valve1:
+        name: The valve 1
+        min: 0
+        max: 100
+        icon: mdi:pipe-valve
+        unit_of_measurement: percentage

 input_boolean:
-  # input_boolean to simulate the windows entity. Only for development environment.
-  fake_window_sensor1:
-    name: Window 1
-    icon: mdi:window-closed-variant
-  # input_boolean to simulate the heater entity switch. Only for development environment.
-  fake_heater_switch3:
-    name: Heater 3
-    icon: mdi:radiator
-  fake_heater_switch2:
-    name: Heater 2
-    icon: mdi:radiator
-  fake_heater_switch1:
-    name: Heater 1
-    icon: mdi:radiator
-  fake_heater_4switch1:
-    name: Heater (multiswitch1)
-    icon: mdi:radiator
-  fake_heater_4switch2:
-    name: Heater (multiswitch2)
-    icon: mdi:radiator
-  fake_heater_4switch3:
-    name: Heater (multiswitch3)
-    icon: mdi:radiator
-  fake_heater_4switch4:
-    name: Heater (multiswitch4)
-    icon: mdi:radiator
-  # input_boolean to simulate the motion sensor entity. Only for development environment.
-  fake_motion_sensor1:
-    name: Motion Sensor 1
-    icon: mdi:run
-  # input_boolean to simulate the presence sensor entity. Only for development environment.
-  fake_presence_sensor1:
-    name: Presence Sensor 1
-    icon: mdi:home
+    # input_boolean to simulate the windows entity. Only for development environment.
+    fake_window_sensor1:
+        name: Window 1
+        icon: mdi:window-closed-variant
+    # input_boolean to simulate the heater entity switch. Only for development environment.
+    fake_heater_switch3:
+        name: Heater 3
+        icon: mdi:radiator
+    fake_heater_switch2:
+        name: Heater 2
+        icon: mdi:radiator
+    fake_heater_switch1:
+        name: Heater 1
+        icon: mdi:radiator
+    fake_heater_ac1:
+        name: Air contionner 1
+        icon: mdi:air-conditioner
+    fake_heater_4switch1:
+        name: Heater (multiswitch1)
+        icon: mdi:radiator
+    fake_heater_4switch2:
+        name: Heater (multiswitch2)
+        icon: mdi:radiator
+    fake_heater_4switch3:
+        name: Heater (multiswitch3)
+        icon: mdi:radiator
+    fake_heater_4switch4:
+        name: Heater (multiswitch4)
+        icon: mdi:radiator
+    fake_heater_4climate1:
+        name: Heater (multiclimate1)
+        icon: mdi:radiator
+    fake_heater_4climate2:
+        name: Heater (multiclimate2)
+        icon: mdi:radiator
+    fake_heater_4climate3:
+        name: Heater (multiclimate3)
+        icon: mdi:radiator
+    fake_heater_4climate4:
+        name: Heater (multiclimate4)
+        icon: mdi:radiator
+    # input_boolean to simulate the motion sensor entity. Only for development environment.
+    fake_motion_sensor1:
+        name: Motion Sensor 1
+        icon: mdi:run
+    # input_boolean to simulate the presence sensor entity. Only for development environment.
+    fake_presence_sensor1:
+        name: Presence Sensor 1
+        icon: mdi:home

 climate:
-  - platform: generic_thermostat
-    name: Underlying thermostat1
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat2
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat3
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat4
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat5
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat6
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat7
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat8
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat9
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat1
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat2
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat3
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat4
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat 4-1
+      heater: input_boolean.fake_heater_4climate1
+      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false
+    - platform: generic_thermostat
+      name: Underlying thermostat 4-2
+      heater: input_boolean.fake_heater_4climate2
+      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false
+    - platform: generic_thermostat
+      name: Underlying thermostat 4-3
+      heater: input_boolean.fake_heater_4climate3
+      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false
+    - platform: generic_thermostat
+      name: Underlying thermostat 4-4
+      heater: input_boolean.fake_heater_4climate4
+      target_sensor: input_number.fake_temperature_sensor1
+      ac_mode: false
+    - platform: generic_thermostat
+      name: Underlying thermostat9
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1

 recorder:
-  include:
-    domains:
-      - input_boolean
-      - input_number
-      - switch
-      - climate
-      - sensor
+    include:
+        domains:
+            - input_boolean
+            - input_number
+            - switch
+            - climate
+            - sensor

 template:
-  - binary_sensor:
-      - name: maison_occupee
-        unique_id: maison_occupee
-        state: "{{is_state('person.jmc', 'home') }}"
-        device_class: occupancy
-  - sensor:
-      - name: "Total énergie switch1"
-        unique_id: total_energie_switch1
-        unit_of_measurement: "kWh"
-        device_class: energy
-        state_class: total_increasing
-        state: >
-          {% set energy = state_attr('climate.thermostat_switch_1', 'total_energy') %}
-          {% if energy == 'unavailable' or energy is none%}unavailable{% else %}
-            {{ ((energy | float) / 1.0) | round(2, default=0) }}
-          {% endif %}
-      - name: "Total énergie climate 2"
-        unique_id: total_energie_climate2
-        unit_of_measurement: "kWh"
-        device_class: energy
-        state_class: total_increasing
-        state: >
-          {% set energy = state_attr('climate.thermostat_climate_2', 'total_energy') %}
-          {% if energy == 'unavailable' or energy is none%}unavailable{% else %}
-            {{ ((energy | float) / 1.0) | round(2, default=0) }}
-          {% endif %}
-      - name: "Total énergie chambre"
-        unique_id: total_energie_chambre
-        unit_of_measurement: "kWh"
-        device_class: energy
-        state_class: total_increasing
-        state: >
-          {% set energy = state_attr('climate.thermostat_chambre', 'total_energy') %}
-          {% if energy == 'unavailable' or energy is none%}unavailable{% else %}
-            {{ ((energy | float) / 1.0) | round(2, default=0) }}
-          {% endif %}
+    - binary_sensor:
+          - name: maison_occupee
+            unique_id: maison_occupee
+            state: "{{is_state('person.jmc', 'home') }}"
+            device_class: occupancy
+    - sensor:
+          - name: "Total énergie switch1"
+            unique_id: total_energie_switch1
+            unit_of_measurement: "kWh"
+            device_class: energy
+            state_class: total_increasing
+            state: >
+                {% set energy = state_attr('climate.thermostat_switch_1', 'total_energy') | float(default=-1) %}
+                {% if energy < 0 %}{{none}}{% else %}
+                  {{ energy | round(2, default=0) }}
+                {% endif %}
+          - name: "Total énergie climate 2"
+            unique_id: total_energie_climate2
+            unit_of_measurement: "kWh"
+            device_class: energy
+            state_class: total_increasing
+            state: >
+                {% set energy = state_attr('climate.thermostat_climate_2', 'total_energy') | float(default=-1) %}
+                {% if energy < 0 %}{{none}}{% else %}
+                  {{ energy | round(2, default=0) }}
+                {% endif %}
+          - name: "Total énergie chambre"
+            unique_id: total_energie_chambre
+            unit_of_measurement: "kWh"
+            device_class: energy
+            state_class: total_increasing
+            state: >
+                {% set energy = state_attr('climate.thermostat_chambre', 'total_energy') | float(default=-1) %}
+                {% if energy < 0 %}{{none}}{% else %}
+                  {{ energy | round(2, default=0) }}
+                {% endif %}

 switch:
-  - platform: template
-    switches:
-      pilote_sdb_rdc:
-        friendly_name: "Pilote chauffage SDB RDC"
-        value_template: "{{ is_state_attr('switch_seche_serviettes_sdb_rdc', 'sensor_state', 'on') }}"
-        turn_on:
-          service: select.select_option
-          data:
-            option: comfort
-          target:
-            entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode
+    - platform: template
+      switches:
+          pilote_sdb_rdc:
+              friendly_name: "Pilote chauffage SDB RDC"
+              value_template: "{{ is_state_attr('switch_seche_serviettes_sdb_rdc', 'sensor_state', 'on') }}"
+              turn_on:
+                  service: select.select_option
+                  data:
+                      option: comfort
+                  target:
+                      entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode

-        turn_off:
-          service: select.select_option
-          data:
-            option: comfort-2
-          target:
-            entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode
+              turn_off:
+                  service: select.select_option
+                  data:
+                      option: comfort-2
+                  target:
+                      entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode

 frontend:
-  themes:
-    versatile_thermostat_theme:
-      state-binary_sensor-safety-on-color: "#FF0B0B"
-      state-binary_sensor-power-on-color: "#FF0B0B"
-      state-binary_sensor-window-on-color: "rgb(156, 39, 176)"
-      state-binary_sensor-motion-on-color: "rgb(156, 39, 176)"
-      state-binary_sensor-presence-on-color: "lightgreen"
+    themes:
+        versatile_thermostat_theme:
+            state-binary_sensor-safety-on-color: "#FF0B0B"
+            state-binary_sensor-power-on-color: "#FF0B0B"
+            state-binary_sensor-window-on-color: "rgb(156, 39, 176)"
+            state-binary_sensor-motion-on-color: "rgb(156, 39, 176)"
+            state-binary_sensor-presence-on-color: "lightgreen"
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,44 +1,54 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 // "image": "ghcr.io/ludeeus/devcontainer/integration:latest",
 {
-	"image": "mcr.microsoft.com/vscode/devcontainers/python:0-3.10",
+	"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
 	"name": "Versatile Thermostat integration",
-	"context": "..",
 	"appPort": [
-		"9123:8123"
+		"8123:8123"
 	],
 	// "postCreateCommand": "container install",
-	"postCreateCommand": "./container install",
-	"extensions": [
-		"ms-python.python",
-		"github.vscode-pull-request-github",
-		"ryanluker.vscode-coverage-gutters",
-		"ms-python.vscode-pylance"
-	],
+	"postCreateCommand": "./container dev-setup",
+
 	"mounts": [
-		"source=/Users/jmcollin/SugarSync/Projets/home-assistant/core,target=/home/vscode/core,type=bind,consistency=cached",
-		"source=${localWorkspaceFolder}/.devcontainer/configuration.yaml,target=/home/vscode/core/config/configuration.yaml,type=bind,consistency=cached",
-		"source=${localWorkspaceFolder}/custom_components,target=/home/vscode/core/config/custom_components,type=bind,consistency=cached"
+		"source=/Users/jmcollin/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
 	],
-	"settings": {
-		"files.eol": "\n",
-		"editor.tabSize": 4,
-		"terminal.integrated.profiles.linux": {
-			"Bash Profile": {
-				"path": "bash",
-				"args": []
+
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-python.python",
+				"github.vscode-pull-request-github",
+				"ryanluker.vscode-coverage-gutters",
+				"ms-python.vscode-pylance"
+			],
+			// "mounts": [
+			//	"source=${localWorkspaceFolder}/.devcontainer/configuration.yaml,target=/home/vscode/core/config/configuration.yaml,type=bind,consistency=cached",
+			//	"source=${localWorkspaceFolder}/custom_components,target=/home/vscode/core/config/custom_components,type=bind,consistency=cached"
+			// ],
+			"settings": {
+				"files.eol": "\n",
+				"editor.tabSize": 4,
+				"terminal.integrated.profiles.linux": {
+					"bash": {
+						"path": "bash",
+						"args": []
+					}
+				},
+				"terminal.integrated.defaultProfile.linux": "bash",
+				// "terminal.integrated.shell.linux": "/bin/bash",
+				"python.pythonPath": "/usr/bin/python3",
+				"python.analysis.autoSearchPaths": true,
+				"python.linting.pylintEnabled": true,
+				"python.linting.enabled": true,
+				"python.formatting.provider": "black",
+				"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+				"editor.formatOnPaste": false,
+				"editor.formatOnSave": true,
+				"editor.formatOnType": true,
+				"files.trimTrailingWhitespace": true,
+				"python.experiments.optOutFrom": ["pythonTestAdapter"],
+    			"python.analysis.logLevel": "Trace"
 			}
-		},
-		"terminal.integrated.defaultProfile.linux": "Bash Profile",
-		// "terminal.integrated.shell.linux": "/bin/bash",
-		"python.pythonPath": "/usr/bin/python3",
-		"python.analysis.autoSearchPaths": true,
-		"python.linting.pylintEnabled": true,
-		"python.linting.enabled": true,
-		"python.formatting.provider": "black",
-		"editor.formatOnPaste": false,
-		"editor.formatOnSave": true,
-		"editor.formatOnType": true,
-		"files.trimTrailingWhitespace": true
+		}
 	}
 }
--- a/.github/workflows/pull.yml
+++ b/.github/workflows/pull.yml
@@ -31,6 +31,8 @@ jobs:
        - run: black .

  tests:
+    # Tests don't run in Gitlab ci environment
+    if: 0
    runs-on: "ubuntu-latest"
    name: Run tests
    steps:
@@ -41,10 +43,10 @@ jobs:
        with:
          python-version: "3.8"
      - name: Install requirements
-        run: python3 -m pip install -r requirements_test.txt
+        run: cd custom_components/versatile_thermostat && python3 -m pip install -r requirements_test.txt
      - name: Run tests
        run: |
-          pytest \
+          cd custom_components/versatile_thermostat && pytest \
            -qq \
            --timeout=9 \
            --durations=10 \
--- a/.gitignore
+++ b/.gitignore
@@ -103,4 +103,8 @@ dist
 # TernJS port file
 .tern-port

-__pycache__
+# init file required for unittest
+custom_components/__init__.py
+__pycache__
+
+config/**
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,36 +3,15 @@
  "version": "0.2.0",
  "configurations": [
    {
-      // Example of attaching to local debug server
-      "name": "Python: Attach Local",
+      "name": "Home Assistant (debug)",
      "type": "python",
-      "request": "attach",
-      "port": 5678,
-      "host": "localhost",
+      "request": "launch",
+      "module": "homeassistant",
      "justMyCode": false,
-      "pathMappings": [
-        // {
-        //  "localRoot": "${workspaceFolder}",
-        //  "remoteRoot": "."
-        //},
-        {
-          "localRoot": "${workspaceFolder}/../core",
-          "remoteRoot": "/home/vscode/core"
-        }
-      ]
-    },
-    {
-      // Example of attaching to my production server
-      "name": "Python: Attach Remote",
-      "type": "python",
-      "request": "attach",
-      "port": 5678,
-      "host": "homeassistant.local",
-      "pathMappings": [
-        {
-          "localRoot": "${workspaceFolder}",
-          "remoteRoot": "/usr/src/homeassistant"
-        }
+      "args": [
+          "--debug",
+          "-c",
+          "config"
      ]
    }
  ]
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,12 +1,20 @@
 {
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.python"
+    },
    "python.linting.pylintEnabled": true,
    "python.linting.enabled": true,
-    "python.pythonPath": "/usr/local/bin/python",
    "files.associations": {
        "*.yaml": "home-assistant"
    },
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
    "python.analysis.extraPaths": [
-        "/home/vscode/core",
-        "/workspaces/versatile_thermostat"
-    ]
+    //    "/home/vscode/core",
+        "/workspaces/versatile_thermostat/custom_components/versatile_thermostat"
+    ],
+    "python.formatting.provider": "none"
 }
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,13 +2,13 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "label": "Run Home Assistant on port 9123",
+            "label": "Run Home Assistant on port 8123",
            "type": "shell",
            "command": "./container start",
            "problemMatcher": []
        },
        {
-            "label": "Restart Home Assistant on port 9123",
+            "label": "Restart Home Assistant on port 8123",
            "type": "shell",
            "command": "./container restart",
            "problemMatcher": []
--- a/CONTRIBUTING-fr.md
+++ b/CONTRIBUTING-fr.md
@@ -0,0 +1,61 @@
+# Consignes de contribution
+
+Contribuer à ce projet doit être aussi simple et transparent que possible, que ce soit :
+
+- Signaler un bug
+- Discuter de l'état actuel du code
+- Soumettre un correctif
+- Proposer de nouvelles fonctionnalités
+
+## Github est utilisé pour tout
+
+Github est utilisé pour héberger du code, pour suivre les problèmes et les demandes de fonctionnalités, ainsi que pour accepter les demandes d'extraction.
+
+Les demandes d'extraction sont le meilleur moyen de proposer des modifications à la base de code.
+
+1. Fourchez le dépôt et créez votre branche à partir de `master`.
+2. Si vous avez modifié quelque chose, mettez à jour la documentation.
+3. Assurez-vous que votre code peluche (en utilisant du noir).
+4. Testez votre contribution.
+5. Émettez cette pull request !
+
+## Toutes les contributions que vous ferez seront sous la licence logicielle MIT
+
+En bref, lorsque vous soumettez des modifications de code, vos soumissions sont considérées comme étant sous la même [licence MIT](http://choosealicense.com/licenses/mit/) qui couvre le projet. N'hésitez pas à contacter les mainteneurs si cela vous préoccupe.
+
+## Signaler les bogues en utilisant les [issues] de Github (../../issues)
+
+Les problèmes GitHub sont utilisés pour suivre les bogues publics.
+Signalez un bogue en [ouvrant un nouveau problème](../../issues/new/choose) ; C'est si facile!
+
+## Rédiger des rapports de bogue avec des détails, un arrière-plan et un exemple de code
+
+Les **rapports de bogues géniaux** ont tendance à avoir :
+
+- Un résumé rapide et/ou un historique
+- Étapes à reproduire
+   - Être spécifique!
+   - Donnez un exemple de code si vous le pouvez.
+- Ce à quoi vous vous attendiez arriverait
+- Que se passe-t-il réellement
+- Notes (y compris éventuellement pourquoi vous pensez que cela pourrait se produire, ou des choses que vous avez essayées qui n'ont pas fonctionné)
+
+Les gens *adorent* les rapports de bogues approfondis. Je ne plaisante même pas.
+
+## Utilisez un style de codage cohérent
+
+Utilisez [black](https://github.com/ambv/black) pour vous assurer que le code suit le style.
+
+## Testez votre modification de code
+
+Ce composant personnalisé est basé sur les meilleures pratiques décrites ici [modèle d'intégration_blueprint](https://github.com/custom-components/integration_blueprint).
+
+Il est livré avec un environnement de développement dans un conteneur, facile à lancer
+si vous utilisez Visual Studio Code. Avec ce conteneur, vous aurez un stand alone
+Instance de Home Assistant en cours d'exécution et déjà configurée avec le inclus
+[`.devcontainer/configuration.yaml`](./.devcontainer/configuration.yaml)
+déposer.
+
+## Licence
+
+En contribuant, vous acceptez que vos contributions soient autorisées sous sa licence MIT.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,61 @@
+# Contribution guidelines
+
+Contributing to this project should be as easy and transparent as possible, whether it's:
+
+- Reporting a bug
+- Discussing the current state of the code
+- Submitting a fix
+- Proposing new features
+
+## Github is used for everything
+
+Github is used to host code, to track issues and feature requests, as well as accept pull requests.
+
+Pull requests are the best way to propose changes to the codebase.
+
+1. Fork the repo and create your branch from `master`.
+2. If you've changed something, update the documentation.
+3. Make sure your code lints (using black).
+4. Test you contribution.
+5. Issue that pull request!
+
+## Any contributions you make will be under the MIT Software License
+
+In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
+
+## Report bugs using Github's [issues](../../issues)
+
+GitHub issues are used to track public bugs.
+Report a bug by [opening a new issue](../../issues/new/choose); it's that easy!
+
+## Write bug reports with detail, background, and sample code
+
+**Great Bug Reports** tend to have:
+
+- A quick summary and/or background
+- Steps to reproduce
+  - Be specific!
+  - Give sample code if you can.
+- What you expected would happen
+- What actually happens
+- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
+
+People *love* thorough bug reports. I'm not even kidding.
+
+## Use a Consistent Coding Style
+
+Use [black](https://github.com/ambv/black) to make sure the code follows the style.
+
+## Test your code modification
+
+This custom component is based on best practices described here [integration_blueprint template](https://github.com/custom-components/integration_blueprint).
+
+It comes with development environment in a container, easy to launch
+if you use Visual Studio Code. With this container you will have a stand alone
+Home Assistant instance running and already configured with the included
+[`.devcontainer/configuration.yaml`](./.devcontainer/configuration.yaml)
+file.
+
+## License
+
+By contributing, you agree that your contributions will be licensed under its MIT License.
--- a/README-fr.md
+++ b/README-fr.md
@@ -8,8 +8,9 @@

 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) Cette intégration de thermostat vise à simplifier considérablement vos automatisations autour de la gestion du chauffage. Parce que tous les événements autour du chauffage classiques sont gérés nativement par le thermostat (personne à la maison ?, activité détectée dans une pièce ?, fenêtre ouverte ?, délestage de courant ?), vous n'avez pas à vous encombrer de scripts et d'automatismes compliqués pour gérer vos climats. ;-).

- [Merci pour la bière buymecoffee: https://www.buymeacoffee.com/jmcollin78](#merci-pour-la-bière-buymecoffee-httpswwwbuymeacoffeecomjmcollin78)
+- [Merci pour la bière buymecoffee](#merci-pour-la-bière-buymecoffee)
 - [Quand l'utiliser et ne pas l'utiliser](#quand-lutiliser-et-ne-pas-lutiliser)
+  - [Incompatibilités](#incompatibilités)
 - [Pourquoi une nouvelle implémentation du thermostat ?](#pourquoi-une-nouvelle-implémentation-du-thermostat-)
 - [Comment installer cet incroyable Thermostat Versatile ?](#comment-installer-cet-incroyable-thermostat-versatile-)
  - [HACS installation (recommendé)](#hacs-installation-recommendé)
@@ -17,6 +18,9 @@
 - [Configuration](#configuration)
  - [Choix des attributs de base](#choix-des-attributs-de-base)
  - [Sélectionnez des entités pilotées](#sélectionnez-des-entités-pilotées)
+    - [Pour un thermostat de type ```thermostat_over_switch```](#pour-un-thermostat-de-type-thermostat_over_switch)
+    - [Pour un thermostat de type ```thermostat_over_climate```:](#pour-un-thermostat-de-type-thermostat_over_climate)
+    - [Pour un thermostat de type ```thermostat_over_valve```:](#pour-un-thermostat-de-type-thermostat_over_valve)
  - [Configurez les coefficients de l'algorithme TPI](#configurez-les-coefficients-de-lalgorithme-tpi)
  - [Configurer la température préréglée](#configurer-la-température-préréglée)
  - [Configurer les portes/fenêtres en allumant/éteignant les thermostats](#configurer-les-portesfenêtres-en-allumantéteignant-les-thermostats)
@@ -26,6 +30,7 @@
  - [Configurer la gestion de la puissance](#configurer-la-gestion-de-la-puissance)
  - [Configurer la présence ou l'occupation](#configurer-la-présence-ou-loccupation)
  - [Configuration avancée](#configuration-avancée)
+  - [Synthèse des paramètres](#synthèse-des-paramètres)
 - [Exemples de réglage](#exemples-de-réglage)
  - [Chauffage électrique](#chauffage-électrique)
  - [Chauffage central (chauffage gaz ou fuel)](#chauffage-central-chauffage-gaz-ou-fuel)
@@ -54,31 +59,42 @@ 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 3.7**: Ajout du type de Versatile Thermostat `over valve` pour piloter une vanne TRV directement ou tout autre équipement type gradateur pour le chauffage. La régulation se fait alors directement en agissant sur le pourcentage d'ouverture de l'entité sous-jacente : 0 la vanne est coupée, 100 : la vanne est ouverte à fond. Cf. [#131](https://github.com/jmcollin78/versatile_thermostat/issues/131)
+> * **Release 3.6**: Ajout du paramètre `motion_off_delay` pour améliorer la gestion de des mouvements [#116](https://github.com/jmcollin78/versatile_thermostat/issues/116), [#128](https://github.com/jmcollin78/versatile_thermostat/issues/128). Ajout du mode AC (air conditionné) pour un VTherm over switch. Préparation du projet Github pour faciliter les contributions [#127](https://github.com/jmcollin78/versatile_thermostat/issues/127)
+> * **Release 3.5**: Plusieurs thermostats sont possibles en "thermostat over climate" mode [#113](https://github.com/jmcollin78/versatile_thermostat/issues/113)
+> * **Release 3.4**: bug fix et exposition des preset temperatures pour le mode AC [#103](https://github.com/jmcollin78/versatile_thermostat/issues/103)
+> * **Release 3.3**: ajout du mode Air Conditionné (AC). Cette fonction vous permet d'utiliser le mode AC de votre thermostat sous-jacent. Pour l'utiliser, vous devez cocher l'option "Uitliser le mode AC" et définir les valeurs de température pour les presets et pour les presets en cas d'absence
 > * **Release 3.2** : ajout de la possibilité de commander plusieurs switch à partir du même thermostat. Dans ce mode, les switchs sont déclenchés avec un délai pour minimiser la puissance nécessaire à un instant (on minimise les périodes de recouvrement). Voir [Configuration](#sélectionnez-des-entités-pilotées)
+<details>
+<summary>Autres versions</summary>
+
 > * **Release 3.1** : ajout d'une détection de fenêtres/portes ouvertes par chute de température. Cette nouvelle fonction permet de stopper automatiquement un radiateur lorsque la température chute brutalement. Voir [Le mode auto](#le-mode-auto)
 > * **Release majeure 3.0** : ajout d'un équipement thermostat et de capteurs (binaires et non binaires) associés. Beaucoup plus proche de la philosphie Home Assistant, vous avez maintenant un accès direct à l'énergie consommée par le radiateur piloté par le thermostat et à plein d'autres capteurs qui seront utiles dans vos automatisations et dashboard.
 > * **release 2.3** : ajout de la mesure de puissance et d'énergie du radiateur piloté par le thermostat.
 > * **release 2.2** : ajout de fonction de sécurité permettant de ne pas laisser éternellement en chauffe un radiateur en cas de panne du thermomètre
 > * **release majeure 2.0** : ajout du thermostat "over climate" permettant de transformer n'importe quel thermostat en Versatile Thermostat et lui ajouter toutes les fonctions de ce dernier.
+</details>

 # Merci pour la bière [buymecoffee](https://www.buymeacoffee.com/jmcollin78)
-Un grand merci à @salabur, @pvince83 and @bergoglio pour les bières. Ca fait très plaisir.
+Un grand merci à @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69 pour les bières. Ca fait très plaisir.


 # Quand l'utiliser et ne pas l'utiliser
-Ce thermostat peut piloter 2 types d'équipement:
+Ce thermostat peut piloter 3 types d'équipement:
 1. un radiateur qui ne fonctionne qu'en mode marche/arrêt (nommé ```thermostat_over_switch```). La configuration minimale nécessaire pour utiliser ce type thermostat est :
-   a. un équipement comme un radiateur (un ```switch``` ou équivalent),
-   b. une sonde de température pour la pièce (ou un input_number),
-   c. un capteur de température externe (pensez à l'intégration météo si vous n'en avez pas)
+   1. un équipement comme un radiateur (un ```switch``` ou équivalent),
+   2. une sonde de température pour la pièce (ou un input_number),
+   3. un capteur de température externe (pensez à l'intégration météo si vous n'en avez pas)
 2. un autre thermostat qui a ses propres modes de fonctionnement (nommé ```thermostat_over_climate```). Pour ce type de thermostat la configuration minimale nécessite :
-   a. un équipement comme une climatisation qui est pilotée par sa propre entity de type ```climate```,
-   b. une sonde de température pour la pièce (ou un input_number),
-   c. un capteur de température externe (pensez à l'intégration météo si vous n'en avez pas)
+   1. un équipement - comme une climatisation, une valve thermostatique - qui est pilotée par sa propre entity de type ```climate```,
+3. un équipement qui peut prendre une valeur de 0 à 100% (nommée ```thermostat_over_valve```). A 0 le chauffage est coupé, 100% il est ouvert à fond. Ce type permet de piloter une valve thermostatique (cf. valve Shelly) qui expose une entité de type `number.` permetttant de piloter directement l'ouverture de la vanne. Versatile Thermostat régule la température de la pièce en jouant sur le pourcentage d'ouverture, à l'aide des capteurs de température intérieur et extérieur en utilisant l'algorithme TPI décrit ci-dessous.

-Le type ```thermostat_over_climate``` permet d'ajouter à votre équipement existant toutes les fonctionnalités fournies par VersatileThermostat. L'entité climate VersatileThermostat pilotera votre entité climate, en la coupant si les fenêtres sont ouvertes, la passant en mode Eco si personne n'est présent, etc. Cf. [ici](#pourquoi-une-nouvelle-implémentation-du-thermostat). Pour ce type de thermostat, les cycles éventuels de chauffe sont pilotés par l'entité climate sous-jacente et pas par le Versatile Thermostat lui-même.
+The ```thermostat_over_climate``` type allows you to add to your existing equipment all the functionalities provided by VersatileThermostat. The VersatileThermostat climate entity will control your climate entity, turning it off if the windows are open, switching it to Eco mode if no one is present, etc. See [here](#why-a-new-thermostat-implementation). For this type of thermostat, any heating cycles are controlled by the underlying climate entity and not by the Versatile Thermostat itself.

-Parce que cette intégration vise à commander le radiateur en tenant compte du préréglage configuré (preset) et de la température ambiante, ces informations sont obligatoires.
+## Incompatibilités
+Certains thermostat de type TRV sont réputés incompatibles avec le Versatile Thermostat. C'est le cas des vannes suivantes :
+1. les vannes POPP de Danfoss avec retour de température. Il est impossible d'éteindre cette vanne et elle s'auto-régule d'elle-même causant des conflits avec le VTherm,
+2. les vannes thermstatiques "Homematic radio". Elles ont un cycle de service incompatible avec une commande par le Versatile Thermostat

 # Pourquoi une nouvelle implémentation du thermostat ?

@@ -99,10 +115,10 @@ Ce composant nommé __Versatile thermostat__ gère les cas d'utilisation suivant
 ## HACS installation (recommendé)

 1. Installez [HACS](https://hacs.xyz/). De cette façon, vous obtenez automatiquement les mises à jour.
-2. Ajoutez ce repository Github en tant que repository personnalisé dans les paramètres HACS.
+2. L'intégration Versatile Thermostat est maintenant proposée directement depuis l'interface HACF (onglet intégrations),
 3. recherchez et installez "Versatile Thermostat" dans HACS et cliquez sur "installer".
 4. Redémarrez Home Assistant.
-5. Ensuite, vous pouvez ajouter une intégration de Versatile Thermostat dans la page d'intégration. Vous ajoutez autant de thermostats dont vous avez besoin (généralement un par radiateur qui doit être géré ou par pompe dans le cas d'un chauffage centralisé)
+5. Ensuite, vous pouvez ajouter une intégration de Versatile Thermostat dans la page Paramètres / Intégrations. Vous ajoutez autant de thermostats dont vous avez besoin (généralement un par radiateur ou par groupe de radiateurs qui doivent être gérés ou par pompe dans le cas d'un chauffage centralisé)


 ## Installation manuelle
@@ -133,35 +149,54 @@ Suivez ensuite les étapes de configuration comme suit :

 Donnez les principaux attributs obligatoires :
 1. un nom (sera le nom de l'intégration et aussi le nom de l'entité climate)
-2. le type de thermostat ```thermostat_over_switch``` pour piloter un radiateur commandé par un switch ou ```thermostat_over_climate``` pour piloter un autre thermostat. Cf. [ci-dessus](#pourquoi-une-nouvelle-implémentation-du-thermostat)
+2. le type de thermostat ```thermostat_over_switch``` pour piloter un radiateur commandé par un switch ou ```thermostat_over_climate``` pour piloter un autre thermostat, ou ```thermostat_over_valve``` Cf. [ci-dessus](#pourquoi-une-nouvelle-implémentation-du-thermostat)
 4. un identifiant d'entité de capteur de température qui donne la température de la pièce dans laquelle le radiateur est installé,
 5. une entité capteur de température donnant la température extérieure. Si vous n'avez pas de capteur externe, vous pouvez utiliser l'intégration météo locale
-6. une durée de cycle en minutes. A chaque cycle, le radiateur s'allumera puis s'éteindra pendant une durée calculée afin d'atteindre la température ciblée (voir [preset](#configure-the-preset-temperature) ci-dessous),
+6. une durée de cycle en minutes. A chaque cycle, le radiateur s'allumera puis s'éteindra pendant une durée calculée afin d'atteindre la température ciblée (voir [preset](#configure-the-preset-temperature) ci-dessous). En mode ```over_climate```, le cycle ne sert qu'à faire des controles de base mais ne régule pas directement la température. C'est le ```climate``` sous-jacent qui le fait,
 7. les températures minimales et maximales du thermostat,
 8. une puissance de l'équipement ce qui va activer les capteurs de puissance et énergie consommée par l'appareil,
 9. la liste des fonctionnalités qui seront utilisées pour ce thermostat. En fonction de vos choix, les écrans de configuration suivants s'afficheront ou pas.

 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-      1. avec le type ```thermostat_over_swutch```, les calculs sont effectués à chaque cycle. Donc en cas de changement de conditions, il faudra attendre le prochain cycle pour voir un changement. Pour cette raison, le cycle ne doit pas être trop long. **5 min est une bonne valeur**,
-      2. si le cycle est trop court, le radiateur ne pourra jamais atteindre la température cible en effet pour le radiateur à accumulation et il sera sollicité inutilement
+>  1. avec les types ```over_switch``` et ```over_valve```, les calculs sont effectués à chaque cycle. Donc en cas de changement de conditions, il faudra attendre le prochain cycle pour voir un changement. Pour cette raison, le cycle ne doit pas être trop long. **5 min est une bonne valeur**,
+>  2. si le cycle est trop court, le radiateur ne pourra jamais atteindre la température cible. Pour le radiateur à accumulation par exemple il sera sollicité inutilement.

 ## Sélectionnez des entités pilotées
-En fonction de votre choix sur le type de thermostat, vous devrez choisir une ou plusieurs entités de type switch ou une entité de type climate. Seules les entités compatibles sont présentées.
+En fonction de votre choix sur le type de thermostat, vous devrez choisir une ou plusieurs entités de type `switch`, `climate` ou `number`. Seules les entités compatibles avec le type sont présentées.

-Pour un thermostat de type ```thermostat_over_switch```:
+> ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Comment choisir le type*_
+> Le choix du type est important. Même si il toujours possible de le modifier ensuite via l'IHM de configuration, il est préférable de se poser les quelques questions suivantes :
+> 1. **quel type d'équipement je vais piloter ?** Dans l'ordre voici ce qu'il faut faire :
+>    1. si vous avez une vanne thermostatique (TRV) commandable dans Home Assistant via une entité de type ```number``` (par exemple une _Shelly TRV_), choisissez le type `over_valve`. C'est le type le plus direct et qui assure la meilleure régulation,
+>    2. si vous avez un radiateur électrique (avec ou sans fil pilote) et qu'une entité de type ```switch``` permet de l'allumer ou de l'éteindre, alors le type ```over_switch``` est préférable. La régulation sera faite par le Versatile Thermostat en fonction de la température mesuré par votre thermomètre, à l'endroit ou vous l'avez placé,
+>    3. dans tous les autres cas, utilisez le mode ```over_climate```. Vous gardez votre entité ```climate``` d'origine et le Versatile Thermostat "ne fait que" piloter le on/off et la température cible de votre thermostat d'origine. La régulation est faite par votre thermostat d'origine dans ce cas. Ce mode est particulièrement adapté aux climatisations réversible tout-en-un dont l'exposition dans Home Assistant se limite à une entité de type ```climate```
+> 2. **quelle type de régulation je veux ?** Si l'équipement piloté possède son propre mécanisme de régulation (clim, certaine vanne TRV) et que cette régulation fonctionne bien, optez pour un ```over_climate```
+
+### Pour un thermostat de type ```thermostat_over_switch```
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity.png?raw=true)
 L'algorithme à utiliser est aujourd'hui limité à TPI est disponible. Voir [algorithme](#algorithme).
 Si plusieurs entités de type sont configurées, la thermostat décale les activations afin de minimiser le nombre de switch actif à un instant t. Ca permet une meilleure répartition de la puissance puisque chaque radiateur va s'allumer à son tour.
 Exemple de déclenchement synchronisé :
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/multi-switch-activation.png?raw=true)

+Il est possible de choisir un thermostat over switch qui commande une climatisation en cochant la case "AC Mode". Dans ce cas, seul le mode refroidissement sera visible.

-Pour un thermostat de type ```thermostat_over_climate```:
+
+### Pour un thermostat de type ```thermostat_over_climate```:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity2.png?raw=true)

+Il est possible de choisir un thermostat over climate qui commande une climatisation réversible en cochant la case "AC Mode". Dans ce cas, selon l'équipement commandé vous aurez accès au chauffage et/ou au réfroidissement.
+
+### Pour un thermostat de type ```thermostat_over_valve```:
+![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity3.png?raw=true)
+Vous pouvez choisir jusqu'à entité du domaine ```number``` ou ```ìnput_number``` qui vont commander les vannes.
+L'algorithme à utiliser est aujourd'hui limité à TPI est disponible. Voir [algorithme](#algorithme).
+
+Il est possible de choisir un thermostat over valve qui commande une climatisation en cochant la case "AC Mode". Dans ce cas, seul le mode refroidissement sera visible.
+
 ## Configurez les coefficients de l'algorithme TPI

-Si vous avez choisi un thermostat de type ```thermostat_over_switch``` vous arriverez sur cette page :
+Si vous avez choisi un thermostat de type ```over_switch``` ou  ```over_valve``` vous arriverez sur cette page :

 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-tpi.png?raw=true)

@@ -182,14 +217,16 @@ Le mode préréglé (preset) vous permet de préconfigurer la température cibl
 - **Confort** : l'appareil est en mode confort
 - **Boost** : l'appareil tourne toutes les vannes à fond

+ Si le mode AC est utilisé, vous pourrez aussi configurer les températures lorsque l'équipement en mode climatisation.
+
 **Aucun** est toujours ajouté dans la liste des modes, car c'est un moyen de ne pas utiliser les preset mais une **température manuelle** à la place.

 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-    1. En modifiant manuellement la température cible, réglez le préréglage sur Aucun (pas de préréglage). De cette façon, vous pouvez toujours définir une température cible même si aucun préréglage n'est disponible.
-    2. Le préréglage standard ``Away`` est un préréglage caché qui n'est pas directement sélectionnable. Versatile Thermostat utilise la gestion de présence ou la gestion de mouvement pour régler automatiquement et dynamiquement la température cible en fonction d'une présence dans le logement ou d'une activité dans la pièce. Voir [gestion de la présence](#configure-the-presence-management).
-    3. Si vous utilisez la gestion du délestage, vous verrez un préréglage caché nommé ``power``. Le préréglage de l'élément chauffant est réglé sur « puissance » lorsque des conditions de surpuissance sont rencontrées et que le délestage est actif pour cet élément chauffant. Voir [gestion de l'alimentation](#configure-the-power-management).
-    4. si vous utilisez la configuration avancée, vous verrez le préréglage défini sur ``sécurité`` si la température n'a pas pu être récupérée après un certain délai
-    5. Si vous ne souhaitez pas utiliser le préréglage, indiquez 0 comme température. Le préréglage sera alors ignoré et ne s'affichera pas dans le composant front
+>  1. En modifiant manuellement la température cible, réglez le préréglage sur Aucun (pas de préréglage). De cette façon, vous pouvez toujours définir une température cible même si aucun préréglage n'est disponible.
+>  2. Le préréglage standard ``Away`` est un préréglage caché qui n'est pas directement sélectionnable. Versatile Thermostat utilise la gestion de présence ou la gestion de mouvement pour régler automatiquement et dynamiquement la température cible en fonction d'une présence dans le logement ou d'une activité dans la pièce. Voir [gestion de la présence](#configure-the-presence-management).
+>  3. Si vous utilisez la gestion du délestage, vous verrez un préréglage caché nommé ``power``. Le préréglage de l'élément chauffant est réglé sur « puissance » lorsque des conditions de surpuissance sont rencontrées et que le délestage est actif pour cet élément chauffant. Voir [gestion de l'alimentation](#configure-the-power-management).
+>  4. si vous utilisez la configuration avancée, vous verrez le préréglage défini sur ``sécurité`` si la température n'a pas pu être récupérée après un certain délai
+>  5. Si vous ne souhaitez pas utiliser le préréglage, indiquez 0 comme température. Le préréglage sera alors ignoré et ne s'affichera pas dans le composant front

 ## Configurer les portes/fenêtres en allumant/éteignant les thermostats
 Vous devez avoir choisi la fonctionnalité ```Avec détection des ouvertures``` dans la première page pour arriver sur cette page.
@@ -227,10 +264,10 @@ Pour bien régler il est conseillé d'affocher sur un même graphique historique
 Et c'est tout ! votre thermostat s'éteindra lorsque les fenêtres seront ouvertes et se rallumera lorsqu'il sera fermé.

 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-    1. Si vous souhaitez utiliser **plusieurs capteurs de porte/fenêtre** pour automatiser votre thermostat, créez simplement un groupe avec le comportement habituel (https://www.home-assistant.io/integrations/binary_sensor.group/)
-    2. Si vous n'avez pas de capteur de fenêtre/porte dans votre chambre, laissez simplement l'identifiant de l'entité du capteur vide,
-    3. **Un seul mode est permis**. On ne peut pas configurer un thermostat avec un capteur et une détection automatique. Les 2 modes risquant de se contredire, il n'est pas possible d'avoir les 2 modes en même temps,
-    4. Il est déconseillé d'utiliser le mode automatique pour un équipement soumis à des variations de température fréquentes et normales (couloirs, zones ouvertes, ...)
+>  1. Si vous souhaitez utiliser **plusieurs capteurs de porte/fenêtre** pour automatiser votre thermostat, créez simplement un groupe avec le comportement habituel (https://www.home-assistant.io/integrations/binary_sensor.group/)
+>  2. Si vous n'avez pas de capteur de fenêtre/porte dans votre chambre, laissez simplement l'identifiant de l'entité du capteur vide,
+>  3. **Un seul mode est permis**. On ne peut pas configurer un thermostat avec un capteur et une détection automatique. Les 2 modes risquant de se contredire, il n'est pas possible d'avoir les 2 modes en même temps,
+>  4. Il est déconseillé d'utiliser le mode automatique pour un équipement soumis à des variations de température fréquentes et normales (couloirs, zones ouvertes, ...)

 ## Configurer le mode d'activité ou la détection de mouvement
 Si vous avez choisi la fonctionnalité ```Avec détection de mouvement```, cliquez sur 'Valider' sur la page précédente et vous y arriverez :
@@ -240,17 +277,20 @@ Si vous avez choisi la fonctionnalité ```Avec détection de mouvement```, cliqu
 Nous allons maintenant voir comment configurer le nouveau mode Activité.
 Ce dont nous avons besoin:
 - un **capteur de mouvement**. ID d'entité d'un capteur de mouvement. Les états du capteur de mouvement doivent être « on » (mouvement détecté) ou « off » (aucun mouvement détecté)
- une durée de **délai de mouvement** (en secondes) définissant combien de temps nous attendons la confirmation du mouvement avant de considérer le mouvement
+- une durée de **délai de mouvement** (en secondes) définissant combien de temps nous attendons la confirmation du mouvement avant de considérer le mouvement. Ce paramètre peut être supérieur à la temporision de votre détecteur de mouvement, sinon la détection se fera à chaque mouvement signalé par le détecteur,
+- une durée de fin **délai de mouvement** (en secondes) définissant combien de temps nous attendons la confirmation d'une fin de mouvement avant de ne plus considérer le mouvement.
 - un **préréglage de "mouvement" **. Nous utiliserons la température de ce préréglage lorsqu'une activité sera détectée.
 - un **préréglage "pas de mouvement"**. Nous utiliserons la température de ce deuxième préréglage lorsqu'aucune activité n'est détectée.

 Alors imaginons que nous voulions avoir le comportement suivant :
- nous avons une pièce avec un thermostat réglé en mode activité, le mode "mouvement" choisi est confort (21.5C), le mode "pas de mouvement" choisi est Eco (18.5C) et la temporisation du mouvement est de 5 min.
- la pièce est vide depuis un moment (aucune activité détectée), la température de cette pièce est de 18,5 C
- quelqu'un entre dans la pièce, une activité est détectée la température est fixée à 21,5 C
- la personne quitte la chambre, au bout de 5 min la température est ramenée à 18,5 C
+- nous avons une pièce avec un thermostat réglé en mode activité, le mode "mouvement" choisi est confort (21,5°C), le mode "pas de mouvement" choisi est Eco (18.5°C) et la temporisation du mouvement est de 30 sec lors de la détection et de 5 minutes sur fin de détection.
+- la pièce est vide depuis un moment (aucune activité détectée), la température de cette pièce est de 18,5°
+- quelqu'un entre dans la pièce, une activité est détectée si le mouvement est présent pendant au moins 30 sec. La température passe alors à 21,5°
+- si le mouvement est présent pendant moins de 30 sec (passage rapide), la température reste sur 18,5°,
+- imaginons que la température soit passée sur 21,5°, lorsque la personne quitte la pièce, au bout de 5 min la température est ramenée à 18,5°.
+- si la personne revient avant les 5 minutes, la température reste sur 21,5°

-Pour que cela fonctionne, le thermostat climatique doit être en mode préréglé « Activité ».
+Pour que cela fonctionne, le thermostat doit être en mode préréglé « Activité ».

 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
    1. Sachez que comme pour les autres modes prédéfinis, ``Activity`` ne sera proposé que s'il est correctement configuré. En d'autres termes, les 4 clés de configuration doivent être définies si vous souhaitez voir l'activité dans l'interface de l'assistant domestique
@@ -267,10 +307,10 @@ Notez que toutes les valeurs de puissance doivent avoir les mêmes unités (kW o
 Cela vous permet de modifier la puissance maximale au fil du temps à l'aide d'un planificateur ou de ce que vous voulez.

 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-    1. En cas de délestage, le radiateur est réglé sur le préréglage nommé ```power```. Il s'agit d'un préréglage caché, vous ne pouvez pas le sélectionner manuellement.
-    2. Je l'utilise pour éviter de dépasser la limite de mon contrat d'électricité lorsqu'un véhicule électrique est en charge. Cela crée une sorte d'autorégulation.
-    3. Gardez toujours une marge, car la puissance max peut être brièvement dépassée en attendant le calcul du prochain cycle typiquement ou par des équipements non régulés.
-    4. Si vous ne souhaitez pas utiliser cette fonctionnalité, laissez simplement l'identifiant des entités vide
+> 1. En cas de délestage, le radiateur est réglé sur le préréglage nommé ```power```. Il s'agit d'un préréglage caché, vous ne pouvez pas le sélectionner manuellement.
+> 2. Je l'utilise pour éviter de dépasser la limite de mon contrat d'électricité lorsqu'un véhicule électrique est en charge. Cela crée une sorte d'autorégulation.
+> 3. Gardez toujours une marge, car la puissance max peut être brièvement dépassée en attendant le calcul du prochain cycle typiquement ou par des équipements non régulés.
+> 4. Si vous ne souhaitez pas utiliser cette fonctionnalité, laissez simplement l'identifiant des entités vide

 ## Configurer la présence ou l'occupation
 Si sélectionnée en première page, cette fonction vous permet de modifier dynamiquement la température de tous les préréglages du thermostat configurés lorsque personne n'est à la maison ou lorsque quelqu'un rentre à la maison. Pour cela, vous devez configurer la température qui sera utilisée pour chaque préréglage lorsque la présence est désactivée. Lorsque le capteur de présence s'éteint, ces températures seront utilisées. Lorsqu'il se rallume, la température "normale" configurée pour le préréglage est utilisée. Voir [gestion des préréglages](#configure-the-preset-temperature).
@@ -284,9 +324,11 @@ Pour cela, vous devez configurer :
 3. La **température utilisée en Confort** préréglée en cas d'absence,
 4. La **température utilisée en Boost** préréglée en cas d'absence

+Si le mode AC est utilisé, vous pourrez aussi configurer les températures lorsque l'équipement en mode climatisation.
+
 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-      1. le changement de température est immédiat et se répercute sur le volet avant. Le calcul prendra en compte la nouvelle température cible au prochain calcul du cycle,
-      2. vous pouvez utiliser le capteur direct person.xxxx ou un groupe de capteurs de Home Assistant. Le capteur de présence gère les états ``on`` ou ``home`` comme présents et les états ``off`` ou ``not_home`` comme absents.
+> 1. le changement de température est immédiat et se répercute sur le volet avant. Le calcul prendra en compte la nouvelle température cible au prochain calcul du cycle,
+> 2. vous pouvez utiliser le capteur direct person.xxxx ou un groupe de capteurs de Home Assistant. Le capteur de présence gère les états ``on`` ou ``home`` comme présents et les états ``off`` ou ``not_home`` comme absents.

 ## Configuration avancée
 Ces paramètres permettent d'affiner le réglage du thermostat.
@@ -306,11 +348,74 @@ Le quatrième param§tre (``security_default_on_percent``) est la valeur de ``on
 Voir [exemple de réglages](#examples-tuning) pour avoir des exemples de réglage communs

 > ![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,
-    3. 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",
-    4. 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,
-    5. Pour un usage naturel, le ``security_default_on_percent`` doit être inférieur à ``security_min_on_percent``,
-    6. Lorsqu'un thermostat de type ``thermostat_over_climate`` passe en mode ``security`` il est éteint. Les paramètres ``security_min_on_percent`` et ``security_default_on_percent`` ne sont alors pas utilisés.
+> 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,
+> 4. Pour un usage naturel, le ``security_default_on_percent`` doit être inférieur à ``security_min_on_percent``,
+> 5. Lorsqu'un thermostat de type ``thermostat_over_climate`` passe en mode ``security`` il est éteint. Les paramètres ``security_min_on_percent`` et ``security_default_on_percent`` ne sont alors pas utilisés.
+
+## Synthèse des paramètres
+
+| Paramètre | Libellé | "over switch" | "over climate" | over valve |
+| - | - | - | - | - |
+| ``name`` | Nom | X | X | X |
+| ``thermostat_type`` | Type de thermostat | X | X | X |
+| ``temperature_sensor_entity_id`` | Temperature sensor entity id | X | - | X |
+| ``external_temperature_sensor_entity_id`` | Température exterieure sensor entity id | X | - | X |
+| ``cycle_min`` | Durée du cycle (minutes) | X | X | X |
+| ``temp_min`` | Température minimale permise | X | X | X |
+| ``temp_max`` | Température maximale permise | X | X | X |
+| ``device_power`` | Puissance de l'équipement | X | X | X |
+| ``use_window_feature`` | Avec détection des ouvertures | X | X | X |
+| ``use_motion_feature`` | Avec détection de mouvement | X | X | X |
+| ``use_power_feature`` | Avec gestion de la puissance | X | X | X |
+| ``use_presence_feature`` | Avec détection de présence | X | X | X |
+| ``heater_entity1_id`` | 1er radiateur | X | - | - |
+| ``heater_entity2_id`` | 2ème radiateur | X | - | - |
+| ``heater_entity3_id`` | 3ème radiateur | X | - | - |
+| ``heater_entity4_id`` | 4ème radiateur | X | - | - |
+| ``proportional_function`` | Algorithme | X | - | - |
+| ``climate_entity1_id`` | Thermostat sous-jacent | - | X | - |
+| ``climate_entity2_id`` | 2ème thermostat sous-jacent | - | X | - |
+| ``climate_entity3_id`` | 3ème thermostat sous-jacent | - | X | - |
+| ``climate_entity4_id`` | 4ème thermostat sous-jacent | - | X | - |
+| ``valve_entity1_id`` | Vanne sous-jacente      | - | - | X |
+| ``valve_entity2_id`` | 2ème vanne sous-jacente | - | - | X |
+| ``valve_entity3_id`` | 3ème vanne sous-jacente | - | - | X |
+| ``valve_entity4_id`` | 4ème vanne sous-jacente | - | - | X |
+| ``ac_mode`` | utilisation de l'air conditionné (AC) ? | X | X | X |
+| ``tpi_coef_int`` | Coefficient à utiliser pour le delta de température interne | X | - | X |
+| ``tpi_coef_ext`` | Coefficient à utiliser pour le delta de température externe | X | - | X |
+| ``eco_temp`` | Température en preset Eco | X | X | X |
+| ``comfort_temp`` | Température en preset Confort | X | X | X |
+| ``boost_temp`` | Température en preset Boost | X | X | X |
+| ``eco_ac_temp`` | Température en preset Eco en mode AC | X | X | X |
+| ``comfort_ac_temp`` | Température en preset Confort en mode AC | X | X | X |
+| ``boost_ac_temp`` | Température en preset Boost en mode AC | X | X | X |
+| ``window_sensor_entity_id`` | Détecteur d'ouverture (entity id) |  X | X | X |
+| ``window_delay`` | Délai avant extinction (secondes) | X | X | X |
+| ``window_auto_open_threshold`` | Seuil haut de chute de température pour la détection automatique (en °/min) | X | X | X |
+| ``window_auto_close_threshold`` | Seuil bas de chute de température pour la fin de détection automatique (en °/min) | X | X | X |
+| ``window_auto_max_duration`` | Durée maximum d'une extinction automatique (en min) | X | X | X |
+| ``motion_sensor_entity_id`` | Détecteur de mouvement entity id | X | X | X |
+| ``motion_delay`` | Délai avant prise en compte du mouvement (seconds) | X | X | X |
+| ``motion_off_delay`` | Délai avant prise en compte de la fin de mouvement (seconds) | X | X | X |
+| ``motion_preset`` | Preset à utiliser si mouvement détecté | X | X | X |
+| ``no_motion_preset`` | Preset à utiliser si pas de mouvement détecté | X | X | X |
+| ``power_sensor_entity_id`` | Capteur de puissance totale (entity id) | X | X | X |
+| ``max_power_sensor_entity_id`` | Capteur de puissance Max (entity id) | X | X | X |
+| ``power_temp`` | Température si délestaqe | X | X | X |
+| ``presence_sensor_entity_id`` | Capteur de présence entity id (true si quelqu'un est présent) | X | X | X |
+| ``eco_away_temp`` | Température en preset Eco en cas d'absence | X | X | X |
+| ``comfort_away_temp`` | Température en preset Comfort en cas d'absence | X | X | X |
+| ``boost_away_temp`` | Température en preset Boost en cas d'absence | X | X | X |
+| ``eco_ac_away_temp`` | Température en preset Eco en cas d'absence en mode AC | X | X | X |
+| ``comfort_ac_away_temp`` | Température en preset Comfort en cas d'absence en mode AC | X | X | X |
+| ``boost_ac_away_temp`` | Température en preset Boost en cas d'absence en mode AC | X | X | X |
+| ``minimal_activation_delay`` | Délai minimal d'activation | X | - | - |
+| ``security_delay_min`` | Délai maximal entre 2 mesures de températures | X | - | X |
+| ``security_min_on_percent`` | Pourcentage minimal de puissance pour passer en mode sécurité | X | - | X |
+| ``security_default_on_percent`` | Pourcentage de puissance a utiliser en mode securité | X | - | X |

 # Exemples de réglage

@@ -361,12 +466,12 @@ Cette intégration utilise un algorithme proportionnel. Un algorithme proportion
 Cet algorithme fait converger la température et arrête d'osciller.

 ## Algorithme TPI
-L'algorithme TPI consiste à calculer à chaque cycle un pourcentage d'état On vs Off pour le radiateur en utilisant la température cible, la température actuelle dans la pièce et la température extérieure actuelle.
+L'algorithme TPI consiste à calculer à chaque cycle un pourcentage d'état On vs Off pour le radiateur en utilisant la température cible, la température actuelle dans la pièce et la température extérieure actuelle. Cet algorithme n'est donc valable que pour les Versatile Thermostat qui régulent : `over_switch` et `over_valve`.

 Le pourcentage est calculé avec cette formule :

    on_percent = coef_int * (température cible - température actuelle) + coef_ext * (température cible - température extérieure)
-    Ensuite, faites 0 <= on_percent <= 1
+    Ensuite, l'algo fait en sorte que 0 <= on_percent <= 1

 Les valeurs par défaut pour coef_int et coef_ext sont respectivement : ``0.6`` et ``0.01``. Ces valeurs par défaut conviennent à une pièce standard bien isolée.

@@ -374,7 +479,9 @@ Pour régler ces coefficients, gardez à l'esprit que :
 1. **si la température cible n'est pas atteinte** après une situation stable, vous devez augmenter le ``coef_ext`` (le ``on_percent`` est trop bas),
 2. **si la température cible est dépassée** après une situation stable, vous devez diminuer le ``coef_ext`` (le ``on_percent`` est trop haut),
 3. **si l'atteinte de la température cible est trop lente**, vous pouvez augmenter le ``coef_int`` pour donner plus de puissance au réchauffeur,
-4. **si l'atteinte de la température cible est trop rapide et que des oscillations apparaissent** autour de la cible, vous pouvez diminuer le ``coef_int`` pour donner moins de puissance au radiateur
+4. **si l'atteinte de la température cible est trop rapide et que des oscillations apparaissent** autour de la cible, vous pouvez diminuer le ``coef_int`` pour donner moins de puissance au radiateur.
+
+En type `over_valve` le `on_percent` est ramené à une valeur entre 0 et 100% et sert directement à commander l'ouverture de la vanne.

 Voir quelques situations à [examples](#some-results).

@@ -398,6 +505,7 @@ Dans l'ordre, il y a :
 11. l'état de sécurité,
 12. l'état de l'ouverture (si la gestion des ouvertures est configurée),
 13. l'état du mouvement (si la gestion du mouvements est configurée)
+14. le pourcentage d'ouverture de la vanne (pour le type `over_valve`)

 Pour colorer les capteurs, ajouter ces lignes et personnalisez les au besoin, dans votre configuration.yaml :

@@ -448,6 +556,17 @@ target:
    entity_id : climate.my_thermostat
 ```

+Ou pour changer le pré-réglage du mode Air Conditionné (AC) ajoutez un préfixe `_ac`` au nom du preset comme ceci :
+```
+service: versatile_thermostat.set_preset_temperature
+data:
+    preset: boost_ac
+    temperature: 25
+    temperature_away: 30
+target:
+    entity_id: climate.my_thermostat
+```
+
 > ![Astuce](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
    - après un redémarrage, les préréglages sont réinitialisés à la température configurée. Si vous souhaitez que votre changement soit permanent, vous devez modifier le préréglage de la température dans la configuration de l'intégration.

@@ -468,7 +587,7 @@ target:

 # Notifications
 Les évènements marquant du thermostat sont notifiés par l'intermédiaire du bus de message.
-Les évènements notifiés sont les suivants: 
+Les évènements notifiés sont les suivants:

 - ``versatile_thermostat_security_event`` : un thermostat entre ou sort du preset ``security``
 - ``versatile_thermostat_power_event`` : un thermostat entre ou sort du preset ``power``
@@ -528,6 +647,7 @@ Les attributs personnalisés sont les suivants :
 | ``last_update_datetime`` | La date et l'heure au format ISO8866 de cet état |
 | ``friendly_name`` | Le nom du thermostat |
 | ``supported_features`` | Une combinaison de toutes les fonctionnalités prises en charge par ce thermostat. Voir la documentation officielle sur l'intégration climatique pour plus d'informations |
+| ``valve_open_percent`` | Le pourcentage d'ouverture de la vanne |

 # Quelques résultats

--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@

 - [Thanks for the beer buymecoffee](#thanks-for-the-beer-buymecoffee)
 - [When to use / not use](#when-to-use--not-use)
+  - [Incompatibilities](#incompatibilities)
 - [Why another thermostat implementation ?](#why-another-thermostat-implementation-)
 - [How to install this incredible Versatile Thermostat ?](#how-to-install-this-incredible-versatile-thermostat-)
  - [HACS installation (recommended)](#hacs-installation-recommended)
@@ -17,6 +18,9 @@
 - [Configuration](#configuration)
  - [Minimal configuration update](#minimal-configuration-update)
  - [Select the driven entity](#select-the-driven-entity)
+    - [For a ```thermostat_over_switch``` type thermostat](#for-a-thermostat_over_switch-type-thermostat)
+    - [For a thermostat of type ```thermostat_over_climate```:](#for-a-thermostat-of-type-thermostat_over_climate)
+    - [For a thermostat of type ```thermostat_over_valve```:](#for-a-thermostat-of-type-thermostat_over_valve)
  - [Configure the TPI algorithm coefficients](#configure-the-tpi-algorithm-coefficients)
  - [Configure the preset temperature](#configure-the-preset-temperature)
  - [Configure the doors/windows turning on/off the thermostats](#configure-the-doorswindows-turning-onoff-the-thermostats)
@@ -26,6 +30,7 @@
  - [Configure the power management](#configure-the-power-management)
  - [Configure the presence or occupancy](#configure-the-presence-or-occupancy)
  - [Advanced configuration](#advanced-configuration)
+  - [Parameters synthesis](#parameters-synthesis)
 - [Examples tuning](#examples-tuning)
  - [Electrical heater](#electrical-heater)
  - [Central heating (gaz or fuel heating system)](#central-heating-gaz-or-fuel-heating-system)
@@ -53,33 +58,45 @@
 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 3.2**: added the ability to control multiple switches from the same thermostat. In this mode, the switches are triggered with a delay to minimize the power required at one time (we minimize the recovery periods). See [Configuration](#select-the-driven-entity)
+> * **Release 3.7**: Addition of the Versatile Thermostat type `over valve` to control a TRV valve directly or any other dimmer type equipment for heating. Regulation is then done directly by acting on the opening percentage of the underlying entity: 0 the valve is cut off, 100: the valve is fully opened. See [#131](https://github.com/jmcollin78/versatile_thermostat/issues/131)
+> * **Release 3.6**: Added the `motion_off_delay` parameter to improve motion management [#116](https://github.com/jmcollin78/versatile_thermostat/issues/116), [#128](https ://github.com/jmcollin78/versatile_thermostat/issues/128). Added AC (air conditioning) mode for a VTherm over switch. Preparing the Github project to facilitate contributions [#127](https://github.com/jmcollin78/versatile_thermostat/issues/127)
+> * **Release 3.5**: Multiple thermostats when using "thermostat over another thermostat" mode [#113](https://github.com/jmcollin78/versatile_thermostat/issues/113)
+> * **Release 3.4**: bug fixes and expose preset temperatures for AC mode [#103](https://github.com/jmcollin78/versatile_thermostat/issues/103)
+> * **Release 3.3**: add the Air Conditionned mode (AC). This feature allow to use the eventual AC mode of your underlying climate entity. You have to check the "Use AC mode" checkbox in configuration and give preset temperature value for AC mode and AC mode when absent if absence is configured
+> * **Release 3.2**: add the ability to control multiple switches from the same thermostat. In this mode, the switches are triggered with a delay to minimize the power required at one time (we minimize the recovery periods). See [Configuration](#select-the-driven-entity)
+<details>
+<summary>Others releases</summary>
+
 > * **Release 3.1**: added detection of open windows/doors by temperature drop. This new function makes it possible to automatically stop a radiator when the temperature drops suddenly. See [Auto mode](#auto-mode)
 > * **Major release 3.0**: addition of thermostat equipment and associated sensors (binary and non-binary). Much closer to the Home Assistant philosophy, you now have direct access to the energy consumed by the radiator controlled by the thermostat and many other sensors that will be useful in your automations and dashboard.
 > * **release 2.3**: addition of the power and energy measurement of the radiator controlled by the thermostat.
 > * **release 2.2**: addition of a safety function allowing a radiator not to be left heating forever in the event of a thermometer failure
 > * **major release 2.0**: addition of the "over climate" thermostat allowing you to transform any thermostat into a Versatile Thermostat and add all the functions of the latter.
+</details>

 # Thanks for the beer [buymecoffee](https://www.buymeacoffee.com/jmcollin78)
-Many thanks to @salabur, @pvince83 and @bergoglio for the beers. It's very pleasing.
+Many thanks to @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69 for the beers. It's very pleasing.


 # When to use / not use
-This thermostat can control 2 types of equipment:
-1. a heater that only works in on/off mode (named ```thermostat_over_switch```). The minimum configuration required to use this type of thermostat is:
-   has. equipment such as a radiator (a ```switch``` or equivalent),
-   b. a temperature probe for the room (or an input_number),
-   vs. an external temperature sensor (think about weather integration if you don't have one)
-2. another thermostat that has its own operating modes (named ```thermostat_over_climate```). For this type of thermostat, the minimum configuration requires:
-   has. equipment such as air conditioning which is controlled by its own ```climate``` type entity,
-   b. a temperature probe for the room (or an input_number),
-   vs. an external temperature sensor (think about weather integration if you don't have one)
+This thermostat can control 3 types of equipment:
+1. a radiator that only operates in on/off mode (called ``thermostat_over_switch```). The minimum configuration necessary to use this type thermostat is:
+   1. equipment such as a radiator (a ``switch``` or equivalent),
+   2. a temperature probe for the room (or an input_number),
+   3. an external temperature sensor (consider weather integration if you don't have one)
+2. another thermostat which has its own operating modes (named ``thermostat_over_climate```). For this type of thermostat the minimum configuration requires:
+   1. equipment - such as air conditioning, a thermostatic valve - which is controlled by its own ``climate'' type entity,
+3. equipment which can take a value from 0 to 100% (called `thermostat_over_valve`). At 0 the heating is cut off, 100% it is fully opened. This type allows you to control a thermostatic valve (see Shelly valve) which exposes an entity of type `number.` allowing you to directly control the opening of the valve. Versatile Thermostat regulates the room temperature by adjusting the opening percentage, using the interior and exterior temperature sensors using the TPI algorithm described below.
+The ```thermostat_over_climate``` type allows you to add all the functionality provided by VersatileThermostat to your existing equipment. The climate VersatileThermostat entity will control your existing climate entity, turning it off if the windows are open, switching it to Eco mode if no one is present, etc. See [here](#why-a-new-implementation-of-the-thermostat). For this type of thermostat, any heating cycles are controlled by the underlying climate entity and not by the Versatile Thermostat itself.

-The ```thermostat_over_climate``` type allows you to add all the functionality provided by VersatileThermostat to your existing equipment. The climate VersatileThermostat entity will control your climate entity, turning it off if the windows are open, switching it to Eco mode if no one is present, etc. See [here](#why-a-new-implementation-of-the-thermostat). For this type of thermostat, any heating cycles are controlled by the underlying climate entity and not by the Versatile Thermostat itself.
+## Incompatibilities
+
+Some TRV type thermostats are known to be incompatible with the Versatile Thermostat. This is the case for the following valves:
+1. Danfoss POPP valves with temperature feedback. It is impossible to turn off this valve and it self-regulates, causing conflicts with the VTherm,
+2. “Homematic radio” thermostatic valves. They have a duty cycle incompatible with control by the Versatile Thermostat

 # Why another thermostat implementation ?

-
 This component named __Versatile thermostat__ manage the following use cases :
 - Configuration through standard integration GUI (using Config Entry flow),
 - Full uses of **presets mode**,
@@ -97,7 +114,7 @@ This component named __Versatile thermostat__ manage the following use cases :
 ## HACS installation (recommended)

 1. Install [HACS](https://hacs.xyz/). That way you get updates automatically.
-2. Add this Github repository as custom repository in HACS settings.
+2. The Versatile Thermostat integration is now offered directly from the HACF interface (integration tab).
 3. search and install "Versatile Thermostat" in HACS and click `install`.
 4. Restart Home Assistant,
 5. Then you can add an Versatile Thermostat integration in the integration page. You add as many Versatile Thermostat that you need (typically one per heater that should be managed)
@@ -129,33 +146,54 @@ Then follow the configurations steps as follow:

 Give the main mandatory attributes:
 1. a name (will be the name of the integration and also the name of the climate entity)
-2. the type of thermostat ```thermostat_over_switch``` to control a radiator controlled by a switch or ```thermostat_over_climate``` to control another thermostat. Cf. [above](#why-a-new-thermostat-implementation)
+2. the thermostat type ```thermostat_over_switch``` to control a radiator controlled by a switch or ```thermostat_over_climate``` to control another thermostat, or ```thermostat_over_valve``` Cf. [above](# why-a-new-thermostat-implementation)
 4. a temperature sensor entity identifier which gives the temperature of the room in which the radiator is installed,
 5. a temperature sensor entity giving the outside temperature. If you don't have an external sensor, you can use local weather integration
-6. a cycle duration in minutes. On each cycle, the heater will cycle on and then off for a calculated time to reach the target temperature (see [preset](#configure-the-preset-temperature) below),
+6. a cycle duration in minutes. On each cycle, the heater will cycle on and then off for a calculated time to reach the target temperature (see [preset](#configure-the-preset-temperature) below). In ```over_climate``` mode, the cycle is only used to carry out basic controls but does not directly regulate the temperature. It's the underlying climate that does it,
 7. minimum and maximum thermostat temperatures,
 8. the power of the l'équipement which will activate the power and energy sensors of the device,
 9. the list of features that will be used for this thermostat. Depending on your choices, the following configuration screens will appear or not.

 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-      1. With the ```thermostat_over_switch``` type, calculation are done at each cycle. So in case of conditions change, you will have to wait for the next cycle to see a change. For this reason, the cycle should not be too long. **5 min is a good value**,
-      2. if the cycle is too short, the heater could never reach the target temperature indeed for heater with accumulation features and it will be unnecessary solicited
+> 1. With the ```thermostat_over_switch``` type, calculation are done at each cycle. So in case of conditions change, you will have to wait for the next cycle to see a change. For this reason, the cycle should not be too long. **5 min is a good value**,
+> 2. if the cycle is too short, the heater could never reach the target temperature. For the storage radiator for example it will be used unnecessarily.

 ## Select the driven entity
-Depending on your choice on the type of thermostat, you will have to choose a switch type entity or a climate type entity. Only compatible entities are shown.
+Depending on your choice of thermostat type, you will need to choose one or more `switch`, `climate` or `number` type entities. Only entities compatible with the type are presented.

-For a ```thermostat_over_switch``` thermostat:
+> ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*How to choose the type*_
+> The choice of type is important. Even if it is always possible to modify it afterwards via the configuration HMI, it is preferable to ask yourself the following few questions:
+> 1. **what type of equipment am I going to pilot?** In order, here is what to do:
+>    1. if you have a thermostatic valve (TRV) that can be controlled in Home Assistant via a ```number``` type entity (for example a _Shelly TRV_), choose the `over_valve` type. It is the most direct type and which ensures the best regulation,
+>    2. if you have an electric radiator (with or without pilot wire) and a ```switch``` type entity allows you to turn it on or off, then the ```over_switch``` type is preferable. Regulation will be done by the Versatile Thermostat according to the temperature measured by your thermometer, where you have placed it,
+>    3. in all other cases, use the ```over_climate``` mode. You keep your original `climate` entity and the Versatile Thermostat "only" controls the on/off and the target temperature of your original thermostat. Regulation is done by your original thermostat in this case. This mode is particularly suitable for all-in-one reversible air conditioning systems whose exposure in Home Assistant is limited to a `climate` type entity.
+> 2. **what type of regulation do I want?** If the controlled equipment has its own regulation mechanism (air conditioning, certain TRV valve) and this regulation works well, opt for an ``over_climate```
+It is possible to choose an over switch thermostat which controls air conditioning by checking the "AC Mode" box. In this case, only the cooling mode will be visible.
+
+### For a ```thermostat_over_switch``` type thermostat
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity.png?raw=true)
-The algorithm to be used today is limited to TPI is available. See [algorithm](#algorithm)
-If several type entities are configured, the thermostat staggers the activations in order to minimize the number of active switches at a time t. This allows a better distribution of power since each radiator will turn on in turn.
+The algorithm to use is currently limited to TPI is available. See [algorithm](#algorithm).
+If several type entities are configured, the thermostat shifts the activations in order to minimize the number of switches active at a time t. This allows for better power distribution since each radiator will turn on in turn.
 Example of synchronized triggering:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/multi-switch-activation.png?raw=true)

-For a ```thermostat_over_climate``` thermostat:
+It is possible to choose an over switch thermostat which controls air conditioning by checking the "AC Mode" box. In this case, only the cooling mode will be visible.
+
+
+### For a thermostat of type ```thermostat_over_climate```:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity2.png?raw=true)

+It is possible to choose an over climate thermostat which controls reversible air conditioning by checking the “AC Mode” box. In this case, depending on the equipment ordered, you will have access to heating and/or cooling.
+
+### For a thermostat of type ```thermostat_over_valve```:
+![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity3.png?raw=true)
+You can choose up to domain entity ```number``` or ```ìnput_number``` which will control the valves.
+The algorithm to use is currently limited to TPI is available. See [algorithm](#algorithm).
+
+It is possible to choose an over valve thermostat which controls air conditioning by checking the "AC Mode" box. In this case, only the cooling mode will be visible.
+
 ## Configure the TPI algorithm coefficients
-Click on 'Validate' on the previous page and you will get there:
+click on 'Validate' on the previous page, and if you choose a  ```over_switch``` or ```over_valve``` thermostat and you will get there:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-tpi.png?raw=true)

 For more informations on the TPI algorithm and tuned please refer to [algorithm](#algorithm).
@@ -169,14 +207,16 @@ The preset mode allows you to pre-configurate targeted temperature. Used in conj
 - **Comfort** : device is in comfort mode
 - **Boost** : device turn all valve full up

+ If AC mode is used, you will also be able to configure temperatures when the equipment is in cooling mode.
+
 **None** is always added in the list of modes, as it is a way to not use the presets modes but a **manual temperature** instead.

 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-    1. Changing manually the target temperature, set the preset to None (no preset). This way you can always set a target temperature even if no preset are available.
-    2. standard ``Away`` preset is a hidden preset which is not directly selectable. Versatile Thermostat uses the presence management or movement management to set automatically and dynamically the target temperature depending on a presence in the home or an activity in the room. See [presence management](#configure-the-presence-management).
-    3. if you uses the power shedding management, you will see a hidden preset named ``power``. The heater preset is set to ``power`` when overpowering conditions are encountered and shedding is active for this heater. See [power management](#configure-the-power-management).
-    4. if you uses the advanced configuration you will see the preset set to ``security`` if the temperature could not be retrieved after a certain delay
-    5. ff you don't want to use the preseet, give 0 as temperature. The preset will then been ignored and will not displayed in the front component
+>  1. Changing manually the target temperature, set the preset to None (no preset). This way you can always set a target temperature even if no preset are available.
+>  2. standard ``Away`` preset is a hidden preset which is not directly selectable. Versatile Thermostat uses the presence management or movement management to set automatically and dynamically the target temperature depending on a presence in the home or an activity in the room. See [presence management](#configure-the-presence-management).
+>  3. if you uses the power shedding management, you will see a hidden preset named ``power``. The heater preset is set to ``power`` when overpowering conditions are encountered and shedding is active for this heater. See [power management](#configure-the-power-management).
+>  4. if you uses the advanced configuration you will see the preset set to ``security`` if the temperature could not be retrieved after a certain delay
+>  5. ff you don't want to use the preseet, give 0 as temperature. The preset will then been ignored and will not displayed in the front component

 ## Configure the doors/windows turning on/off the thermostats
 You must have chosen the ```With opening detection``` feature on the first page to arrive on this page.
@@ -213,10 +253,11 @@ To properly adjust it is advisable to display on the same historical graph the t
 And that's all ! your thermostat will turn off when the windows are open and turn back on when closed.

 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-    1. If you want to use **multiple door/window sensors** to automate your thermostat, just create a group with the usual behavior (https://www.home-assistant.io/integrations/binary_sensor.group/)
-    2. If you don't have a window/door sensor in your room, just leave the sensor entity id blank,
-    3. **Only one mode is allowed**. You cannot configure a thermostat with a sensor and automatic detection. The 2 modes may contradict each other, it is not possible to have the 2 modes at the same time,
-    4. It is not recommended to use the automatic mode for equipment subject to frequent and normal temperature variations (corridors, open areas, ...)
+> 1. If you want to use **multiple door/window sensors** to automate your thermostat, just create a group with the usual behavior (https://www.home-assistant.io/integrations/binary_sensor.group/)
+> 2. If you don't have a window/door sensor in your room, just leave the sensor entity id blank,
+> 3. **Only one mode is allowed**. You cannot configure a thermostat with a sensor and automatic detection. The 2 modes may contradict each other, it is not possible to have the 2 modes at the same time,
+> 4. It is not recommended to use the automatic mode for equipment subject to frequent and normal temperature variations (corridors, open areas, ...)
+
 ## Configure the activity mode or motion detection
 If you choose the ```Motion management``` feature, lick on 'Validate' on the previous page and you will get there:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-motion.png?raw=true)
@@ -225,19 +266,21 @@ We will now see how to configure the new Activity mode.
 What we need:
 - a **motion sensor**. The entity id of a motion sensor. Motion sensor states should be 'on' (motion detected) or 'off' (no motion detected)
 - a **motion delay** (in seconds) duration defining how long we wait for motion confirmation before considering the motion
+- a **end of motion delay** (in seconds) duration defining how long we wait for end of motion confirmation before considering the end of motion
 - a **target "motion" preset**. We will used the temperature of this preset when an activity is detected.
 - a **target "no motion" preset**. We will used the temperature of this second preset when no activity is detected.

-So imagine we want to have the following behavior :
- we have room with a thermostat set in activity mode, the "motion" mode chosen is comfort (21.5C), the "no motion" mode chosen is Eco (18.5 C) and the motion delay is 5 min.
- the room is empty for a while (no activity detected), the temperature of this room is 18.5 C
- somebody enters into the room, an activity is detected the temperature is set to 21.5 C
- the person leaves the room, after 5 min the temperature is set back to 18.5 C
+- we have a room with a thermostat set to activity mode, the "movement" mode chosen is comfort (21.5°C), the "no movement" mode chosen is Eco (18.5°C) and the movement delay is 30 sec during detection and 5 minutes at the end of detection.
+- the room has been empty for a while (no activity detected), the temperature of this room is 18.5°
+- someone enters the room, activity is detected if movement is present for at least 30 seconds. The temperature then rises to 21.5°
+- if the movement is present for less than 30 seconds (rapid passage), the temperature remains at 18.5°,
+- imagine that the temperature has risen to 21.5°, when the person leaves the room, after 5 minutes the temperature is reduced to 18.5°.
+- if the person returns before 5 minutes, the temperature remains at 21.5°

 For this to work, the climate thermostat should be in ``Activity`` preset mode.

 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true)  _*Notes*_
-    1. Be aware that as for the others preset modes, ``Activity`` will only be proposed if it's correctly configure. In other words, the 4 configuration keys have to be set if you want to see Activity in home assistant Interface
+> 1. Be aware that as for the others preset modes, ``Activity`` will only be proposed if it's correctly configure. In other words, the 4 configuration keys have to be set if you want to see Activity in home assistant Interface

 ## Configure the power management

@@ -251,10 +294,10 @@ Note that all power values should have the same units (kW or W for example).
 This allows you to change the max power along time using a Scheduler or whatever you like.

 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true)  _*Notes*_
-    1. When shedding is encountered, the heater is set to the preset named ``power``. This is a hidden preset, you cannot select it manually.
-    2. I use this to avoid exceeded the limit of my electrical power contract when an electrical vehicle is charging. This makes a kind of auto-regulation.
-    3. Always keep a margin, because max power can be briefly exceeded while waiting for the next cycle calculation typically or by not regulated equipement.
-    4. If you don't want to use this feature, just leave the entities id empty
+> 1. When shedding is encountered, the heater is set to the preset named ``power``. This is a hidden preset, you cannot select it manually.
+> 2. I use this to avoid exceeded the limit of my electrical power contract when an electrical vehicle is charging. This makes a kind of auto-regulation.
+> 3. Always keep a margin, because max power can be briefly exceeded while waiting for the next cycle calculation typically or by not regulated equipement.
+> 4. If you don't want to use this feature, just leave the entities id empty

 ## Configure the presence or occupancy
 If you choose the ```Presence management``` feature, this feature allows you to dynamically changes the temperature of all configured Versatile thermostat's presets when nobody is at home or when someone comes back home. For this, you have to configure the temperature that will be used for each preset when presence is off. When the occupancy sensor turns to off, those tempoeratures will be used. When it turns on again the "normal" temperature configured for the preset is used. See [preset management](#configure-the-preset-temperature).
@@ -268,9 +311,11 @@ For this you need to configure:
 3. The **temperature used in Comfort** preset when absent,
 4. The **temperature used in Boost** preset when absent

+Si le mode AC est utilisé, vous pourrez aussi configurer les températures lorsque l'équipement en mode climatisation.
+
 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true)  _*Notes*_
-      1. the switch of temperature is immediate and is reflected on the front component. The calculation will take the new target temperature into account at the next cycle calculation,
-      2. you can use direct person.xxxx sensor or group of sensors of Home Assistant. The presence sensor handles ``on`` or ``home`` states as present and ``off`` or ``not_home`` state as absent.
+> 1. the switch of temperature is immediate and is reflected on the front component. The calculation will take the new target temperature into account at the next cycle calculation,
+> 2. you can use direct person.xxxx sensor or group of sensors of Home Assistant. The presence sensor handles ``on`` or ``home`` states as present and ``off`` or ``not_home`` state as absent.

 ## Advanced configuration
 Those parameters allows to fine tune the thermostat.
@@ -290,11 +335,74 @@ The fourth parameter (``security_default_on_percent``) is the ``on_percent`` val
 See [example tuning](#examples-tuning) for common tuning examples

 >![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true) _*Notes*_
-    1. When the temperature sensor comes to life and returns the temperatures, the preset will be restored to its previous value,
-    3. Attention, two temperatures are needed: internal temperature and external temperature and each must give the temperature, otherwise the thermostat will be in "security" preset,
-    4. A service is available that allows you to set the 3 security parameters. This can be used to adapt the security function to your use.
-    5. For natural usage, the ``security_default_on_percent`` should be less than ``security_min_on_percent``,
-    6. When a ``thermostat_over_climate`` type thermostat goes into ``security`` mode it is turned off. The ``security_min_on_percent`` and ``security_default_on_percent`` parameters are then not used.
+> 1. When the temperature sensor comes to life and returns the temperatures, the preset will be restored to its previous value,
+> 2. Attention, two temperatures are needed: internal temperature and external temperature and each must give the temperature, otherwise the thermostat will be in "security" preset,
+> 3. A service is available that allows you to set the 3 security parameters. This can be used to adapt the security function to your use.
+> 4. For natural usage, the ``security_default_on_percent`` should be less than ``security_min_on_percent``,
+> 5. When a ``thermostat_over_climate`` type thermostat goes into ``security`` mode it is turned off. The ``security_min_on_percent`` and ``security_default_on_percent`` parameters are then not used.
+
+## Parameters synthesis
+
+| Paramètre | Libellé | "over switch" | "over climate" | "over valve" |
+| ----------| --------| --- | --- | -- |
+| ``name`` | Name | X | X | X |
+| ``thermostat_type`` | Thermostat type | X | X | X |
+| ``temperature_sensor_entity_id`` | Temperature sensor entity id | X | - | X |
+| ``external_temperature_sensor_entity_id`` | External temperature sensor entity id | X | - | X |
+| ``cycle_min`` | Cycle duration (minutes) | X | X | X |
+| ``temp_min`` | Minimal temperature allowed | X | X | X |
+| ``temp_max`` | Maximal temperature allowed | X | X | X |
+| ``device_power`` | Device power | X | X | X |
+| ``use_window_feature`` | Use window detection | X | X | X |
+| ``use_motion_feature`` | Use motion detection | X | X | X |
+| ``use_power_feature`` | Use power management | X | X | X |
+| ``use_presence_feature`` | Use presence detection | X | X | X |
+| ``heater_entity1_id`` | 1rst heater switch | X | - | - |
+| ``heater_entity2_id`` | 2nd heater switch | X | - | - |
+| ``heater_entity3_id`` | 3rd heater switch | X | - | - |
+| ``heater_entity4_id`` | 4th heater switch | X | - | - |
+| ``proportional_function`` | Algorithm | X | - | X |
+| ``climate_entity1_id`` | 1rst underlying climate | - | X | - |
+| ``climate_entity2_id`` | 2nd underlying climate | - | X | - |
+| ``climate_entity3_id`` | 3rd underlying climate | - | X | - |
+| ``climate_entity4_id`` | 4th underlying climate | - | X | - |
+| ``valve_entity1_id`` | 1rst underlying valve | - | - | X |
+| ``valve_entity2_id`` | 2nd underlying valve | - | - | X |
+| ``valve_entity3_id`` | 3rd underlying valve | - | - | X |
+| ``valve_entity4_id`` | 4th underlying valve | - | - | X |
+| ``ac_mode`` | Use the Air Conditioning (AC) mode | X | X | X |
+| ``tpi_coef_int`` | Coefficient to use for internal temperature delta | X | - | X |
+| ``tpi_coef_ext`` | Coefficient to use for external temperature delta | X | - | X |
+| ``eco_temp`` | Temperature in Eco preset | X | X | X |
+| ``comfort_temp`` | Temperature in Comfort preset | X | X | X |
+| ``boost_temp`` | Temperature in Boost preset | X | X | X |
+| ``eco_ac_temp`` | Temperature in Eco preset for AC mode | X | X | X |
+| ``comfort_ac_temp`` | Temperature in Comfort preset for AC mode | X | X | X |
+| ``boost_ac_temp`` | Temperature in Boost preset for AC mode | X | X | X |
+| ``window_sensor_entity_id`` | Window sensor entity id |  X | X | X |
+| ``window_delay`` | Window sensor delay (seconds) | X | X | X |
+| ``window_auto_open_threshold`` | Temperature decrease threshold for automatic window open detection (in °/min) | X | X | X |
+| ``window_auto_close_threshold`` | Temperature increase threshold for end of automatic detection (in °/min) | X | X | X |
+| ``window_auto_max_duration`` | Maximum duration of automatic window open detection (in min) | X | X | X |
+| ``motion_sensor_entity_id`` | Motion sensor entity id | X | X | X |
+| ``motion_delay`` | Delay before considering the motion (seconds) | X | X | X |
+| ``motion_off_delay`` | Delay before considering the end of motion (seconds) | X | X | X |
+| ``motion_preset`` | Preset to use when motion is detected | X | X | X |
+| ``no_motion_preset`` | Preset to use when no motion is detected | X | X | X |
+| ``power_sensor_entity_id`` | Power sensor entity id | X | X | X |
+| ``max_power_sensor_entity_id`` | Max power sensor entity id | X | X | X |
+| ``power_temp`` | Temperature for Power shedding | X | X | X |
+| ``presence_sensor_entity_id`` | Presence sensor entity id | X | X | X |
+| ``eco_away_temp`` | Temperature in Eco preset when no presence | X | X | X |
+| ``comfort_away_temp`` | Temperature in Comfort preset when no presence | X | X | X |
+| ``boost_away_temp`` | Temperature in Boost preset when no presence | X | X | X |
+| ``eco_ac_away_temp`` | Temperature in Eco preset when no presence in AC mode | X | X | X |
+| ``comfort_ac_away_temp`` | Temperature in Comfort preset when no presence in AC mode | X | X | X |
+| ``boost_ac_away_temp`` | Temperature in Boost preset when no presence in AC mode | X | X | X |
+| ``minimal_activation_delay`` | Minimal activation delay | X | - | X |
+| ``security_delay_min`` | Security delay (in minutes) | X | X | X |
+| ``security_min_on_percent`` | Minimal power percent to enable security mode | X | X | X |
+| ``security_default_on_percent`` | Power percent to use in security mode | X | X | X |

 # Examples tuning

@@ -345,7 +453,7 @@ This integration uses a proportional algorithm. A Proportional algorithm is usef
 This algorithm make the temperature converge and stop oscillating.

 ## TPI algorithm
-The TPI algorithm consist in the calculation at each cycle of a percentage of On state vs Off state for the heater using the target temperature, the current temperature in the room and the current external temperature.
+The TPI algorithm consist in the calculation at each cycle of a percentage of On state vs Off state for the heater using the target temperature, the current temperature in the room and the current external temperature. This algorithm is therefore only valid for Versatile Thermostats which regulate: `over_switch` and `over_valve`.

 The percentage is calculated with this formula:

@@ -360,6 +468,8 @@ To tune those coefficients keep in mind that:
 3. **if reaching the target temperature is too slow**, you can increase the ``coef_int`` to give more power to the heater,
 4. **if reaching the target temperature is too fast and some oscillations appears** around the target, you can decrease the ``coef_int`` to give less power to the heater

+In type `over_valve` the `on_percent` is reduced to a value between 0 and 100% and is used directly to control the opening of the valve.
+
 See some situations at [examples](#some-results).

 # Sensors
@@ -381,7 +491,8 @@ In order, there are:
 10. presence status (if presence management is configured),
 11. security status,
 12. opening status (if opening management is configured),
-13. motion status (if motion management is configured)
+13. motion status (if motion management is configured),
+14. the valve opening percentage (for the `over_valve` type)

 To color the sensors, add these lines and customize them as needed, in your configuration.yaml:

@@ -432,6 +543,17 @@ target:
    entity_id: climate.my_thermostat
 ```

+Or to change the preset of the AC mode, add _ac to the preset name like this:
+```
+service: versatile_thermostat.set_preset_temperature
+data:
+    preset: boost_ac
+    temperature: 25
+    temperature_away: 30
+target:
+    entity_id: climate.my_thermostat
+```
+
 > ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true)  _*Notes*_
    - after a restart the preset are resetted to the configured temperature. If you want your change to be permanent you should modify the temperature preset into the confguration of the integration.

@@ -512,6 +634,7 @@ Custom attributes are the following:
 | ``last_update_datetime`` | The date and time in ISO8866 format of this state |
 | ``friendly_name`` | The name of the thermostat |
 | ``supported_features`` | A combination of all features supported by this thermostat. See official climate integration documentation for more informations |
+| ``valve_open_percent`` | The opening percentage of the valve |

 # Some results

--- a/68
+++ b/68
@@ -4,35 +4,43 @@

 . .bashrc

-cd $HA
+function get_dev() {
+     pip install -r requirements_dev.txt
+     pip install -r requirements_test.txt
+     if [ -d /home/vscode/core ]; then
+        sudo chown -R vscode:  /home/vscode/core
+    fi
+}

-echo "arguments are: "$*
-# Post installation of container
-command=$1
-if [ "$command" == "install" ]; then
-    echo "Running container post installation"
-    script/setup
-fi
+echo "arguments are: "$1

-if [ "$command" == "start" ]; then
-    echo "Running container start"
-    hass -c ./config --debug
-fi
-
-if [ "$command" == "translations" ]; then
-    echo "Running container start"
-    python3 -m script.translations develop
-fi
-
-if [ "$command" == "hassfest" ]; then
-    echo "Running container start"
-    python3 -m script.hassfest
-    # python -m script.hassfest --requirements --action validate --integration-path config/custom_components/versatile_thermostat/
-fi
-
-if [ "$command" == "restart" ]; then
-    echo "Killing existing container"
-    pkill hass
-    echo "Killing existing container"
-    hass -c ./config
-fi
+case $1 in
+    start)
+        echo "Running container start"
+        ./scripts/starts_ha.sh
+    ;;
+    dev-setup)
+        get_dev
+    ;;
+    install)
+        echo "Running container post installation"
+        script/setup
+    ;;
+    translations)
+        echo "Running container start"
+        cd $HA
+        python3 -m script.translations develop
+    ;;
+    hassfest)
+        echo "Running container start"
+        python3 -m script.hassfest
+        # python -m script.hassfest --requirements --action validate --integration-path config/custom_components/versatile_thermostat/
+    ;;
+    restart)
+        echo "Killing existing container"
+        pkill hass
+        echo "Restarting existing container"
+        pwd
+        ./scripts/starts_ha.sh
+    ;;
+esac
--- a/custom_components/versatile_thermostat/init.py
+++ b/custom_components/versatile_thermostat/init.py
@@ -8,7 +8,7 @@ import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant

-from .climate import VersatileThermostat
+from .base_thermostat import BaseThermostat

 from .const import DOMAIN, PLATFORMS

--- a/custom_components/versatile_thermostat/base_thermostat.py
+++ b/custom_components/versatile_thermostat/base_thermostat.py
--- a/custom_components/versatile_thermostat/binary_sensor.py
+++ b/custom_components/versatile_thermostat/binary_sensor.py
@@ -3,7 +3,7 @@ import logging

 from homeassistant.core import HomeAssistant, callback, Event

-from homeassistant.const import STATE_ON
+from homeassistant.const import STATE_ON, STATE_OFF

 from homeassistant.components.binary_sensor import (
    BinarySensorEntity,
@@ -54,7 +54,9 @@ async def async_setup_entry(
 class SecurityBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
    """Representation of a BinarySensor which exposes the security state"""

-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+    def __init__(
+        self, hass: HomeAssistant, unique_id, name, entry_infos
+    ) -> None:  # pylint: disable=unused-argument
        """Initialize the SecurityState Binary sensor"""
        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
        self._attr_name = "Security state"
@@ -87,7 +89,9 @@ class SecurityBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
 class OverpoweringBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
    """Representation of a BinarySensor which exposes the overpowering state"""

-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+    def __init__(
+        self, hass: HomeAssistant, unique_id, name, entry_infos
+    ) -> None:  # pylint: disable=unused-argument
        """Initialize the OverpoweringState Binary sensor"""
        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
        self._attr_name = "Overpowering state"
@@ -120,7 +124,9 @@ class OverpoweringBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity
 class WindowBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
    """Representation of a BinarySensor which exposes the window state"""

-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+    def __init__(
+        self, hass: HomeAssistant, unique_id, name, entry_infos
+    ) -> None:  # pylint: disable=unused-argument
        """Initialize the WindowState Binary sensor"""
        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
        self._attr_name = "Window state"
@@ -133,12 +139,17 @@ class WindowBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
        _LOGGER.debug("%s - climate state change", self._attr_unique_id)

        old_state = self._attr_is_on
-        self._attr_is_on = (
-            self.my_climate.window_state == STATE_ON
-            or self.my_climate.window_auto_state == STATE_ON
-        )
-        if old_state != self._attr_is_on:
-            self.async_write_ha_state()
+        # Issue 120 - only take defined presence value
+        if self.my_climate.window_state in [
+            STATE_ON,
+            STATE_OFF,
+        ] or self.my_climate.window_auto_state in [STATE_ON, STATE_OFF]:
+            self._attr_is_on = (
+                self.my_climate.window_state == STATE_ON
+                or self.my_climate.window_auto_state == STATE_ON
+            )
+            if old_state != self._attr_is_on:
+                self.async_write_ha_state()
        return

    @property
@@ -159,7 +170,9 @@ class WindowBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
 class MotionBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
    """Representation of a BinarySensor which exposes the motion state"""

-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+    def __init__(
+        self, hass: HomeAssistant, unique_id, name, entry_infos
+    ) -> None:  # pylint: disable=unused-argument
        """Initialize the MotionState Binary sensor"""
        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
        self._attr_name = "Motion state"
@@ -171,9 +184,11 @@ class MotionBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
        """Called when my climate have change"""
        _LOGGER.debug("%s - climate state change", self._attr_unique_id)
        old_state = self._attr_is_on
-        self._attr_is_on = self.my_climate.motion_state == STATE_ON
-        if old_state != self._attr_is_on:
-            self.async_write_ha_state()
+        # Issue 120 - only take defined presence value
+        if self.my_climate.motion_state in [STATE_ON, STATE_OFF]:
+            self._attr_is_on = self.my_climate.motion_state == STATE_ON
+            if old_state != self._attr_is_on:
+                self.async_write_ha_state()
        return

    @property
@@ -191,7 +206,9 @@ class MotionBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
 class PresenceBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
    """Representation of a BinarySensor which exposes the presence state"""

-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+    def __init__(
+        self, hass: HomeAssistant, unique_id, name, entry_infos
+    ) -> None:  # pylint: disable=unused-argument
        """Initialize the PresenceState Binary sensor"""
        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
        self._attr_name = "Presence state"
@@ -204,9 +221,11 @@ class PresenceBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):

        _LOGGER.debug("%s - climate state change", self._attr_unique_id)
        old_state = self._attr_is_on
-        self._attr_is_on = self.my_climate.presence_state == STATE_ON
-        if old_state != self._attr_is_on:
-            self.async_write_ha_state()
+        # Issue 120 - only take defined presence value
+        if self.my_climate.presence_state in [STATE_ON, STATE_OFF]:
+            self._attr_is_on = self.my_climate.presence_state == STATE_ON
+            if old_state != self._attr_is_on:
+                self.async_write_ha_state()
        return

    @property
--- a/custom_components/versatile_thermostat/climate.py
+++ b/custom_components/versatile_thermostat/climate.py
--- a/custom_components/versatile_thermostat/commons.py
+++ b/custom_components/versatile_thermostat/commons.py
@@ -4,10 +4,11 @@ from datetime import timedelta
 from homeassistant.core import HomeAssistant, callback, Event
 from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.entity import Entity, DeviceInfo, DeviceEntryType
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.helpers.event import async_track_state_change_event, async_call_later

-from .climate import VersatileThermostat
+from .base_thermostat import BaseThermostat
 from .const import DOMAIN, DEVICE_MANUFACTURER

 _LOGGER = logging.getLogger(__name__)
@@ -16,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
 class VersatileThermostatBaseEntity(Entity):
    """A base class for all entities"""

-    _my_climate: VersatileThermostat
+    _my_climate: BaseThermostat
    hass: HomeAssistant
    _config_id: str
    _device_name: str
@@ -36,7 +37,7 @@ class VersatileThermostatBaseEntity(Entity):
        return False

    @property
-    def my_climate(self) -> VersatileThermostat | None:
+    def my_climate(self) -> BaseThermostat | None:
        """Returns my climate if found"""
        if not self._my_climate:
            self._my_climate = self.find_my_versatile_thermostat()
@@ -53,7 +54,7 @@ class VersatileThermostatBaseEntity(Entity):
            model=DOMAIN,
        )

-    def find_my_versatile_thermostat(self) -> VersatileThermostat:
+    def find_my_versatile_thermostat(self) -> BaseThermostat:
        """Find the underlying climate entity"""
        try:
            component: EntityComponent[ClimateEntity] = self.hass.data[CLIMATE_DOMAIN]
--- a/custom_components/versatile_thermostat/config_flow.py
+++ b/custom_components/versatile_thermostat/config_flow.py
@@ -1,3 +1,7 @@
+# pylint: disable=line-too-long
+# pylint: disable=too-many-lines
+# pylint: disable=invalid-name
+
 """Config flow for Versatile Thermostat integration."""
 from __future__ import annotations

@@ -24,6 +28,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers import selector
 from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN
 from homeassistant.components.input_boolean import (
    DOMAIN as INPUT_BOOLEAN_DOMAIN,
 )
@@ -55,13 +60,16 @@ from .const import (
    CONF_WINDOW_AUTO_OPEN_THRESHOLD,
    CONF_MOTION_SENSOR,
    CONF_MOTION_DELAY,
+    CONF_MOTION_OFF_DELAY,
    CONF_MOTION_PRESET,
    CONF_NO_MOTION_PRESET,
    CONF_DEVICE_POWER,
    CONF_CYCLE_MIN,
    CONF_PRESET_POWER,
    CONF_PRESETS,
+    CONF_PRESETS_WITH_AC,
    CONF_PRESETS_AWAY,
+    CONF_PRESETS_AWAY_WITH_AC,
    CONF_PRESETS_SELECTIONABLE,
    CONF_PROP_FUNCTION,
    CONF_TPI_COEF_EXT,
@@ -79,11 +87,20 @@ from .const import (
    CONF_THERMOSTAT_TYPE,
    CONF_THERMOSTAT_SWITCH,
    CONF_CLIMATE,
+    CONF_CLIMATE_2,
+    CONF_CLIMATE_3,
+    CONF_CLIMATE_4,
    CONF_USE_WINDOW_FEATURE,
    CONF_USE_MOTION_FEATURE,
    CONF_USE_PRESENCE_FEATURE,
    CONF_USE_POWER_FEATURE,
+    CONF_AC_MODE,
    CONF_THERMOSTAT_TYPES,
+    CONF_THERMOSTAT_VALVE,
+    CONF_VALVE,
+    CONF_VALVE_2,
+    CONF_VALVE_3,
+    CONF_VALVE_4,
    UnknownEntity,
    WindowOpenDetectionMethod,
 )
@@ -132,35 +149,6 @@ def add_suggested_values_to_schema(
    return vol.Schema(schema)


-# def is_temperature_sensor(sensor: RegistryEntry):
-#     """Check if a registryEntry is a temperature sensor or assimilable to a temperature sensor"""
-#     if not sensor.entity_id.startswith(
-#         INPUT_NUMBER_DOMAIN
-#     ) and not sensor.entity_id.startswith(SENSOR_DOMAIN):
-#         return False
-#     return (
-#         sensor.device_class == TEMPERATURE
-#         or sensor.original_device_class == TEMPERATURE
-#         or sensor.unit_of_measurement in TEMPERATURE_UNITS
-#     )
-#
-#
-# def is_power_sensor(sensor: RegistryEntry):
-#     """Check if a registryEntry is a power sensor or assimilable to a temperature sensor"""
-#     if not sensor.entity_id.startswith(
-#         INPUT_NUMBER_DOMAIN
-#     ) and not sensor.entity_id.startswith(SENSOR_DOMAIN):
-#         return False
-#     return (
-#         sensor.unit_of_measurement
-#         in [
-#             UnitOfPower.KILO_WATT,
-#             UnitOfPower.WATT,
-#             UnitOfPower.BTU_PER_HOUR,
-#         ]
-#     )
-
-
 class VersatileThermostatBaseConfigFlow(FlowHandler):
    """The base Config flow class. Used to put some code in commons."""

@@ -249,6 +237,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                        PROPORTIONAL_FUNCTION_TPI,
                    ]
                ),
+                vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
            }
        )

@@ -257,6 +246,49 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                vol.Required(CONF_CLIMATE): selector.EntitySelector(
                    selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
                ),
+                vol.Optional(CONF_CLIMATE_2): selector.EntitySelector(
+                    selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+                ),
+                vol.Optional(CONF_CLIMATE_3): selector.EntitySelector(
+                    selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+                ),
+                vol.Optional(CONF_CLIMATE_4): selector.EntitySelector(
+                    selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+                ),
+                vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
+            }
+        )
+
+        self.STEP_THERMOSTAT_VALVE = vol.Schema(  # pylint: disable=invalid-name
+            {
+                vol.Required(CONF_VALVE): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Optional(CONF_VALVE_2): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Optional(CONF_VALVE_3): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Optional(CONF_VALVE_4): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Required(
+                    CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI
+                ): vol.In(
+                    [
+                        PROPORTIONAL_FUNCTION_TPI,
+                    ]
+                ),
+                vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
            }
        )

@@ -274,6 +306,15 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            }
        )

+        self.STEP_PRESETS_WITH_AC_DATA_SCHEMA = (  # pylint: disable=invalid-name
+            vol.Schema(  # pylint: disable=invalid-name
+                {
+                    vol.Optional(v, default=0.0): vol.Coerce(float)
+                    for (k, v) in CONF_PRESETS_WITH_AC.items()
+                }
+            )
+        )
+
        self.STEP_WINDOW_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
            {
                vol.Optional(CONF_WINDOW_SENSOR): selector.EntitySelector(
@@ -296,6 +337,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                    ),
                ),
                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"): vol.In(
                    CONF_PRESETS_SELECTIONABLE
                ),
@@ -340,6 +382,27 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            }
        )

+        self.STEP_PRESENCE_WITH_AC_DATA_SCHEMA = (  # pylint: disable=invalid-name
+            vol.Schema(
+                {
+                    vol.Optional(CONF_PRESENCE_SENSOR): selector.EntitySelector(
+                        selector.EntitySelectorConfig(
+                            domain=[
+                                PERSON_DOMAIN,
+                                BINARY_SENSOR_DOMAIN,
+                                INPUT_BOOLEAN_DOMAIN,
+                            ]
+                        ),
+                    ),
+                }
+            ).extend(
+                {
+                    vol.Optional(v, default=17): vol.Coerce(float)
+                    for (k, v) in CONF_PRESETS_AWAY_WITH_AC.items()
+                }
+            )
+        )
+
        self.STEP_ADVANCED_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
            {
                vol.Required(
@@ -459,6 +522,10 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
            return await self.generic_step(
                "type", self.STEP_THERMOSTAT_SWITCH, user_input, self.async_step_tpi
            )
+        elif self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_VALVE:
+            return await self.generic_step(
+                "type", self.STEP_THERMOSTAT_VALVE, user_input, self.async_step_tpi
+            )
        else:
            return await self.generic_step(
                "type",
@@ -489,9 +556,12 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
        elif self._infos[CONF_USE_PRESENCE_FEATURE]:
            next_step = self.async_step_presence

-        return await self.generic_step(
-            "presets", self.STEP_PRESETS_DATA_SCHEMA, user_input, next_step
-        )
+        if self._infos.get(CONF_AC_MODE) is True:
+            schema = self.STEP_PRESETS_WITH_AC_DATA_SCHEMA
+        else:
+            schema = self.STEP_PRESETS_DATA_SCHEMA
+
+        return await self.generic_step("presets", schema, user_input, next_step)

    async def async_step_window(self, user_input: dict | None = None) -> FlowResult:
        """Handle the window  sensor flow steps"""
@@ -542,9 +612,14 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
        """Handle the presence management flow steps"""
        _LOGGER.debug("Into ConfigFlow.async_step_presence user_input=%s", user_input)

+        if self._infos.get(CONF_AC_MODE) is True:
+            schema = self.STEP_PRESENCE_WITH_AC_DATA_SCHEMA
+        else:
+            schema = self.STEP_PRESENCE_DATA_SCHEMA
+
        return await self.generic_step(
            "presence",
-            self.STEP_PRESENCE_DATA_SCHEMA,
+            schema,
            user_input,
            self.async_step_advanced,
        )
@@ -642,6 +717,10 @@ class VersatileThermostatOptionsFlowHandler(
            return await self.generic_step(
                "type", self.STEP_THERMOSTAT_SWITCH, user_input, self.async_step_tpi
            )
+        elif self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_VALVE:
+            return await self.generic_step(
+                "type", self.STEP_THERMOSTAT_VALVE, user_input, self.async_step_tpi
+            )
        else:
            return await self.generic_step(
                "type",
@@ -676,9 +755,12 @@ class VersatileThermostatOptionsFlowHandler(
        elif self._infos[CONF_USE_PRESENCE_FEATURE]:
            next_step = self.async_step_presence

-        return await self.generic_step(
-            "presets", self.STEP_PRESETS_DATA_SCHEMA, user_input, next_step
-        )
+        if self._infos.get(CONF_AC_MODE) is True:
+            schema = self.STEP_PRESETS_WITH_AC_DATA_SCHEMA
+        else:
+            schema = self.STEP_PRESETS_DATA_SCHEMA
+
+        return await self.generic_step("presets", schema, user_input, next_step)

    async def async_step_window(self, user_input: dict | None = None) -> FlowResult:
        """Handle the window  sensor flow steps"""
@@ -736,9 +818,14 @@ class VersatileThermostatOptionsFlowHandler(
            "Into OptionsFlowHandler.async_step_presence user_input=%s", user_input
        )

+        if self._infos.get(CONF_AC_MODE) is True:
+            schema = self.STEP_PRESENCE_WITH_AC_DATA_SCHEMA
+        else:
+            schema = self.STEP_PRESENCE_DATA_SCHEMA
+
        return await self.generic_step(
            "presence",
-            self.STEP_PRESENCE_DATA_SCHEMA,
+            schema,
            user_input,
            self.async_step_advanced,
        )
--- a/custom_components/versatile_thermostat/const.py
+++ b/custom_components/versatile_thermostat/const.py
@@ -16,6 +16,11 @@ from homeassistant.exceptions import HomeAssistantError
 from .prop_algorithm import (
    PROPORTIONAL_FUNCTION_TPI,
 )
+PRESET_AC_SUFFIX = "_ac"
+PRESET_ECO_AC = PRESET_ECO + PRESET_AC_SUFFIX
+PRESET_COMFORT_AC = PRESET_COMFORT + PRESET_AC_SUFFIX
+PRESET_BOOST_AC = PRESET_BOOST + PRESET_AC_SUFFIX
+

 DEVICE_MANUFACTURER = "JMCOLLIN"
 DEVICE_MODEL = "Versatile Thermostat"
@@ -44,6 +49,7 @@ CONF_CYCLE_MIN = "cycle_min"
 CONF_PROP_FUNCTION = "proportional_function"
 CONF_WINDOW_DELAY = "window_delay"
 CONF_MOTION_DELAY = "motion_delay"
+CONF_MOTION_OFF_DELAY = "motion_off_delay"
 CONF_MOTION_PRESET = "motion_preset"
 CONF_NO_MOTION_PRESET = "no_motion_preset"
 CONF_TPI_COEF_INT = "tpi_coef_int"
@@ -59,14 +65,23 @@ CONF_SECURITY_DEFAULT_ON_PERCENT = "security_default_on_percent"
 CONF_THERMOSTAT_TYPE = "thermostat_type"
 CONF_THERMOSTAT_SWITCH = "thermostat_over_switch"
 CONF_THERMOSTAT_CLIMATE = "thermostat_over_climate"
+CONF_THERMOSTAT_VALVE = "thermostat_over_valve"
 CONF_CLIMATE = "climate_entity_id"
+CONF_CLIMATE_2 = "climate_entity2_id"
+CONF_CLIMATE_3 = "climate_entity3_id"
+CONF_CLIMATE_4 = "climate_entity4_id"
 CONF_USE_WINDOW_FEATURE = "use_window_feature"
 CONF_USE_MOTION_FEATURE = "use_motion_feature"
 CONF_USE_PRESENCE_FEATURE = "use_presence_feature"
 CONF_USE_POWER_FEATURE = "use_power_feature"
+CONF_AC_MODE = "ac_mode"
 CONF_WINDOW_AUTO_OPEN_THRESHOLD = "window_auto_open_threshold"
 CONF_WINDOW_AUTO_CLOSE_THRESHOLD = "window_auto_close_threshold"
 CONF_WINDOW_AUTO_MAX_DURATION = "window_auto_max_duration"
+CONF_VALVE = "valve_entity_id"
+CONF_VALVE_2 = "valve_entity2_id"
+CONF_VALVE_3 = "valve_entity3_id"
+CONF_VALVE_4 = "valve_entity4_id"

 CONF_PRESETS = {
    p: f"{p}_temp"
@@ -77,14 +92,39 @@ CONF_PRESETS = {
    )
 }

+CONF_PRESETS_WITH_AC = {
+    p: f"{p}_temp"
+    for p in (
+        PRESET_ECO,
+        PRESET_COMFORT,
+        PRESET_BOOST,
+        PRESET_ECO_AC,
+        PRESET_COMFORT_AC,
+        PRESET_BOOST_AC,
+    )
+}
+
+
 PRESET_AWAY_SUFFIX = "_away"

 CONF_PRESETS_AWAY = {
    p: f"{p}_temp"
    for p in (
        PRESET_ECO + PRESET_AWAY_SUFFIX,
-        PRESET_BOOST + PRESET_AWAY_SUFFIX,
        PRESET_COMFORT + PRESET_AWAY_SUFFIX,
+        PRESET_BOOST + PRESET_AWAY_SUFFIX,
+    )
+}
+
+CONF_PRESETS_AWAY_WITH_AC = {
+    p: f"{p}_temp"
+    for p in (
+        PRESET_ECO + PRESET_AWAY_SUFFIX,
+        PRESET_COMFORT + PRESET_AWAY_SUFFIX,
+        PRESET_BOOST + PRESET_AWAY_SUFFIX,
+        PRESET_ECO_AC + PRESET_AWAY_SUFFIX,
+        PRESET_COMFORT_AC + PRESET_AWAY_SUFFIX,
+        PRESET_BOOST_AC + PRESET_AWAY_SUFFIX,
    )
 }

@@ -92,11 +132,16 @@ CONF_PRESETS_SELECTIONABLE = [PRESET_ECO, PRESET_COMFORT, PRESET_BOOST]

 CONF_PRESETS_VALUES = list(CONF_PRESETS.values())
 CONF_PRESETS_AWAY_VALUES = list(CONF_PRESETS_AWAY.values())
+CONF_PRESETS_WITH_AC_VALUES = list(CONF_PRESETS_WITH_AC.values())
+CONF_PRESETS_AWAY_WITH_AC_VALUES = list(CONF_PRESETS_AWAY_WITH_AC.values())

 ALL_CONF = (
    [
        CONF_NAME,
        CONF_HEATER,
+        CONF_HEATER_2,
+        CONF_HEATER_3,
+        CONF_HEATER_4,
        CONF_TEMP_SENSOR,
        CONF_EXTERNAL_TEMP_SENSOR,
        CONF_POWER_SENSOR,
@@ -126,20 +171,31 @@ ALL_CONF = (
        CONF_THERMOSTAT_SWITCH,
        CONF_THERMOSTAT_CLIMATE,
        CONF_CLIMATE,
+        CONF_CLIMATE_2,
+        CONF_CLIMATE_3,
+        CONF_CLIMATE_4,
        CONF_USE_WINDOW_FEATURE,
        CONF_USE_MOTION_FEATURE,
        CONF_USE_PRESENCE_FEATURE,
        CONF_USE_POWER_FEATURE,
+        CONF_AC_MODE,
+        CONF_VALVE,
+        CONF_VALVE_2,
+        CONF_VALVE_3,
+        CONF_VALVE_4,
+
    ]
    + CONF_PRESETS_VALUES
-    + CONF_PRESETS_AWAY_VALUES,
+    + CONF_PRESETS_AWAY_VALUES
+    + CONF_PRESETS_WITH_AC_VALUES
+    + CONF_PRESETS_AWAY_WITH_AC_VALUES,
 )

 CONF_FUNCTIONS = [
    PROPORTIONAL_FUNCTION_TPI,
 ]

-CONF_THERMOSTAT_TYPES = [CONF_THERMOSTAT_SWITCH, CONF_THERMOSTAT_CLIMATE]
+CONF_THERMOSTAT_TYPES = [CONF_THERMOSTAT_SWITCH, CONF_THERMOSTAT_CLIMATE, CONF_THERMOSTAT_VALVE]

 SUPPORT_FLAGS = ClimateEntityFeature.TARGET_TEMPERATURE

@@ -171,3 +227,14 @@ class UnknownEntity(HomeAssistantError):

 class WindowOpenDetectionMethod(HomeAssistantError):
    """Error to indicate there is an error in the window open detection method given."""
+
+class overrides: # pylint: disable=invalid-name
+    """ An annotation to inform overrides """
+    def __init__(self, func):
+        self.func = func
+
+    def __get__(self, instance, owner):
+        return self.func.__get__(instance, owner)
+
+    def __call__(self, *args, **kwargs):
+        raise RuntimeError(f"Method {self.func.__name__} should have been overridden")
--- a/custom_components/versatile_thermostat/manifest.json
+++ b/custom_components/versatile_thermostat/manifest.json
@@ -14,6 +14,6 @@
  "quality_scale": "silver",
  "requirements": [],
  "ssdp": [],
-  "version": "3.0.0",
+  "version": "3.6.0",
  "zeroconf": []
 }
--- a/custom_components/versatile_thermostat/prop_algorithm.py
+++ b/custom_components/versatile_thermostat/prop_algorithm.py
@@ -45,19 +45,33 @@ class PropAlgorithm:
        self._default_on_percent = 0

    def calculate(
-        self, target_temp: float, current_temp: float, ext_current_temp: float
+        self,
+        target_temp: float,
+        current_temp: float,
+        ext_current_temp: float,
+        cooling=False,
    ):
        """Do the calculation of the duration"""
        if target_temp is None or current_temp is None:
            _LOGGER.warning(
-                "Proportional algorithm: calculation is not possible cause target_temp or current_temp is null. Heating will be disabled"  # pylint: disable=line-too-long
+                "Proportional algorithm: calculation is not possible cause target_temp or current_temp is null. Heating/cooling will be disabled"  # pylint: disable=line-too-long
            )
            self._calculated_on_percent = 0
        else:
-            delta_temp = target_temp - current_temp
-            delta_ext_temp = (
-                target_temp - ext_current_temp if ext_current_temp is not None else 0
-            )
+            if cooling:
+                delta_temp = current_temp - target_temp
+                delta_ext_temp = (
+                    ext_current_temp
+                    if ext_current_temp is not None
+                    else 0 - target_temp
+                )
+            else:
+                delta_temp = target_temp - current_temp
+                delta_ext_temp = (
+                    target_temp - ext_current_temp
+                    if ext_current_temp is not None
+                    else 0
+                )

            if self._function == PROPORTIONAL_FUNCTION_TPI:
                self._calculated_on_percent = (
--- a/custom_components/versatile_thermostat/requirements_dev.txt
+++ b/custom_components/versatile_thermostat/requirements_dev.txt
@@ -1,2 +0,0 @@
-homeassistant
-ffmpeg
--- a/custom_components/versatile_thermostat/requirements_test.txt
+++ b/custom_components/versatile_thermostat/requirements_test.txt
@@ -1,4 +0,0 @@
-# -r requirements_dev.txt
-# aiodiscover
-ulid_transform
-pytest-homeassistant-custom-component
--- a/custom_components/versatile_thermostat/sensor.py
+++ b/custom_components/versatile_thermostat/sensor.py
@@ -1,3 +1,4 @@
+# pylint: disable=unused-argument
 """ Implements the VersatileThermostat sensors component """
 import logging
 import math
@@ -22,6 +23,7 @@ from .const import (
    CONF_PROP_FUNCTION,
    PROPORTIONAL_FUNCTION_TPI,
    CONF_THERMOSTAT_SWITCH,
+    CONF_THERMOSTAT_VALVE,
    CONF_THERMOSTAT_TYPE,
 )

@@ -50,7 +52,7 @@ async def async_setup_entry(
    ]
    if entry.data.get(CONF_DEVICE_POWER):
        entities.append(EnergySensor(hass, unique_id, name, entry.data))
-        if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_SWITCH:
+        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_PROP_FUNCTION) == PROPORTIONAL_FUNCTION_TPI:
@@ -58,6 +60,9 @@ async def async_setup_entry(
        entities.append(OnTimeSensor(hass, unique_id, name, entry.data))
        entities.append(OffTimeSensor(hass, unique_id, name, entry.data))

+    if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE:
+        entities.append(ValveOpenPercentSensor(hass, unique_id, name, entry.data))
+
    async_add_entities(entities, True)


@@ -224,6 +229,47 @@ class OnPercentSensor(VersatileThermostatBaseEntity, SensorEntity):
        """Return the suggested number of decimal digits for display."""
        return 1

+class ValveOpenPercentSensor(VersatileThermostatBaseEntity, SensorEntity):
+    """Representation of a on percent sensor which exposes the on_percent in a cycle"""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the energy sensor"""
+        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
+        self._attr_name = "Vave open percent"
+        self._attr_unique_id = f"{self._device_name}_valve_open_percent"
+
+    @callback
+    async def async_my_climate_changed(self, event: Event = None):
+        """Called when my climate have change"""
+        _LOGGER.debug("%s - climate state change", self._attr_unique_id)
+
+        old_state = self._attr_native_value
+        self._attr_native_value = self.my_climate.valve_open_percent
+        if old_state != self._attr_native_value:
+            self.async_write_ha_state()
+        return
+
+    @property
+    def icon(self) -> str | None:
+        return "mdi:pipe-valve"
+
+    @property
+    def device_class(self) -> SensorDeviceClass | None:
+        return SensorDeviceClass.POWER_FACTOR
+
+    @property
+    def state_class(self) -> SensorStateClass | None:
+        return SensorStateClass.MEASUREMENT
+
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        return PERCENTAGE
+
+    @property
+    def suggested_display_precision(self) -> int | None:
+        """Return the suggested number of decimal digits for display."""
+        return 0
+

 class OnTimeSensor(VersatileThermostatBaseEntity, SensorEntity):
    """Representation of a on time sensor which exposes the on_time_sec in a cycle"""
--- a/custom_components/versatile_thermostat/services.yaml
+++ b/custom_components/versatile_thermostat/services.yaml
@@ -1,120 +1,124 @@
 reload:
-  description: Reload all Versatile Thermostat entities.
+    name: Reload
+    description: Reload all Versatile Thermostat entities.

 set_presence:
-  name: Set presence
-  description: Force the presence mode in thermostat
-  target:
-    entity:
-      integration: versatile_thermostat
-  fields:
-    presence:
-      name: Presence
-      description: Presence setting
-      required: true
-      advanced: false
-      example: "on"
-      default: "on"
-      selector:
-        select:
-          options:
-            - "on"
-            - "off"
-            - "home"
-            - "not_home"
+    name: Set presence
+    description: Force the presence mode in thermostat
+    target:
+        entity:
+            integration: versatile_thermostat
+    fields:
+        presence:
+            name: Presence
+            description: Presence setting
+            required: true
+            advanced: false
+            example: "on"
+            default: "on"
+            selector:
+                select:
+                    options:
+                        - "on"
+                        - "off"
+                        - "home"
+                        - "not_home"

 set_preset_temperature:
-  name: Set temperature preset
-  description: Change the target temperature of a preset
-  target:
-    entity:
-      integration: versatile_thermostat
-  fields:
-    preset:
-      name: Preset
-      description: Preset name
-      required: true
-      advanced: false
-      example: "comfort"
-      selector:
-        select:
-          options:
-            - "eco"
-            - "comfort"
-            - "boost"
-    temperature:
-      name: Temperature when present
-      description: Target temperature for the preset when present
-      required: false
-      advanced: false
-      example: "19.5"
-      default: "17"
-      selector:
-        number:
-          min: 7
-          max: 35
-          step: 0.1
-          unit_of_measurement: °
-          mode: slider
-    temperature_away:
-      name: Temperature when not present
-      description: Target temperature for the preset when not present
-      required: false
-      advanced: false
-      example: "17"
-      default: "15"
-      selector:
-        number:
-          min: 7
-          max: 35
-          step: 0.1
-          unit_of_measurement: °
-          mode: slider
+    name: Set temperature preset
+    description: Change the target temperature of a preset
+    target:
+        entity:
+            integration: versatile_thermostat
+    fields:
+        preset:
+            name: Preset
+            description: Preset name
+            required: true
+            advanced: false
+            example: "comfort"
+            selector:
+                select:
+                    options:
+                        - "eco"
+                        - "comfort"
+                        - "boost"
+                        - "eco_ac"
+                        - "comfort_ac"
+                        - "boost_ac"
+        temperature:
+            name: Temperature when present
+            description: Target temperature for the preset when present
+            required: false
+            advanced: false
+            example: "19.5"
+            default: "17"
+            selector:
+                number:
+                    min: 7
+                    max: 35
+                    step: 0.1
+                    unit_of_measurement: °
+                    mode: slider
+        temperature_away:
+            name: Temperature when not present
+            description: Target temperature for the preset when not present
+            required: false
+            advanced: false
+            example: "17"
+            default: "15"
+            selector:
+                number:
+                    min: 7
+                    max: 35
+                    step: 0.1
+                    unit_of_measurement: °
+                    mode: slider

 set_security:
-  name: Set security
-  description: Change the security parameters
-  target:
-    entity:
-      integration: versatile_thermostat
-  fields:
-    delay_min:
-      name: Delay in minutes
-      description: Maximum allowed delay in minutes between two temperature mesures
-      required: false
-      advanced: false
-      example: "30"
-      selector:
-        number:
-          min: 0
-          max: 9999
-          unit_of_measurement: "min"
-          mode: box
-    min_on_percent:
-      name: Minimal on_percent
-      description: Minimal heating percent value for security preset activation
-      required: false
-      advanced: false
-      example: "0.5"
-      default: "0.5"
-      selector:
-        number:
-          min: 0
-          max: 1
-          step: 0.05
-          unit_of_measurement: "%"
-          mode: slider
-    default_on_percent:
-      name: on_percent used in security mode
-      description: The default heating percent value in security preset
-      required: false
-      advanced: false
-      example: "0.1"
-      default: "0.1"
-      selector:
-        number:
-          min: 0
-          max: 1
-          step: 0.05
-          unit_of_measurement: "%"
-          mode: slider
+    name: Set security
+    description: Change the security parameters
+    target:
+        entity:
+            integration: versatile_thermostat
+    fields:
+        delay_min:
+            name: Delay in minutes
+            description: Maximum allowed delay in minutes between two temperature mesures
+            required: false
+            advanced: false
+            example: "30"
+            selector:
+                number:
+                    min: 0
+                    max: 9999
+                    unit_of_measurement: "min"
+                    mode: box
+        min_on_percent:
+            name: Minimal on_percent
+            description: Minimal heating percent value for security preset activation
+            required: false
+            advanced: false
+            example: "0.5"
+            default: "0.5"
+            selector:
+                number:
+                    min: 0
+                    max: 1
+                    step: 0.05
+                    unit_of_measurement: "%"
+                    mode: slider
+        default_on_percent:
+            name: on_percent used in security mode
+            description: The default heating percent value in security preset
+            required: false
+            advanced: false
+            example: "0.1"
+            default: "0.1"
+            selector:
+                number:
+                    min: 0
+                    max: 1
+                    step: 0.05
+                    unit_of_measurement: "%"
+                    mode: slider
--- a/custom_components/versatile_thermostat/strings.json
+++ b/custom_components/versatile_thermostat/strings.json
@@ -14,7 +14,7 @@
          "cycle_min": "Cycle duration (minutes)",
          "temp_min": "Minimal temperature allowed",
          "temp_max": "Maximal temperature allowed",
-          "device_power": "Device power (kW)",
+          "device_power": "Device power",
          "use_window_feature": "Use window detection",
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
@@ -25,12 +25,20 @@
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "Heater switch",
-          "heater_entity2_id": "2nd Heater switch",
-          "heater_entity3_id": "3rd Heater switch",
-          "heater_entity4_id": "4th Heater switch",
+          "heater_entity_id": "1rst heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "proportional_function": "Algorithm",
-          "climate_entity_id": "Underlying thermostat"
+          "climate_entity_id": "1rst underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
+          "ac_mode": "AC mode",
+          "valve_entity_id": "1rst valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number"
        },
        "data_description": {
          "heater_entity_id": "Mandatory heater entity id",
@@ -38,7 +46,15 @@
          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "climate_entity_id": "Underlying climate entity id"
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
+          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1rst valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id"
        }
      },
      "tpi": {
@@ -55,7 +71,10 @@
        "data": {
          "eco_temp": "Temperature in Eco preset",
          "comfort_temp": "Temperature in Comfort preset",
-          "boost_temp": "Temperature in Boost preset"
+          "boost_temp": "Temperature in Boost preset",
+          "eco_ac_temp": "Temperature in Eco preset for AC mode",
+          "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
+          "boost_ac_temp": "Temperature in Boost preset for AC mode"
        }
      },
      "window": {
@@ -81,7 +100,15 @@
        "description": "Motion sensor management. Preset can switch automatically depending of a motion detection\nLeave corresponding entity_id empty if not used.\nmotion_preset and no_motion_preset should be set to the corresponding preset name",
        "data": {
          "motion_sensor_entity_id": "Motion sensor entity id",
-          "motion_delay": "Motion delay (seconds)",
+          "motion_delay": "Activation delay",
+          "motion_off_delay": "Deactivation delay",
+          "motion_preset": "Motion preset",
+          "no_motion_preset": "No motion preset"
+        },
+        "data_description": {
+          "motion_sensor_entity_id": "The entity id of the motion sensor",
+          "motion_delay": "Motion activation activation delay (seconds)",
+          "motion_off_delay": "Motion deactivation delay (seconds)",
          "motion_preset": "Preset to use when motion is detected",
          "no_motion_preset": "Preset to use when no motion is detected"
        }
@@ -99,10 +126,13 @@
        "title": "Presence management",
        "description": "Presence management attributes.\nGives the a presence sensor of your home (true is someone is present).\nThen specify either the preset to use when presence sensor is false or the offset in temperature to apply.\nIf preset is given, the offset will not be used.\nLeave corresponding entity_id empty if not used.",
        "data": {
-          "presence_sensor_entity_id": "Presence sensor entity id (true is present)",
+          "presence_sensor_entity_id": "Presence sensor entity id",
          "eco_away_temp": "Temperature in Eco preset when no presence",
          "comfort_away_temp": "Temperature in Comfort preset when no presence",
-          "boost_away_temp": "Temperature in Boost preset when no presence"
+          "boost_away_temp": "Temperature in Boost preset when no presence",
+          "eco_ac_away_temp": "Temperature in Eco preset when no presence in AC mode",
+          "comfort_ac_away_temp": "Temperature in Comfort preset when no presence in AC mode",
+          "boost_ac_away_temp": "Temperature in Boost preset when no presence in AC mode"
        }
      },
      "advanced": {
@@ -111,7 +141,7 @@
        "data": {
          "minimal_activation_delay": "Minimal activation delay",
          "security_delay_min": "Security delay (in minutes)",
-          "security_min_on_percent": "Minimal power percent for security mode",
+          "security_min_on_percent": "Minimal power percent to enable security mode",
          "security_default_on_percent": "Power percent to use in security mode"
        },
        "data_description": {
@@ -156,12 +186,20 @@
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "Heater switch",
-          "heater_entity2_id": "2nd Heater switch",
-          "heater_entity3_id": "3rd Heater switch",
-          "heater_entity4_id": "4th Heater switch",
+          "heater_entity_id": "1rst heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "proportional_function": "Algorithm",
-          "climate_entity_id": "Underlying thermostat"
+          "climate_entity_id": "1rst underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
+          "ac_mode": "AC mode",
+          "valve_entity_id": "1rst valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number"
        },
        "data_description": {
          "heater_entity_id": "Mandatory heater entity id",
@@ -169,7 +207,15 @@
          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "climate_entity_id": "Underlying climate entity id"
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
+          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1rst valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id"
        }
      },
      "tpi": {
@@ -186,7 +232,10 @@
        "data": {
          "eco_temp": "Temperature in Eco preset",
          "comfort_temp": "Temperature in Comfort preset",
-          "boost_temp": "Temperature in Boost preset"
+          "boost_temp": "Temperature in Boost preset",
+          "eco_ac_temp": "Temperature in Eco preset for AC mode",
+          "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
+          "boost_ac_temp": "Temperature in Boost preset for AC mode"
        }
      },
      "window": {
@@ -212,7 +261,15 @@
        "description": "Motion sensor management. Preset can switch automatically depending of a motion detection\nLeave corresponding entity_id empty if not used.\nmotion_preset and no_motion_preset should be set to the corresponding preset name",
        "data": {
          "motion_sensor_entity_id": "Motion sensor entity id",
-          "motion_delay": "Motion delay (seconds)",
+          "motion_delay": "Activation delay",
+          "motion_off_delay": "Deactivation delay",
+          "motion_preset": "Motion preset",
+          "no_motion_preset": "No motion preset"
+        },
+        "data_description": {
+          "motion_sensor_entity_id": "The entity id of the motion sensor",
+          "motion_delay": "Motion activation activation delay (seconds)",
+          "motion_off_delay": "Motion deactivation delay (seconds)",
          "motion_preset": "Preset to use when motion is detected",
          "no_motion_preset": "Preset to use when no motion is detected"
        }
@@ -233,7 +290,10 @@
          "presence_sensor_entity_id": "Presence sensor entity id (true is present)",
          "eco_away_temp": "Temperature in Eco preset when no presence",
          "comfort_away_temp": "Temperature in Comfort preset when no presence",
-          "boost_away_temp": "Temperature in Boost preset when no presence"
+          "boost_away_temp": "Temperature in Boost preset when no presence",
+          "eco_ac_away_temp": "Temperature in Eco preset when no presence in AC mode",
+          "comfort_ac_away_temp": "Temperature in Comfort preset when no presence in AC mode",
+          "boost_ac_away_temp": "Temperature in Boost preset when no presence in AC mode"
        }
      },
      "advanced": {
@@ -266,7 +326,8 @@
    "thermostat_type": {
      "options": {
        "thermostat_over_switch": "Thermostat over a switch",
-        "thermostat_over_climate": "Thermostat over another thermostat"
+        "thermostat_over_climate": "Thermostat over a climate",
+        "thermostat_over_valve": "Thermostat over a valve"
      }
    }
  },
--- a/custom_components/versatile_thermostat/thermostat_climate.py
+++ b/custom_components/versatile_thermostat/thermostat_climate.py
@@ -0,0 +1,140 @@
+# pylint: disable=line-too-long
+""" A climate over switch classe """
+import logging
+from datetime import timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.event import async_track_state_change_event, async_track_time_interval
+
+from homeassistant.components.climate import HVACAction
+
+from .base_thermostat import BaseThermostat
+
+from .const import CONF_CLIMATE, CONF_CLIMATE_2, CONF_CLIMATE_3, CONF_CLIMATE_4
+
+from .underlyings import UnderlyingClimate
+
+_LOGGER = logging.getLogger(__name__)
+
+class ThermostatOverClimate(BaseThermostat):
+    """Representation of a base class for a Versatile Thermostat over a climate"""
+
+    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(frozenset(
+        {
+            "is_over_climate", "start_hvac_action_date", "underlying_climate_0", "underlying_climate_1",
+            "underlying_climate_2", "underlying_climate_3"
+        }))
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat over switch."""
+        super().__init__(hass, unique_id, name, entry_infos)
+
+    @property
+    def is_over_climate(self) -> bool:
+        """ True if the Thermostat is over_climate"""
+        return True
+
+    @property
+    def hvac_action(self) -> HVACAction | None:
+        """ Returns the current hvac_action by checking all hvac_action of the underlyings """
+
+        # if one not IDLE or OFF -> return it
+        # else if one IDLE -> IDLE
+        # else OFF
+        one_idle = False
+        for under in self._underlyings:
+            if (action := under.hvac_action) not in [
+                HVACAction.IDLE,
+                HVACAction.OFF,
+            ]:
+                return action
+            if under.hvac_action == HVACAction.IDLE:
+                one_idle = True
+        if one_idle:
+            return HVACAction.IDLE
+        return HVACAction.OFF
+
+    @property
+    def hvac_modes(self):
+        """List of available operation modes."""
+        if self.underlying_entity(0):
+            return self.underlying_entity(0).hvac_modes
+        else:
+            return super.hvac_modes
+
+    def post_init(self, entry_infos):
+        """ Initialize the Thermostat"""
+
+        super().post_init(entry_infos)
+        for climate in [
+            CONF_CLIMATE,
+            CONF_CLIMATE_2,
+            CONF_CLIMATE_3,
+            CONF_CLIMATE_4,
+        ]:
+            if entry_infos.get(climate):
+                self._underlyings.append(
+                    UnderlyingClimate(
+                        hass=self._hass,
+                        thermostat=self,
+                        climate_entity_id=entry_infos.get(climate),
+                    )
+                )
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added."""
+        _LOGGER.debug("Calling async_added_to_hass")
+
+        await super().async_added_to_hass()
+
+        # Add listener to all underlying entities
+        for climate in self._underlyings:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [climate.entity_id], self._async_climate_changed
+                )
+            )
+
+        # Start the control_heating
+        # starts a cycle
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass,
+                self.async_control_heating,
+                interval=timedelta(minutes=self._cycle_min),
+            )
+        )
+
+    def update_custom_attributes(self):
+        """ Custom attributes """
+        super().update_custom_attributes()
+
+        self._attr_extra_state_attributes["is_over_climate"] = self.is_over_climate
+        self._attr_extra_state_attributes["start_hvac_action_date"] = (
+            self._underlying_climate_start_hvac_action_date)
+        self._attr_extra_state_attributes["underlying_climate_0"] = (
+                self._underlyings[0].entity_id)
+        self._attr_extra_state_attributes["underlying_climate_1"] = (
+                self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+            )
+        self._attr_extra_state_attributes["underlying_climate_2"] = (
+                self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+            )
+        self._attr_extra_state_attributes["underlying_climate_3"] = (
+                self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+            )
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate all", self)
+        self.update_custom_attributes()
+        self.async_write_ha_state()
--- a/custom_components/versatile_thermostat/thermostat_switch.py
+++ b/custom_components/versatile_thermostat/thermostat_switch.py
@@ -0,0 +1,130 @@
+# pylint: disable=line-too-long
+
+""" A climate over switch classe """
+import logging
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.components.climate import HVACMode
+
+from .const import (
+    CONF_HEATER,
+    CONF_HEATER_2,
+    CONF_HEATER_3,
+    CONF_HEATER_4
+)
+
+from .base_thermostat import BaseThermostat
+
+from .underlyings import UnderlyingSwitch
+
+_LOGGER = logging.getLogger(__name__)
+
+class ThermostatOverSwitch(BaseThermostat):
+    """Representation of a base class for a Versatile Thermostat over a switch."""
+
+    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(frozenset(
+        {
+            "is_over_switch", "underlying_switch_0", "underlying_switch_1",
+            "underlying_switch_2", "underlying_switch_3", "on_time_sec", "off_time_sec",
+            "cycle_min", "function", "tpi_coef_int", "tpi_coef_ext"
+        }))
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat over switch."""
+        super().__init__(hass, unique_id, name, entry_infos)
+
+    @property
+    def is_over_switch(self) -> bool:
+        """ True if the Thermostat is over_switch"""
+        return True
+
+    def post_init(self, entry_infos):
+        """ Initialize the Thermostat"""
+
+        super().post_init(entry_infos)
+        lst_switches = [entry_infos.get(CONF_HEATER)]
+        if entry_infos.get(CONF_HEATER_2):
+            lst_switches.append(entry_infos.get(CONF_HEATER_2))
+        if entry_infos.get(CONF_HEATER_3):
+            lst_switches.append(entry_infos.get(CONF_HEATER_3))
+        if entry_infos.get(CONF_HEATER_4):
+            lst_switches.append(entry_infos.get(CONF_HEATER_4))
+
+        delta_cycle = self._cycle_min * 60 / len(lst_switches)
+        for idx, switch in enumerate(lst_switches):
+            self._underlyings.append(
+                UnderlyingSwitch(
+                    hass=self._hass,
+                    thermostat=self,
+                    switch_entity_id=switch,
+                    initial_delay_sec=idx * delta_cycle,
+                )
+            )
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added."""
+        _LOGGER.debug("Calling async_added_to_hass")
+
+        await super().async_added_to_hass()
+
+        # Add listener to all underlying entities
+        for switch in self._underlyings:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [switch.entity_id], self._async_switch_changed
+                )
+        )
+
+        self.hass.create_task(self.async_control_heating())
+
+    def update_custom_attributes(self):
+        """ Custom attributes """
+        super().update_custom_attributes()
+
+        self._attr_extra_state_attributes["is_over_switch"] = self.is_over_switch
+        self._attr_extra_state_attributes["underlying_switch_0"] = (
+                self._underlyings[0].entity_id)
+        self._attr_extra_state_attributes["underlying_switch_1"] = (
+                self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+            )
+        self._attr_extra_state_attributes["underlying_switch_2"] = (
+                self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+            )
+        self._attr_extra_state_attributes["underlying_switch_3"] = (
+                self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+            )
+
+        self._attr_extra_state_attributes[
+                "on_percent"
+            ] = self._prop_algorithm.on_percent
+        self._attr_extra_state_attributes[
+            "on_time_sec"
+        ] = self._prop_algorithm.on_time_sec
+        self._attr_extra_state_attributes[
+            "off_time_sec"
+        ] = self._prop_algorithm.off_time_sec
+        self._attr_extra_state_attributes["cycle_min"] = self._cycle_min
+        self._attr_extra_state_attributes["function"] = self._proportional_function
+        self._attr_extra_state_attributes["tpi_coef_int"] = self._tpi_coef_int
+        self._attr_extra_state_attributes["tpi_coef_ext"] = self._tpi_coef_ext
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate all", self)
+        self._prop_algorithm.calculate(
+            self._target_temp,
+            self._cur_temp,
+            self._cur_ext_temp,
+            self._hvac_mode == HVACMode.COOL,
+        )
+        self.update_custom_attributes()
+        self.async_write_ha_state()
--- a/custom_components/versatile_thermostat/thermostat_valve.py
+++ b/custom_components/versatile_thermostat/thermostat_valve.py
@@ -0,0 +1,318 @@
+# pylint: disable=line-too-long
+""" A climate over switch classe """
+import logging
+from datetime import timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.event import async_track_state_change_event, async_track_time_interval
+from homeassistant.core import callback
+from homeassistant.components.climate import HVACMode, HVACAction
+
+from .base_thermostat import BaseThermostat
+
+from .const import CONF_VALVE, CONF_VALVE_2, CONF_VALVE_3, CONF_VALVE_4
+
+from .underlyings import UnderlyingValve
+
+_LOGGER = logging.getLogger(__name__)
+
+class ThermostatOverValve(BaseThermostat):
+    """Representation of a class for a Versatile Thermostat over a Valve"""
+
+    _entity_component_unrecorded_attributes = BaseThermostat._entity_component_unrecorded_attributes.union(frozenset(
+        {
+            "is_over_valve", "underlying_valve_0", "underlying_valve_1",
+            "underlying_valve_2", "underlying_valve_3", "on_time_sec", "off_time_sec",
+            "cycle_min", "function", "tpi_coef_int", "tpi_coef_ext"
+        }))
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat over switch."""
+        super().__init__(hass, unique_id, name, entry_infos)
+
+    @property
+    def is_over_valve(self) -> bool:
+        """ True if the Thermostat is over_valve"""
+        return True
+
+    @property
+    def valve_open_percent(self) -> int:
+        """ Gives the percentage of valve needed"""
+        if self._hvac_mode == HVACMode.OFF:
+            return 0
+        else:
+            return round(max(0, min(self.proportional_algorithm.on_percent, 1)) * 100)
+
+    def post_init(self, entry_infos):
+        """ Initialize the Thermostat"""
+
+        super().post_init(entry_infos)
+        lst_valves = [entry_infos.get(CONF_VALVE)]
+        if entry_infos.get(CONF_VALVE_2):
+            lst_valves.append(entry_infos.get(CONF_VALVE_2))
+        if entry_infos.get(CONF_VALVE_3):
+            lst_valves.append(entry_infos.get(CONF_VALVE_3))
+        if entry_infos.get(CONF_VALVE_4):
+            lst_valves.append(entry_infos.get(CONF_VALVE_4))
+
+        for _, valve in enumerate(lst_valves):
+            self._underlyings.append(
+                UnderlyingValve(
+                    hass=self._hass,
+                    thermostat=self,
+                    valve_entity_id=valve
+                )
+            )
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added."""
+        _LOGGER.debug("Calling async_added_to_hass")
+
+        await super().async_added_to_hass()
+
+        # Add listener to all underlying entities
+        for valve in self._underlyings:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [valve.entity_id], self._async_valve_changed
+                )
+        )
+
+        # Start the control_heating
+        # starts a cycle
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass,
+                self.async_control_heating,
+                interval=timedelta(minutes=self._cycle_min),
+            )
+        )
+
+    @callback
+    async def _async_valve_changed(self, event):
+        """Handle unerdlying valve state changes.
+        This method takes the underlying values and update the VTherm with them.
+        To avoid loops (issues #121 #101 #95 #99), we discard the event if it is received
+        less than 10 sec after the last command. What we want here is to take the values
+        from underlyings ONLY if someone have change directly on the underlying and not
+        as a return of the command. The only thing we take all the time is the HVACAction
+        which is important for feedaback and which cannot generates loops.
+        """
+
+        async def end_climate_changed(changes):
+            """To end the event management"""
+            if changes:
+                self.async_write_ha_state()
+                self.update_custom_attributes()
+                await self.async_control_heating()
+
+        new_state = event.data.get("new_state")
+        _LOGGER.debug("%s - _async_climate_changed new_state is %s", self, new_state)
+        if not new_state:
+            return
+
+        changes = False
+        new_hvac_mode = new_state.state
+
+        old_state = event.data.get("old_state")
+        old_hvac_action = (
+            old_state.attributes.get("hvac_action")
+            if old_state and old_state.attributes
+            else None
+        )
+        new_hvac_action = (
+            new_state.attributes.get("hvac_action")
+            if new_state and new_state.attributes
+            else None
+        )
+
+        old_state_date_changed = (
+            old_state.last_changed if old_state and old_state.last_changed else None
+        )
+        old_state_date_updated = (
+            old_state.last_updated if old_state and old_state.last_updated else None
+        )
+        new_state_date_changed = (
+            new_state.last_changed if new_state and new_state.last_changed else None
+        )
+        new_state_date_updated = (
+            new_state.last_updated if new_state and new_state.last_updated else None
+        )
+
+        # Issue 99 - some AC turn hvac_mode=cool and hvac_action=idle when sending a HVACMode_OFF command
+        # Issue 114 - Remove this because hvac_mode is now managed by local _hvac_mode and use idle action as is
+        # if self._hvac_mode == HVACMode.OFF and new_hvac_action == HVACAction.IDLE:
+        #    _LOGGER.debug("The underlying switch to idle instead of OFF. We will consider it as OFF")
+        #    new_hvac_mode = HVACMode.OFF
+
+        _LOGGER.info(
+            "%s - Underlying climate changed. Event.new_hvac_mode is %s, current_hvac_mode=%s, new_hvac_action=%s, old_hvac_action=%s",
+            self,
+            new_hvac_mode,
+            self._hvac_mode,
+            new_hvac_action,
+            old_hvac_action,
+        )
+
+        _LOGGER.debug(
+            "%s - last_change_time=%s old_state_date_changed=%s old_state_date_updated=%s new_state_date_changed=%s new_state_date_updated=%s",
+            self,
+            self._last_change_time,
+            old_state_date_changed,
+            old_state_date_updated,
+            new_state_date_changed,
+            new_state_date_updated,
+        )
+
+        # Interpretation of hvac action
+        HVAC_ACTION_ON = [  # pylint: disable=invalid-name
+            HVACAction.COOLING,
+            HVACAction.DRYING,
+            HVACAction.FAN,
+            HVACAction.HEATING,
+        ]
+        if old_hvac_action not in HVAC_ACTION_ON and new_hvac_action in HVAC_ACTION_ON:
+            self._underlying_climate_start_hvac_action_date = (
+                self.get_last_updated_date_or_now(new_state)
+            )
+            _LOGGER.info(
+                "%s - underlying just switch ON. Set power and energy start date %s",
+                self,
+                self._underlying_climate_start_hvac_action_date.isoformat(),
+            )
+            changes = True
+
+        if old_hvac_action in HVAC_ACTION_ON and new_hvac_action not in HVAC_ACTION_ON:
+            stop_power_date = self.get_last_updated_date_or_now(new_state)
+            if self._underlying_climate_start_hvac_action_date:
+                delta = (
+                    stop_power_date - self._underlying_climate_start_hvac_action_date
+                )
+                self._underlying_climate_delta_t = delta.total_seconds() / 3600.0
+
+                # increment energy at the end of the cycle
+                self.incremente_energy()
+
+                self._underlying_climate_start_hvac_action_date = None
+
+            _LOGGER.info(
+                "%s - underlying just switch OFF at %s. delta_h=%.3f h",
+                self,
+                stop_power_date.isoformat(),
+                self._underlying_climate_delta_t,
+            )
+            changes = True
+
+        # Issue #120 - Some TRV are chaning target temperature a very long time (6 sec) after the change.
+        # In that case a loop is possible if a user change multiple times during this 6 sec.
+        if new_state_date_updated and self._last_change_time:
+            delta = (new_state_date_updated - self._last_change_time).total_seconds()
+            if delta < 10:
+                _LOGGER.info(
+                    "%s - underlying event is received less than 10 sec after command. Forget it to avoid loop",
+                    self,
+                )
+                await end_climate_changed(changes)
+                return
+
+        if (
+            new_hvac_mode
+            in [
+                HVACMode.OFF,
+                HVACMode.HEAT,
+                HVACMode.COOL,
+                HVACMode.HEAT_COOL,
+                HVACMode.DRY,
+                HVACMode.AUTO,
+                HVACMode.FAN_ONLY,
+                None,
+            ]
+            and self._hvac_mode != new_hvac_mode
+        ):
+            changes = True
+            self._hvac_mode = new_hvac_mode
+            # Update all underlyings state
+            if self.is_over_climate:
+                for under in self._underlyings:
+                    await under.set_hvac_mode(new_hvac_mode)
+
+        if not changes:
+            # try to manage new target temperature set if state
+            _LOGGER.debug(
+                "Do temperature check. temperature is %s, new_state.attributes is %s",
+                self.target_temperature,
+                new_state.attributes,
+            )
+            if (
+                self.is_over_climate
+                and new_state.attributes
+                and (new_target_temp := new_state.attributes.get("temperature"))
+                and new_target_temp != self.target_temperature
+            ):
+                _LOGGER.info(
+                    "%s - Target temp in underlying have change to %s",
+                    self,
+                    new_target_temp,
+                )
+                await self.async_set_temperature(temperature=new_target_temp)
+                changes = True
+
+        await end_climate_changed(changes)
+
+    def update_custom_attributes(self):
+        """ Custom attributes """
+        super().update_custom_attributes()
+        self._attr_extra_state_attributes["valve_open_percent"] = self.valve_open_percent
+        self._attr_extra_state_attributes["is_over_valve"] = self.is_over_valve
+        self._attr_extra_state_attributes["underlying_valve_0"] = (
+                self._underlyings[0].entity_id)
+        self._attr_extra_state_attributes["underlying_valve_1"] = (
+                self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+            )
+        self._attr_extra_state_attributes["underlying_valve_2"] = (
+                self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+            )
+        self._attr_extra_state_attributes["underlying_valve_3"] = (
+                self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+            )
+
+        self._attr_extra_state_attributes[
+                "on_percent"
+            ] = self._prop_algorithm.on_percent
+        self._attr_extra_state_attributes[
+            "on_time_sec"
+        ] = self._prop_algorithm.on_time_sec
+        self._attr_extra_state_attributes[
+            "off_time_sec"
+        ] = self._prop_algorithm.off_time_sec
+        self._attr_extra_state_attributes["cycle_min"] = self._cycle_min
+        self._attr_extra_state_attributes["function"] = self._proportional_function
+        self._attr_extra_state_attributes["tpi_coef_int"] = self._tpi_coef_int
+        self._attr_extra_state_attributes["tpi_coef_ext"] = self._tpi_coef_ext
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate all", self)
+        self._prop_algorithm.calculate(
+            self._target_temp,
+            self._cur_temp,
+            self._cur_ext_temp,
+            self._hvac_mode == HVACMode.COOL,
+        )
+
+        for under in self._underlyings:
+            under.set_valve_open_percent(
+                self._prop_algorithm.on_percent
+            )
+
+        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
@@ -14,7 +14,7 @@
          "cycle_min": "Cycle duration (minutes)",
          "temp_min": "Minimal temperature allowed",
          "temp_max": "Maximal temperature allowed",
-          "device_power": "Device power (kW)",
+          "device_power": "Device power",
          "use_window_feature": "Use window detection",
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
@@ -25,12 +25,16 @@
        "title": "Linked entities",
        "description": "Linked entities attributes",
        "data": {
-          "heater_entity_id": "Heater switch",
-          "heater_entity2_id": "2nd Heater switch",
-          "heater_entity3_id": "3rd Heater switch",
-          "heater_entity4_id": "4th Heater switch",
+          "heater_entity_id": "1rst heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
          "proportional_function": "Algorithm",
-          "climate_entity_id": "Underlying thermostat"
+          "climate_entity_id": "1rst underlying climate",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
+          "ac_mode": "AC mode"
        },
        "data_description": {
          "heater_entity_id": "Mandatory heater entity id",
@@ -38,7 +42,11 @@
          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "climate_entity_id": "Underlying climate entity id"
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
+          "ac_mode": "Use the Air Conditioning (AC) mode"
        }
      },
      "tpi": {
@@ -55,7 +63,10 @@
        "data": {
          "eco_temp": "Temperature in Eco preset",
          "comfort_temp": "Temperature in Comfort preset",
-          "boost_temp": "Temperature in Boost preset"
+          "boost_temp": "Temperature in Boost preset",
+          "eco_ac_temp": "Temperature in Eco preset for AC mode",
+          "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
+          "boost_ac_temp": "Temperature in Boost preset for AC mode"
        }
      },
      "window": {
@@ -81,7 +92,15 @@
        "description": "Motion sensor management. Preset can switch automatically depending of a motion detection\nLeave corresponding entity_id empty if not used.\nmotion_preset and no_motion_preset should be set to the corresponding preset name",
        "data": {
          "motion_sensor_entity_id": "Motion sensor entity id",
-          "motion_delay": "Motion delay (seconds)",
+          "motion_delay": "Activation delay",
+          "motion_off_delay": "Deactivation delay",
+          "motion_preset": "Motion preset",
+          "no_motion_preset": "No motion preset"
+        },
+        "data_description": {
+          "motion_sensor_entity_id": "The entity id of the motion sensor",
+          "motion_delay": "Motion activation activation delay (seconds)",
+          "motion_off_delay": "Motion deactivation delay (seconds)",
          "motion_preset": "Preset to use when motion is detected",
          "no_motion_preset": "Preset to use when no motion is detected"
        }
@@ -99,10 +118,13 @@
        "title": "Presence management",
        "description": "Presence management attributes.\nGives the a presence sensor of your home (true is someone is present).\nThen specify either the preset to use when presence sensor is false or the offset in temperature to apply.\nIf preset is given, the offset will not be used.\nLeave corresponding entity_id empty if not used.",
        "data": {
-          "presence_sensor_entity_id": "Presence sensor entity id (true is present)",
+          "presence_sensor_entity_id": "Presence sensor entity id",
          "eco_away_temp": "Temperature in Eco preset when no presence",
          "comfort_away_temp": "Temperature in Comfort preset when no presence",
-          "boost_away_temp": "Temperature in Boost preset when no presence"
+          "boost_away_temp": "Temperature in Boost preset when no presence",
+          "eco_ac_away_temp": "Temperature in Eco preset when no presence in AC mode",
+          "comfort_ac_away_temp": "Temperature in Comfort preset when no presence in AC mode",
+          "boost_ac_away_temp": "Temperature in Boost preset when no presence in AC mode"
        }
      },
      "advanced": {
@@ -111,7 +133,7 @@
        "data": {
          "minimal_activation_delay": "Minimal activation delay",
          "security_delay_min": "Security delay (in minutes)",
-          "security_min_on_percent": "Minimal power percent for security mode",
+          "security_min_on_percent": "Minimal power percent to enable security mode",
          "security_default_on_percent": "Power percent to use in security mode"
        },
        "data_description": {
@@ -161,7 +183,11 @@
          "heater_entity3_id": "3rd Heater switch",
          "heater_entity4_id": "4th Heater switch",
          "proportional_function": "Algorithm",
-          "climate_entity_id": "Underlying thermostat"
+          "climate_entity_id": "Underlying thermostat",
+          "climate_entity2_id": "2nd underlying climate",
+          "climate_entity3_id": "3rd underlying climate",
+          "climate_entity4_id": "4th underlying climate",
+          "ac_mode": "AC mode"
        },
        "data_description": {
          "heater_entity_id": "Mandatory heater entity id",
@@ -169,7 +195,11 @@
          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
-          "climate_entity_id": "Underlying climate entity id"
+          "climate_entity_id": "Underlying climate entity id",
+          "climate_entity2_id": "2nd underlying climate entity id",
+          "climate_entity3_id": "3rd underlying climate entity id",
+          "climate_entity4_id": "4th underlying climate entity id",
+          "ac_mode": "Use the Air Conditioning (AC) mode"
        }
      },
      "tpi": {
@@ -186,7 +216,10 @@
        "data": {
          "eco_temp": "Temperature in Eco preset",
          "comfort_temp": "Temperature in Comfort preset",
-          "boost_temp": "Temperature in Boost preset"
+          "boost_temp": "Temperature in Boost preset",
+          "eco_ac_temp": "Temperature in Eco preset for AC mode",
+          "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
+          "boost_ac_temp": "Temperature in Boost preset for AC mode"
        }
      },
      "window": {
@@ -212,7 +245,15 @@
        "description": "Motion sensor management. Preset can switch automatically depending of a motion detection\nLeave corresponding entity_id empty if not used.\nmotion_preset and no_motion_preset should be set to the corresponding preset name",
        "data": {
          "motion_sensor_entity_id": "Motion sensor entity id",
-          "motion_delay": "Motion delay (seconds)",
+          "motion_delay": "Activation delay",
+          "motion_off_delay": "Deactivation delay",
+          "motion_preset": "Motion preset",
+          "no_motion_preset": "No motion preset"
+        },
+        "data_description": {
+          "motion_sensor_entity_id": "The entity id of the motion sensor",
+          "motion_delay": "Motion activation activation delay (seconds)",
+          "motion_off_delay": "Motion deactivation delay (seconds)",
          "motion_preset": "Preset to use when motion is detected",
          "no_motion_preset": "Preset to use when no motion is detected"
        }
@@ -233,7 +274,10 @@
          "presence_sensor_entity_id": "Presence sensor entity id (true is present)",
          "eco_away_temp": "Temperature in Eco preset when no presence",
          "comfort_away_temp": "Temperature in Comfort preset when no presence",
-          "boost_away_temp": "Temperature in Boost preset when no presence"
+          "boost_away_temp": "Temperature in Boost preset when no presence",
+          "eco_ac_away_temp": "Temperature in Eco preset when no presence in AC mode",
+          "comfort_ac_away_temp": "Temperature in Comfort preset when no presence in AC mode",
+          "boost_ac_away_temp": "Temperature in Boost preset when no presence in AC mode"
        }
      },
      "advanced": {
@@ -266,7 +310,8 @@
    "thermostat_type": {
      "options": {
        "thermostat_over_switch": "Thermostat over a switch",
-        "thermostat_over_climate": "Thermostat over another thermostat"
+        "thermostat_over_climate": "Thermostat over another thermostat",
+        "thermostat_over_valve": "Thermostat over a valve"
      }
    }
  },
--- a/custom_components/versatile_thermostat/translations/fr.json
+++ b/custom_components/versatile_thermostat/translations/fr.json
@@ -8,8 +8,9 @@
        "description": "Principaux attributs obligatoires",
        "data": {
          "name": "Nom",
+          "thermostat_type": "Type de thermostat",
          "temperature_sensor_entity_id": "Température sensor entity id",
-          "external_temperature_sensor_entity_id": "Temperature exterieure sensor entity id",
+          "external_temperature_sensor_entity_id": "Température exterieure sensor entity id",
          "cycle_min": "Durée du cycle (minutes)",
          "temp_min": "Température minimale permise",
          "temp_max": "Température maximale permise",
@@ -29,7 +30,15 @@
          "heater_entity3_id": "3ème radiateur",
          "heater_entity4_id": "4ème radiateur",
          "proportional_function": "Algorithme",
-          "climate_entity_id": "Thermostat sous-jacent"
+          "climate_entity_id": "Thermostat sous-jacent",
+          "climate_entity2_id": "2ème thermostat sous-jacent",
+          "climate_entity3_id": "3ème thermostat sous-jacent",
+          "climate_entity4_id": "4ème thermostat sous-jacent",
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "1ère valve number",
+          "valve_entity2_id": "2ème valve number",
+          "valve_entity3_id": "3ème valve number",
+          "valve_entity4_id": "4ème valve number"
        },
        "data_description": {
          "heater_entity_id": "Entity id du 1er radiateur obligatoire",
@@ -37,7 +46,15 @@
          "heater_entity3_id": "Optionnel entity id du 3ème radiateur",
          "heater_entity4_id": "Optionnel entity id du 4ème radiateur",
          "proportional_function": "Algorithme à utiliser (Seul TPI est disponible pour l'instant)",
-          "climate_entity_id": "Entity id du thermostat sous-jacent"
+          "climate_entity_id": "Entity id du thermostat sous-jacent",
+          "climate_entity2_id": "Entity id du 2ème thermostat sous-jacent",
+          "climate_entity3_id": "Entity id du 3ème thermostat sous-jacent",
+          "climate_entity4_id": "Entity id du 4ème thermostat sous-jacent",
+          "ac_mode": "Utilisation du mode Air Conditionné (AC)",
+          "valve_entity_id": "Entity id de la 1ère valve",
+          "valve_entity2_id": "Entity id de la 2ème valve",
+          "valve_entity3_id": "Entity id de la 3ème valve",
+          "valve_entity4_id": "Entity id de la 4ème valve"
        }
      },
      "tpi": {
@@ -54,7 +71,10 @@
        "data": {
          "eco_temp": "Température en preset Eco",
          "comfort_temp": "Température en preset Comfort",
-          "boost_temp": "Température en preset Boost"
+          "boost_temp": "Température en preset Boost",
+          "eco_ac_temp": "Température en preset Eco en mode AC",
+          "comfort_ac_temp": "Température en preset Comfort en mode AC",
+          "boost_ac_temp": "Température en preset Boost en mode AC"
        }
      },
      "window": {
@@ -63,7 +83,7 @@
        "data": {
          "window_sensor_entity_id": "Détecteur d'ouverture (entity id)",
          "window_delay": "Délai avant extinction (secondes)",
-          "window_auto_open_threshold": "seuil haut de chute de température pour la détection automatique (en °/min)",
+          "window_auto_open_threshold": "Seuil haut de chute de température pour la détection automatique (en °/min)",
          "window_auto_close_threshold": "Seuil bas de chute de température pour la fin de détection automatique (en °/min)",
          "window_auto_max_duration": "Durée maximum d'une extinction automatique (en min)"
        },
@@ -79,8 +99,16 @@
        "title": "Gestion de la détection de mouvement",
        "description": "Le preset s'ajuste automatiquement si un mouvement est détecté\nLaissez l'entity id vide si non utilisé.\n'Preset mouvement' et 'Preset sans mouvement' doivent être choisis avec les preset à utiliser.",
        "data": {
+          "motion_sensor_entity_id": "Détecteur de mouvement",
+          "motion_delay": "Délai d'activation",
+          "motion_off_delay": "Délai de désactivation",
+          "motion_preset": "Preset si mouvement",
+          "no_motion_preset": "Preset si pas de mouvement"
+        },
+        "data_description": {
          "motion_sensor_entity_id": "Détecteur de mouvement entity id",
-          "motion_delay": "Délai avant changement (seconds)",
+          "motion_delay": "Délai avant activation lorsqu'un mouvement est détecté (secondss)",
+          "motion_off_delai": "Délai avant désactivation lorsqu'aucun mouvement n'est détecté (secondes)",
          "motion_preset": "Preset à utiliser si mouvement détecté",
          "no_motion_preset": "Preset à utiliser si pas de mouvement détecté"
        }
@@ -101,7 +129,10 @@
          "presence_sensor_entity_id": "Capteur de présence entity id (true si quelqu'un est présent)",
          "eco_away_temp": "Température en preset Eco en cas d'absence",
          "comfort_away_temp": "Température en preset Comfort en cas d'absence",
-          "boost_away_temp": "Température en preset Boost en cas d'absence"
+          "boost_away_temp": "Température en preset Boost en cas d'absence",
+          "eco_ac_away_temp": "Température en preset Eco en cas d'absence en mode AC",
+          "comfort_ac_away_temp": "Température en preset Comfort en cas d'absence en mode AC",
+          "boost_ac_away_temp": "Température en preset Boost en cas d'absence en mode AC"
        }
      },
      "advanced": {
@@ -161,7 +192,15 @@
          "heater_entity3_id": "3ème radiateur",
          "heater_entity4_id": "4ème radiateur",
          "proportional_function": "Algorithme",
-          "climate_entity_id": "Thermostat sous-jacent"
+          "climate_entity_id": "Thermostat sous-jacent",
+          "climate_entity2_id": "2ème thermostat sous-jacent",
+          "climate_entity3_id": "3ème thermostat sous-jacent",
+          "climate_entity4_id": "4ème thermostat sous-jacent",
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "1ère valve number",
+          "valve_entity2_id": "2ème valve number",
+          "valve_entity3_id": "3ème valve number",
+          "valve_entity4_id": "4ème valve number"
        },
        "data_description": {
          "heater_entity_id": "Entity id du 1er radiateur obligatoire",
@@ -169,7 +208,15 @@
          "heater_entity3_id": "Optionnel entity id du 3ème radiateur",
          "heater_entity4_id": "Optionnel entity id du 4ème radiateur",
          "proportional_function": "Algorithme à utiliser (Seul TPI est disponible pour l'instant)",
-          "climate_entity_id": "Entity id du thermostat sous-jacent"
+          "climate_entity_id": "Entity id du thermostat sous-jacent",
+          "climate_entity2_id": "Entity id du 2ème thermostat sous-jacent",
+          "climate_entity3_id": "Entity id du 3ème thermostat sous-jacent",
+          "climate_entity4_id": "Entity id du 4ème thermostat sous-jacent",
+          "ac_mode": "Utilisation du mode Air Conditionné (AC)",
+          "valve_entity_id": "Entity id de la 1ère valve",
+          "valve_entity2_id": "Entity id de la 2ème valve",
+          "valve_entity3_id": "Entity id de la 3ème valve",
+          "valve_entity4_id": "Entity id de la 4ème valve"
        }
      },
      "tpi": {
@@ -186,7 +233,10 @@
        "data": {
          "eco_temp": "Température en preset Eco",
          "comfort_temp": "Température en preset Comfort",
-          "boost_temp": "Température en preset Boost"
+          "boost_temp": "Température en preset Boost",
+          "eco_ac_temp": "Température en preset Eco en mode AC",
+          "comfort_ac_temp": "Température en preset Comfort en mode AC",
+          "boost_ac_temp": "Température en preset Boost en mode AC"
        }
      },
      "window": {
@@ -211,8 +261,16 @@
        "title": "Gestion de la détection de mouvement",
        "description": "Le preset s'ajuste automatiquement si un mouvement est détecté\nLaissez l'entity id vide si non utilisé.\n'Preset mouvement' et 'Preset sans mouvement' doivent être choisis avec les preset à utiliser.",
        "data": {
+          "motion_sensor_entity_id": "Détecteur de mouvement",
+          "motion_delay": "Délai d'activation",
+          "motion_off_delay": "Délai de désactivation",
+          "motion_preset": "Preset si mouvement",
+          "no_motion_preset": "Preset si pas de mouvement"
+        },
+        "data_description": {
          "motion_sensor_entity_id": "Détecteur de mouvement entity id",
-          "motion_delay": "Délai avant changement (seconds)",
+          "motion_delay": "Délai avant activation lorsqu'un mouvement est détecté (secondss)",
+          "motion_off_delai": "Délai avant désactivation lorsqu'aucun mouvement n'est détecté (secondes)",
          "motion_preset": "Preset à utiliser si mouvement détecté",
          "no_motion_preset": "Preset à utiliser si pas de mouvement détecté"
        }
@@ -233,7 +291,10 @@
          "presence_sensor_entity_id": "Capteur de présence entity id (true si quelqu'un est présent)",
          "eco_away_temp": "Température en preset Eco en cas d'absence",
          "comfort_away_temp": "Température en preset Comfort en cas d'absence",
-          "boost_away_temp": "Température en preset Boost en cas d'absence"
+          "boost_away_temp": "Température en preset Boost en cas d'absence",
+          "eco_ac_away_temp": "Température en preset Eco en cas d'absence en mode AC",
+          "comfort_ac_away_temp": "Température en preset Comfort en cas d'absence en mode AC",
+          "boost_ac_away_temp": "Température en preset Boost en cas d'absence en mode AC"
        }
      },
      "advanced": {
@@ -266,7 +327,8 @@
    "thermostat_type": {
      "options": {
        "thermostat_over_switch": "Thermostat sur un switch",
-        "thermostat_over_climate": "Thermostat sur un autre thermostat"
+        "thermostat_over_climate": "Thermostat sur un autre thermostat",
+        "thermostat_over_valve": "Thermostat sur une valve"
      }
    }
  },
--- a/custom_components/versatile_thermostat/translations/it.json
+++ b/custom_components/versatile_thermostat/translations/it.json
@@ -30,7 +30,15 @@
          "heater_entity3_id": "Terzo riscaldatore",
          "heater_entity4_id": "Quarto riscaldatore",
          "proportional_function": "Algoritmo",
-          "climate_entity_id": "Termostato sottostante"
+          "climate_entity_id": "Termostato sottostante",
+          "climate_entity2_id": "Secundo termostato sottostante",
+          "climate_entity3_id": "Terzo termostato sottostante",
+          "climate_entity4_id": "Quarto termostato sottostante",
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "Primo valvola numero",
+          "valve_entity2_id": "Secondo valvola numero",
+          "valve_entity3_id": "Terzo valvola numero",
+          "valve_entity4_id": "Quarto valvola numero"
        },
        "data_description": {
          "heater_entity_id": "Entity id obbligatoria del primo riscaldatore",
@@ -38,7 +46,15 @@
          "heater_entity3_id": "Entity id del terzo riscaldatore facoltativo. Lasciare vuoto se non utilizzato",
          "heater_entity4_id": "Entity id del quarto riscaldatore facoltativo. Lasciare vuoto se non utilizzato",
          "proportional_function": "Algoritmo da utilizzare (il TPI per adesso è l'unico)",
-          "climate_entity_id": "Entity id del termostato sottostante"
+          "climate_entity_id": "Entity id del termostato sottostante",
+          "climate_entity2_id": "Entity id del secundo termostato sottostante",
+          "climate_entity3_id": "Entity id del terzo termostato sottostante",
+          "climate_entity4_id": "Entity id del quarto termostato sottostante",
+          "ac_mode": "Utilizzare la modalità AC (Air Conditioned) ?",
+          "valve_entity_id": "Entity id del primo valvola numero",
+          "valve_entity2_id": "Entity id del secondo valvola numero",
+          "valve_entity3_id": "Entity id del terzo valvola numero",
+          "valve_entity4_id": "Entity id del quarto valvola numero"
        }
      },
      "tpi": {
@@ -55,7 +71,10 @@
        "data": {
          "eco_temp": "Temperatura nel preset Eco",
          "comfort_temp": "Temperatura nel preset Comfort",
-          "boost_temp": "Temperatura nel preset Boost"
+          "boost_temp": "Temperatura nel preset Boost",
+          "eco_ac_temp": "Temperatura nel preset Eco (AC mode)",
+          "comfort_ac_temp": "Temperatura nel preset Comfort (AC mode)",
+          "boost_ac_temp": "Temperatura nel preset Boost (AC mode)"
        }
      },
      "window": {
@@ -82,6 +101,7 @@
        "data": {
          "motion_sensor_entity_id": "Entity id sensore di movimento",
          "motion_delay": "Ritardo in secondi prima che il rilevamento del sensore sia preso in considerazione",
+          "motion_off_delay": "Ritardo in secondi di disattivazione prima che del sensore sia preso in considerazione",
          "motion_preset": "Preset da utilizzare quando viene rilevato il movimento",
          "no_motion_preset": "Preset da utilizzare quando non viene rilevato il movimento"
        }
@@ -102,7 +122,10 @@
          "presence_sensor_entity_id": "Entity id sensore presenza (true se è presente qualcuno)",
          "eco_away_temp": "Temperatura al preset Eco in caso d'assenza",
          "comfort_away_temp": "Temperatura al preset Comfort in caso d'assenza",
-          "boost_away_temp": "Temperatura al preset Boost in caso d'assenza"
+          "boost_away_temp": "Temperatura al preset Boost in caso d'assenza",
+          "eco_ac_away_temp": "Temperatura al preset Eco in caso d'assenza (AC mode)",
+          "comfort_ac_away_temp": "Temperatura al preset Comfort in caso d'assenza (AC mode)",
+          "boost_ac_away_temp": "Temperatura al preset Boost in caso d'assenza (AC mode)"
        }
      },
      "advanced": {
@@ -154,14 +177,22 @@
      },
      "type": {
        "title": "Entità collegate",
-        "description": "Attributi delle entità collegate",
+        "description": "Parametri entità collegate",
        "data": {
-          "heater_entity_id": "Interruttore riscaldatore",
-          "heater_entity2_id": "Secondo interruttore riscaldatore",
-          "heater_entity3_id": "Terzo interruttore riscaldatore",
-          "heater_entity4_id": "Quarto interruttore riscaldatore",
+          "heater_entity_id": "Primo riscaldatore",
+          "heater_entity2_id": "Secondo riscaldatore",
+          "heater_entity3_id": "Terzo riscaldatore",
+          "heater_entity4_id": "Quarto riscaldatore",
          "proportional_function": "Algoritmo",
-          "climate_entity_id": "Termostato sottostante"
+          "climate_entity_id": "Termostato sottostante",
+          "climate_entity2_id": "Secundo termostato sottostante",
+          "climate_entity3_id": "Terzo termostato sottostante",
+          "climate_entity4_id": "Quarto termostato sottostante",
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "Primo valvola numero",
+          "valve_entity2_id": "Secondo valvola numero",
+          "valve_entity3_id": "Terzo valvola numero",
+          "valve_entity4_id": "Quarto valvola numero"
        },
        "data_description": {
          "heater_entity_id": "Entity id obbligatoria del primo riscaldatore",
@@ -169,7 +200,15 @@
          "heater_entity3_id": "Entity id del terzo riscaldatore facoltativo. Lasciare vuoto se non utilizzato",
          "heater_entity4_id": "Entity id del quarto riscaldatore facoltativo. Lasciare vuoto se non utilizzato",
          "proportional_function": "Algoritmo da utilizzare (il TPI per adesso è l'unico)",
-          "climate_entity_id": "Entity id del termostato sottostante"
+          "climate_entity_id": "Entity id del termostato sottostante",
+          "climate_entity2_id": "Entity id del secundo termostato sottostante",
+          "climate_entity3_id": "Entity id del terzo termostato sottostante",
+          "climate_entity4_id": "Entity id del quarto termostato sottostante",
+          "ac_mode": "Utilizzare la modalità AC (Air Conditioned) ?",
+          "valve_entity_id": "Entity id del primo valvola numero",
+          "valve_entity2_id": "Entity id del secondo valvola numero",
+          "valve_entity3_id": "Entity id del terzo valvola numero",
+          "valve_entity4_id": "Entity id del quarto valvola numero"
        }
      },
      "tpi": {
@@ -186,7 +225,10 @@
        "data": {
          "eco_temp": "Temperatura nel preset Eco",
          "comfort_temp": "Temperatura nel preset Comfort",
-          "boost_temp": "Temperatura nel preset Boost"
+          "boost_temp": "Temperatura nel preset Boost",
+          "eco_ac_temp": "Temperatura nel preset Eco (AC mode)",
+          "comfort_ac_temp": "Temperatura nel preset Comfort (AC mode)",
+          "boost_ac_temp": "Temperatura nel preset Boost (AC mode)"
        }
      },
      "window": {
@@ -213,6 +255,7 @@
        "data": {
          "motion_sensor_entity_id": "Entity id sensore di movimento",
          "motion_delay": "Ritardo in secondi prima che il rilevamento del sensore sia preso in considerazione",
+          "motion_off_delay": "Ritardo in secondi di disattivazione prima che del sensore sia preso in considerazione",
          "motion_preset": "Preset da utilizzare quando viene rilevato il movimento",
          "no_motion_preset": "Preset da utilizzare quando non viene rilevato il movimento"
        }
@@ -233,7 +276,10 @@
          "presence_sensor_entity_id": "Entity id sensore presenza (true se è presente qualcuno)",
          "eco_away_temp": "Temperatura al preset Eco in caso d'assenza",
          "comfort_away_temp": "Temperatura al preset Comfort in caso d'assenza",
-          "boost_away_temp": "Temperatura al preset Boost in caso d'assenza"
+          "boost_away_temp": "Temperatura al preset Boost in caso d'assenza",
+          "eco_ac_away_temp": "Temperatura al preset Eco in caso d'assenza (AC mode)",
+          "comfort_ac_away_temp": "Temperatura al preset Comfort in caso d'assenza (AC mode)",
+          "boost_ac_away_temp": "Temperatura al preset Boost in caso d'assenza (AC mode)"
        }
      },
      "advanced": {
@@ -266,7 +312,8 @@
    "thermostat_type": {
      "options": {
        "thermostat_over_switch": "Termostato su un interruttore",
-        "thermostat_over_climate": "Termostato sopra un altro termostato"
+        "thermostat_over_climate": "Termostato sopra un altro termostato",
+        "thermostat_over_valve": "Thermostato su una valvola"
      }
    }
  },
@@ -285,4 +332,4 @@
      }
    }
  }
-}
+}
--- a/custom_components/versatile_thermostat/underlyings.py
+++ b/custom_components/versatile_thermostat/underlyings.py
@@ -1,12 +1,14 @@
+# pylint: disable=unused-argument, line-too-long
+
 """ Underlying entities classes """
 import logging
 from typing import Any
+from enum import StrEnum

 from homeassistant.const import ATTR_ENTITY_ID, STATE_ON, UnitOfTemperature

 from homeassistant.exceptions import ServiceNotFound

-from homeassistant.backports.enum import StrEnum
 from homeassistant.core import HomeAssistant, DOMAIN as HA_DOMAIN, CALLBACK_TYPE
 from homeassistant.components.climate import (
    ClimateEntity,
@@ -22,10 +24,13 @@ from homeassistant.components.climate import (
    SERVICE_TURN_ON,
    SERVICE_SET_TEMPERATURE,
 )
+
+from homeassistant.components.number import SERVICE_SET_VALUE
+
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_call_later

-from .const import UnknownEntity
+from .const import UnknownEntity, overrides

 _LOGGER = logging.getLogger(__name__)

@@ -42,6 +47,9 @@ class UnderlyingEntityType(StrEnum):
    # a climate
    CLIMATE = "climate"

+    # a valve
+    VALVE = "valve"
+

 class UnderlyingEntity:
    """Represent a underlying device which could be a switch or a climate"""
@@ -127,10 +135,27 @@ class UnderlyingEntity:
        """Set the target temperature"""
        return

-    async def remove_entity(self):
+    def remove_entity(self):
        """Remove the underlying entity"""
        return

+    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.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 self.is_device_active:
+            _LOGGER.warning(
+                "%s - The hvac mode is ON, but the underlying device is not ON. Turning on device %s",
+                self,
+                self._entity_id,
+            )
+            await self.set_hvac_mode(hvac_mode)
+
    # override to be able to mock the call
    def call_later(
        self, hass: HomeAssistant, delay_sec: int, called_method
@@ -138,6 +163,19 @@ class UnderlyingEntity:
        """Call the method after a delay"""
        return async_call_later(hass, delay_sec, called_method)

+    async def start_cycle(
+        self,
+        hvac_mode: HVACMode,
+        on_time_sec: int,
+        off_time_sec: int,
+        on_percent: int,
+        force=False,
+    ):
+        """Starting cycle for switch"""
+
+    def _cancel_cycle(self):
+        """ Stops an eventual cycle """
+

 class UnderlyingSwitch(UnderlyingEntity):
    """Represent a underlying switch"""
@@ -180,7 +218,7 @@ class UnderlyingSwitch(UnderlyingEntity):
        if hvac_mode == HVACMode.OFF:
            if self.is_device_active:
                await self.turn_off()
-            await self._cancel_cycle()
+            self._cancel_cycle()

        if self._hvac_mode != hvac_mode:
            self._hvac_mode = hvac_mode
@@ -193,21 +231,13 @@ class UnderlyingSwitch(UnderlyingEntity):
        """If the toggleable device is currently active."""
        return self._hass.states.is_state(self._entity_id, STATE_ON)

-    async def check_initial_state(self, hvac_mode: HVACMode):
-        """Prevent the heater to be on but thermostat is off"""
-        if hvac_mode == HVACMode.OFF and self.is_device_active:
-            _LOGGER.warning(
-                "%s - The hvac mode is OFF, but the switch device is ON. Turning off device %s",
-                self,
-                self._entity_id,
-            )
-            await self.turn_off()
-
+    @overrides
    async def start_cycle(
        self,
        hvac_mode: HVACMode,
        on_time_sec: int,
        off_time_sec: int,
+        on_percent: int,
        force=False,
    ):
        """Starting cycle for switch"""
@@ -228,7 +258,7 @@ class UnderlyingSwitch(UnderlyingEntity):
        if self._async_cancel_cycle is not None:
            if force:
                _LOGGER.debug("%s - we force a new cycle", self)
-                await self._cancel_cycle()
+                self._cancel_cycle()
            else:
                _LOGGER.debug(
                    "%s - A previous cycle is alredy running and no force -> waits for its end",
@@ -239,7 +269,7 @@ class UnderlyingSwitch(UnderlyingEntity):
                return

        # If we should heat, starts the cycle with delay
-        if self._hvac_mode == HVACMode.HEAT and on_time_sec > 0:
+        if self._hvac_mode in [HVACMode.HEAT, HVACMode.COOL] and on_time_sec > 0:
            # Starts the cycle after the initial delay
            self._async_cancel_cycle = self.call_later(
                self._hass, self._initial_delay_sec, self._turn_on_later
@@ -258,7 +288,8 @@ class UnderlyingSwitch(UnderlyingEntity):
        else:
            _LOGGER.debug("%s - nothing to do", self)

-    async def _cancel_cycle(self):
+    @overrides
+    def _cancel_cycle(self):
        """Cancel the cycle"""
        if self._async_cancel_cycle:
            self._async_cancel_cycle()
@@ -275,7 +306,7 @@ class UnderlyingSwitch(UnderlyingEntity):
            self._on_time_sec,
        )

-        await self._cancel_cycle()
+        self._cancel_cycle()

        if self._hvac_mode == HVACMode.OFF:
            _LOGGER.debug("%s - End of cycle (HVAC_MODE_OFF - 2)", self)
@@ -291,15 +322,6 @@ class UnderlyingSwitch(UnderlyingEntity):
        time = self._on_time_sec

        action_label = "start"
-        # if self._should_relaunch_control_heating:
-        #    _LOGGER.debug("Don't %s cause a cycle have to be relaunch", action_label)
-        #    self._should_relaunch_control_heating = False
-        #    # self.hass.create_task(self._async_control_heating())
-        #    await self.start_cycle(
-        #        self._hvac_mode, self._on_time_sec, self._off_time_sec
-        #    )
-        #    _LOGGER.debug("%s - End of cycle (3)", self)
-        #    return

        if time > 0:
            _LOGGER.info(
@@ -327,7 +349,7 @@ class UnderlyingSwitch(UnderlyingEntity):
            self._should_relaunch_control_heating,
            self._off_time_sec,
        )
-        await self._cancel_cycle()
+        self._cancel_cycle()

        if self._hvac_mode == HVACMode.OFF:
            _LOGGER.debug("%s - End of cycle (HVAC_MODE_OFF - 2)", self)
@@ -336,16 +358,6 @@ class UnderlyingSwitch(UnderlyingEntity):
            return

        action_label = "stop"
-        # if self._should_relaunch_control_heating:
-        #    _LOGGER.debug("Don't %s cause a cycle have to be relaunch", action_label)
-        #    self._should_relaunch_control_heating = False
-        #    # self.hass.create_task(self._async_control_heating())
-        #    await self.start_cycle(
-        #        self._hvac_mode, self._on_time_sec, self._off_time_sec
-        #    )
-        #    _LOGGER.debug("%s - End of cycle (3)", self)
-        #    return
-
        time = self._off_time_sec

        if time > 0:
@@ -368,9 +380,9 @@ class UnderlyingSwitch(UnderlyingEntity):
        # increment energy at the end of the cycle
        self._thermostat.incremente_energy()

-    async def remove_entity(self):
-        """Remove the entity"""
-        await self._cancel_cycle()
+    def remove_entity(self):
+        """Remove the entity after stopping its cycle"""
+        self._cancel_cycle()


 class UnderlyingClimate(UnderlyingEntity):
@@ -446,7 +458,7 @@ class UnderlyingClimate(UnderlyingEntity):
    def is_device_active(self):
        """If the toggleable device is currently active."""
        if self.is_initialized:
-            return self._underlying_climate.hvac_action not in [
+            return self._underlying_climate.hvac_mode != HVACMode.OFF and self._underlying_climate.hvac_action not in [
                HVACAction.IDLE,
                HVACAction.OFF,
            ]
@@ -581,8 +593,145 @@ class UnderlyingClimate(UnderlyingEntity):
        return self._underlying_climate.temperature_unit

    @property
-    def target_temperature_step(self) -> str:
+    def target_temperature_step(self) -> float:
        """Get the target_temperature_step"""
        if not self.is_initialized:
            return 1
        return self._underlying_climate.target_temperature_step
+
+    @property
+    def target_temperature_high(self) -> float:
+        """Get the target_temperature_high"""
+        if not self.is_initialized:
+            return 30
+        return self._underlying_climate.target_temperature_high
+
+    @property
+    def target_temperature_low(self) -> float:
+        """Get the target_temperature_low"""
+        if not self.is_initialized:
+            return 15
+        return self._underlying_climate.target_temperature_low
+
+    @property
+    def is_aux_heat(self) -> bool:
+        """Get the is_aux_heat"""
+        if not self.is_initialized:
+            return False
+        return self._underlying_climate.is_aux_heat
+
+    def turn_aux_heat_on(self) -> None:
+        """Turn auxiliary heater on."""
+        if not self.is_initialized:
+            return None
+        return self._underlying_climate.turn_aux_heat_on()
+
+    def turn_aux_heat_off(self) -> None:
+        """Turn auxiliary heater on."""
+        if not self.is_initialized:
+            return None
+        return self._underlying_climate.turn_aux_heat_off()
+
+class UnderlyingValve(UnderlyingEntity):
+    """Represent a underlying switch"""
+
+    _hvac_mode: HVACMode
+    # This is the percentage of opening int integer (from 0 to 100)
+    _percent_open: int
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        thermostat: Any,
+        valve_entity_id: str
+    ) -> None:
+        """Initialize the underlying switch"""
+
+        super().__init__(
+            hass=hass,
+            thermostat=thermostat,
+            entity_type=UnderlyingEntityType.VALVE,
+            entity_id=valve_entity_id,
+        )
+        self._async_cancel_cycle = None
+        self._should_relaunch_control_heating = False
+        self._hvac_mode = None
+        self._percent_open = self._thermostat.valve_open_percent
+
+    async def send_percent_open(self):
+        """ Send the percent open to the underlying valve """
+        # This may fails if called after shutdown
+        try:
+            data = { ATTR_ENTITY_ID: self._entity_id, "value": self._percent_open }
+            domain = self._entity_id.split('.')[0]
+            await self._hass.services.async_call(
+                domain,
+                SERVICE_SET_VALUE,
+                data,
+            )
+        except ServiceNotFound as err:
+            _LOGGER.error(err)
+
+    async def turn_off(self):
+        """Turn heater toggleable device off."""
+        _LOGGER.debug("%s - Stopping underlying valve entity %s", self, self._entity_id)
+        self._percent_open = 0
+        if self.is_device_active:
+            await self.send_percent_open()
+
+    async def turn_on(self):
+        """Nothing to do for Valve because it cannot be turned off"""
+
+    async def set_hvac_mode(self, hvac_mode: HVACMode) -> bool:
+        """Set the HVACmode. Returns true if something have change"""
+
+        if hvac_mode == HVACMode.OFF:
+            await self.turn_off()
+
+        if self._hvac_mode != hvac_mode:
+            self._hvac_mode = hvac_mode
+            return True
+        else:
+            return False
+
+    @property
+    def is_device_active(self):
+        """If the toggleable device is currently active."""
+        try:
+            return self._percent_open > 0
+            # To test if real device is open but this is causing some side effect
+            # because the activation can be deferred -
+            # or float(self._hass.states.get(self._entity_id).state) > 0
+        except Exception: # pylint: disable=broad-exception-caught
+            return False
+
+    @overrides
+    async def start_cycle(
+        self,
+        hvac_mode: HVACMode,
+        _1,
+        _2,
+        _3,
+        force=False,
+    ):
+        """We use this function to change the on_percent"""
+        if force:
+            await self.send_percent_open()
+
+    def set_valve_open_percent(self, percent):
+        """ Update the valve open percent """
+        caped_val = self._thermostat.valve_open_percent
+        if self._percent_open == caped_val:
+            # No changes
+            return
+
+        self._percent_open = caped_val
+        # Send the new command to valve via a service call
+
+        _LOGGER.info("%s - Setting valve ouverture percent to %s", self, self._percent_open)
+        # Send the change to the valve, in background
+        self._hass.create_task(self.send_percent_open())
+
+    def remove_entity(self):
+        """Remove the entity after stopping its cycle"""
+        self._cancel_cycle()
--- a/hacs.json
+++ b/hacs.json
@@ -3,5 +3,5 @@
    "content_in_root": false,
    "render_readme": true,
    "hide_default_branch": false,
-    "homeassistant": "2022.2.0"
+    "homeassistant": "2023.10.3"
 }
--- a/images/config-linked-entity3.png
+++ b/images/config-linked-entity3.png
--- a/images/config-main.png
+++ b/images/config-main.png
--- a/images/config-motion.png
+++ b/images/config-motion.png
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -0,0 +1,2 @@
+homeassistant==2023.10.3
+ffmpeg
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -0,0 +1,6 @@
+# Warning: For automatic run of test in Gitlab CI, we must not include other things that pytest-homeassistant-custom-component
+-r requirements_dev.txt
+aiodiscover
+ulid_transform
+pytest-asyncio
+pytest-homeassistant-custom-component
--- a/scripts/starts_ha.sh
+++ b/scripts/starts_ha.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+set -x
+
+cd "$(dirname "$0")/.."
+pwd
+
+# Create config dir if not present
+if [[ ! -d "${PWD}/config" ]]; then
+    mkdir -p "${PWD}/config"
+    # Add defaults configuration
+    hass --config "${PWD}/config" --script ensure_config
+fi
+
+# Overwrite configuration.yaml if provided
+if [ -f ${PWD}/.devcontainer/configuration.yaml ]; then
+    rm -f ${PWD}/config/configuration.yaml
+    ln -s ${PWD}/.devcontainer/configuration.yaml ${PWD}/config/configuration.yaml
+fi
+
+# Set the path to custom_components
+## This let's us have the structure we want <root>/custom_components/integration_blueprint
+## while at the same time have Home Assistant configuration inside <root>/config
+## without resulting to symlinks.
+export PYTHONPATH="${PYTHONPATH}:${PWD}/custom_components"
+
+# Start Home Assistant
+hass --config "${PWD}/config" --debug
--- a/setup.cfg
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[tool:pytest]
+testpaths = tests
+asyncio_mode = auto
--- a/custom_components/versatile_thermostat/tests/init.py
+++ b/custom_components/versatile_thermostat/tests/init.py
--- a/custom_components/versatile_thermostat/tests/commons.py
+++ b/custom_components/versatile_thermostat/tests/commons.py
@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Some common resources """
 import asyncio
 import logging
@@ -5,7 +7,7 @@ from unittest.mock import patch, MagicMock
 import pytest  # pylint: disable=unused-import

 from homeassistant.core import HomeAssistant, Event, EVENT_STATE_CHANGED, State
-from homeassistant.const import UnitOfTemperature, STATE_ON, STATE_OFF
+from homeassistant.const import UnitOfTemperature, STATE_ON, STATE_OFF, ATTR_TEMPERATURE

 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.util import dt as dt_util
@@ -20,23 +22,26 @@ from homeassistant.components.climate import (

 from pytest_homeassistant_custom_component.common import MockConfigEntry

-from ..climate import VersatileThermostat
-from ..const import *  # pylint: disable=wildcard-import, unused-wildcard-import
-from ..underlyings import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.const import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from custom_components.versatile_thermostat.underlyings import *  # pylint: disable=wildcard-import, unused-wildcard-import

 from .const import (  # pylint: disable=unused-import
    MOCK_TH_OVER_SWITCH_USER_CONFIG,
    MOCK_TH_OVER_4SWITCH_USER_CONFIG,
    MOCK_TH_OVER_CLIMATE_USER_CONFIG,
    MOCK_TH_OVER_SWITCH_TYPE_CONFIG,
+    MOCK_TH_OVER_SWITCH_AC_TYPE_CONFIG,
    MOCK_TH_OVER_4SWITCH_TYPE_CONFIG,
    MOCK_TH_OVER_CLIMATE_TYPE_CONFIG,
    MOCK_TH_OVER_SWITCH_TPI_CONFIG,
    MOCK_PRESETS_CONFIG,
+    MOCK_PRESETS_AC_CONFIG,
    MOCK_WINDOW_CONFIG,
    MOCK_MOTION_CONFIG,
    MOCK_POWER_CONFIG,
    MOCK_PRESENCE_CONFIG,
+    MOCK_PRESENCE_AC_CONFIG,
    MOCK_ADVANCED_CONFIG,
    # MOCK_DEFAULT_FEATURE_CONFIG,
    PRESET_BOOST,
@@ -58,6 +63,19 @@ FULL_SWITCH_CONFIG = (
    | MOCK_ADVANCED_CONFIG
 )

+FULL_SWITCH_AC_CONFIG = (
+    MOCK_TH_OVER_SWITCH_USER_CONFIG
+    | MOCK_TH_OVER_SWITCH_AC_TYPE_CONFIG
+    | MOCK_TH_OVER_SWITCH_TPI_CONFIG
+    | MOCK_PRESETS_AC_CONFIG
+    | MOCK_WINDOW_CONFIG
+    | MOCK_MOTION_CONFIG
+    | MOCK_POWER_CONFIG
+    | MOCK_PRESENCE_AC_CONFIG
+    | MOCK_ADVANCED_CONFIG
+)
+
+
 PARTIAL_CLIMATE_CONFIG = (
    MOCK_TH_OVER_CLIMATE_USER_CONFIG
    | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG
@@ -83,7 +101,39 @@ _LOGGER = logging.getLogger(__name__)
 class MockClimate(ClimateEntity):
    """A Mock Climate class used for Underlying climate mode"""

-    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos, hvac_mode:HVACMode = HVACMode.OFF) -> None:   # pylint: disable=unused-argument
+        """Initialize the thermostat."""
+
+        super().__init__()
+
+        self.hass = hass
+        self.platform = 'climate'
+        self.entity_id= self.platform+'.'+unique_id
+        self._attr_extra_state_attributes = {}
+        self._unique_id = unique_id
+        self._name = name
+        self._attr_hvac_action = HVACAction.OFF if hvac_mode == HVACMode.OFF else HVACAction.HEATING
+        self._attr_hvac_mode = hvac_mode
+        self._attr_hvac_modes = [HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT]
+        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
+        self._attr_target_temperature = 20
+        self._attr_current_temperature = 15
+
+    def set_temperature(self, **kwargs):
+        """ Set the target temperature"""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        self._attr_target_temperature = temperature
+        self.async_write_ha_state()
+
+    async def async_set_hvac_mode(self, hvac_mode):
+        """ The hvac mode"""
+        self._attr_hvac_mode = hvac_mode
+        self.async_write_ha_state()
+
+class MockUnavailableClimate(ClimateEntity):
+    """A Mock Climate class used for Underlying climate mode"""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:   # pylint: disable=unused-argument
        """Initialize the thermostat."""

        super().__init__()
@@ -92,12 +142,11 @@ class MockClimate(ClimateEntity):
        self._attr_extra_state_attributes = {}
        self._unique_id = unique_id
        self._name = name
-        self._attr_hvac_action = HVACAction.OFF
-        self._attr_hvac_mode = HVACMode.OFF
+        self._attr_hvac_action = None
+        self._attr_hvac_mode = None
        self._attr_hvac_modes = [HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT]
        self._attr_temperature_unit = UnitOfTemperature.CELSIUS

-
 class MagicMockClimate(MagicMock):
    """A Magic Mock class for a underlying climate entity"""

@@ -172,10 +221,10 @@ class MagicMockClimate(MagicMock):

 async def create_thermostat(
    hass: HomeAssistant, entry: MockConfigEntry, entity_id: str
-) -> VersatileThermostat:
+) -> BaseThermostat:
    """Creates and return a TPI Thermostat"""
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
    ):
        entry.add_to_hass(hass)
        await hass.config_entries.async_setup(entry.entry_id)
@@ -201,7 +250,7 @@ def search_entity(hass: HomeAssistant, entity_id, domain) -> Entity:


 async def send_temperature_change_event(
-    entity: VersatileThermostat, new_temp, date, sleep=True
+    entity: BaseThermostat, new_temp, date, sleep=True
 ):
    """Sending a new temperature event simulating a change on temperature sensor"""
    _LOGGER.info(
@@ -227,7 +276,7 @@ async def send_temperature_change_event(


 async def send_ext_temperature_change_event(
-    entity: VersatileThermostat, new_temp, date, sleep=True
+    entity: BaseThermostat, new_temp, date, sleep=True
 ):
    """Sending a new external temperature event simulating a change on temperature sensor"""
    _LOGGER.info(
@@ -253,7 +302,7 @@ async def send_ext_temperature_change_event(


 async def send_power_change_event(
-    entity: VersatileThermostat, new_power, date, sleep=True
+    entity: BaseThermostat, new_power, date, sleep=True
 ):
    """Sending a new power event simulating a change on power sensor"""
    _LOGGER.info(
@@ -279,7 +328,7 @@ async def send_power_change_event(


 async def send_max_power_change_event(
-    entity: VersatileThermostat, new_power_max, date, sleep=True
+    entity: BaseThermostat, new_power_max, date, sleep=True
 ):
    """Sending a new power max event simulating a change on power max sensor"""
    _LOGGER.info(
@@ -305,7 +354,7 @@ async def send_max_power_change_event(


 async def send_window_change_event(
-    entity: VersatileThermostat, new_state: bool, old_state: bool, date, sleep=True
+    entity: BaseThermostat, new_state: bool, old_state: bool, date, sleep=True
 ):
    """Sending a new window event simulating a change on the window state"""
    _LOGGER.info(
@@ -339,7 +388,7 @@ async def send_window_change_event(


 async def send_motion_change_event(
-    entity: VersatileThermostat, new_state: bool, old_state: bool, date, sleep=True
+    entity: BaseThermostat, new_state: bool, old_state: bool, date, sleep=True
 ):
    """Sending a new motion event simulating a change on the window state"""
    _LOGGER.info(
@@ -373,7 +422,7 @@ async def send_motion_change_event(


 async def send_presence_change_event(
-    entity: VersatileThermostat, new_state: bool, old_state: bool, date, sleep=True
+    entity: BaseThermostat, new_state: bool, old_state: bool, date, sleep=True
 ):
    """Sending a new presence event simulating a change on the window state"""
    _LOGGER.info(
@@ -413,7 +462,7 @@ def get_tz(hass: HomeAssistant):


 async def send_climate_change_event(
-    entity: VersatileThermostat,
+    entity: BaseThermostat,
    new_hvac_mode: HVACMode,
    old_hvac_mode: HVACMode,
    new_hvac_action: HVACAction,
@@ -455,10 +504,55 @@ async def send_climate_change_event(
        await asyncio.sleep(0.1)
    return ret

+async def send_climate_change_event_with_temperature(
+    entity: BaseThermostat,
+    new_hvac_mode: HVACMode,
+    old_hvac_mode: HVACMode,
+    new_hvac_action: HVACAction,
+    old_hvac_action: HVACAction,
+    date,
+    temperature,
+    sleep=True,
+):
+    """Sending a new climate event simulating a change on the underlying climate state"""
+    _LOGGER.info(
+        "------- Testu: sending send_temperature_change_event, new_hvac_mode=%s old_hvac_mode=%s new_hvac_action=%s old_hvac_action=%s date=%s temperature=%s on %s",
+        new_hvac_mode,
+        old_hvac_mode,
+        new_hvac_action,
+        old_hvac_action,
+        date,
+        temperature,
+        entity,
+    )
+    climate_event = Event(
+        EVENT_STATE_CHANGED,
+        {
+            "new_state": State(
+                entity_id=entity.entity_id,
+                state=new_hvac_mode,
+                attributes={"hvac_action": new_hvac_action, "temperature": temperature},
+                last_changed=date,
+                last_updated=date,
+            ),
+            "old_state": State(
+                entity_id=entity.entity_id,
+                state=old_hvac_mode,
+                attributes={"hvac_action": old_hvac_action},
+                last_changed=date,
+                last_updated=date,
+            ),
+        },
+    )
+    ret = await entity._async_climate_changed(climate_event)
+    if sleep:
+        await asyncio.sleep(0.1)
+    return ret

-def cancel_switchs_cycles(entity: VersatileThermostat):
+
+def cancel_switchs_cycles(entity: BaseThermostat):
    """This method will cancel all running cycle on all underlying switch entity"""
-    if entity._is_over_climate:
+    if entity.is_over_climate:
        return
    for under in entity._underlyings:
        under._cancel_cycle()
--- a/custom_components/versatile_thermostat/tests/conftest.py
+++ b/custom_components/versatile_thermostat/tests/conftest.py
@@ -1,4 +1,6 @@
 """Global fixtures for integration_blueprint integration."""
+# pylint: disable=line-too-long
+
 # Fixtures allow you to replace functions with a Mock object. You can perform
 # many options via the Mock to reflect a particular behavior from the original
 # function that you want to see without going through the function's actual logic.
@@ -24,9 +26,7 @@ from custom_components.versatile_thermostat.config_flow import (
    VersatileThermostatBaseConfigFlow,
 )

-from custom_components.versatile_thermostat.climate import (
-    VersatileThermostat,
-)
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat

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

@@ -34,7 +34,7 @@ pytest_plugins = "pytest_homeassistant_custom_component"  # pylint: disable=inva
 # This fixture enables loading custom integrations in all tests.
 # Remove to enable selective use of this fixture
@pytest.fixture(autouse=True)
-def auto_enable_custom_integrations(enable_custom_integrations):
+def auto_enable_custom_integrations(enable_custom_integrations):  # pylint: disable=unused-argument
    """Enable all integration in tests"""
    yield

@@ -82,7 +82,7 @@ def skip_hass_states_get_fixture():
 def skip_control_heating_fixture():
    """Skip the control_heating of VersatileThermostat"""
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
    ):
        yield

@@ -105,6 +105,6 @@ def skip_hass_states_is_state_fixture():

@pytest.fixture(name="skip_send_event")
 def skip_send_event_fixture():
-    """Skip the send_event in VersatileThermostat"""
-    with patch.object(VersatileThermostat, "send_event"):
+    """Skip the send_event in BaseThermostat"""
+    with patch.object(BaseThermostat, "send_event"):
        yield
--- a/custom_components/versatile_thermostat/tests/const.py
+++ b/custom_components/versatile_thermostat/tests/const.py
@@ -15,6 +15,7 @@ from custom_components.versatile_thermostat.const import (
    CONF_THERMOSTAT_CLIMATE,
    CONF_THERMOSTAT_SWITCH,
    CONF_THERMOSTAT_TYPE,
+    CONF_AC_MODE,
    CONF_TEMP_SENSOR,
    CONF_EXTERNAL_TEMP_SENSOR,
    CONF_CYCLE_MIN,
@@ -39,6 +40,7 @@ from custom_components.versatile_thermostat.const import (
    CONF_WINDOW_AUTO_MAX_DURATION,
    CONF_MOTION_SENSOR,
    CONF_MOTION_DELAY,
+    CONF_MOTION_OFF_DELAY,
    CONF_MOTION_PRESET,
    CONF_NO_MOTION_PRESET,
    CONF_POWER_SENSOR,
@@ -49,7 +51,6 @@ from custom_components.versatile_thermostat.const import (
    PRESET_AWAY_SUFFIX,
    CONF_CLIMATE,
 )
-
 MOCK_TH_OVER_SWITCH_USER_CONFIG = {
    CONF_NAME: "TheOverSwitchMockName",
    CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
@@ -95,6 +96,13 @@ MOCK_TH_OVER_CLIMATE_USER_CONFIG = {
 MOCK_TH_OVER_SWITCH_TYPE_CONFIG = {
    CONF_HEATER: "switch.mock_switch",
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+    CONF_AC_MODE: False,
+}
+
+MOCK_TH_OVER_SWITCH_AC_TYPE_CONFIG = {
+    CONF_HEATER: "switch.mock_air_conditioner",
+    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+    CONF_AC_MODE: True,
 }

 MOCK_TH_OVER_4SWITCH_TYPE_CONFIG = {
@@ -103,6 +111,7 @@ MOCK_TH_OVER_4SWITCH_TYPE_CONFIG = {
    CONF_HEATER_3: "switch.mock_4switch2",
    CONF_HEATER_4: "switch.mock_4switch3",
    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+    CONF_AC_MODE: False,
 }

 MOCK_TH_OVER_SWITCH_TPI_CONFIG = {
@@ -112,6 +121,7 @@ MOCK_TH_OVER_SWITCH_TPI_CONFIG = {

 MOCK_TH_OVER_CLIMATE_TYPE_CONFIG = {
    CONF_CLIMATE: "climate.mock_climate",
+    CONF_AC_MODE: False,
 }

 MOCK_PRESETS_CONFIG = {
@@ -120,6 +130,15 @@ MOCK_PRESETS_CONFIG = {
    PRESET_BOOST + "_temp": 18,
 }

+MOCK_PRESETS_AC_CONFIG = {
+    PRESET_ECO + "_temp": 17,
+    PRESET_COMFORT + "_temp": 19,
+    PRESET_BOOST + "_temp": 20,
+    PRESET_ECO + "_ac_temp": 25,
+    PRESET_COMFORT + "_ac_temp": 23,
+    PRESET_BOOST + "_ac_temp": 21,
+}
+
 MOCK_WINDOW_CONFIG = {
    CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
    CONF_WINDOW_DELAY: 10,
@@ -134,6 +153,7 @@ MOCK_WINDOW_AUTO_CONFIG = {
 MOCK_MOTION_CONFIG = {
    CONF_MOTION_SENSOR: "input_boolean.motion_sensor",
    CONF_MOTION_DELAY: 10,
+    CONF_MOTION_OFF_DELAY: 30,
    CONF_MOTION_PRESET: PRESET_COMFORT,
    CONF_NO_MOTION_PRESET: PRESET_ECO,
 }
@@ -151,6 +171,16 @@ MOCK_PRESENCE_CONFIG = {
    PRESET_BOOST + PRESET_AWAY_SUFFIX + "_temp": 18,
 }

+MOCK_PRESENCE_AC_CONFIG = {
+    CONF_PRESENCE_SENSOR: "person.presence_sensor",
+    PRESET_ECO + PRESET_AWAY_SUFFIX + "_temp": 16,
+    PRESET_COMFORT + PRESET_AWAY_SUFFIX + "_temp": 17,
+    PRESET_BOOST + PRESET_AWAY_SUFFIX + "_temp": 18,
+    PRESET_ECO + "_ac" + PRESET_AWAY_SUFFIX + "_temp": 27,
+    PRESET_COMFORT +  "_ac" + PRESET_AWAY_SUFFIX + "_temp": 26,
+    PRESET_BOOST +  "_ac" + PRESET_AWAY_SUFFIX + "_temp": 25,
+}
+
 MOCK_ADVANCED_CONFIG = {
    CONF_MINIMAL_ACTIVATION_DELAY: 10,
    CONF_SECURITY_DELAY_MIN: 5,
--- a/custom_components/versatile_thermostat/tests/test_binary_sensors.py
+++ b/custom_components/versatile_thermostat/tests/test_binary_sensors.py
@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, unused-argument, line-too-long
+
 """ Test the normal start of a Thermostat """
 from unittest.mock import patch
 from datetime import timedelta, datetime
@@ -9,9 +11,8 @@ from homeassistant.components.binary_sensor import BinarySensorDeviceClass

 from pytest_homeassistant_custom_component.common import MockConfigEntry

-from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
-from ..climate import VersatileThermostat
-from ..binary_sensor import (
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.binary_sensor import (
    SecurityBinarySensor,
    OverpoweringBinarySensor,
    WindowBinarySensor,
@@ -19,7 +20,7 @@ from ..binary_sensor import (
    PresenceBinarySensor,
 )

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


@pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -29,7 +30,7 @@ async def test_security_binary_sensors(
    skip_hass_states_is_state,
    skip_turn_on_off_heater,
    skip_send_event,
-):
+):   # pylint: disable=unused-argument
    """Test the security binary sensors in thermostat type"""

    entry = MockConfigEntry(
@@ -61,7 +62,7 @@ async def test_security_binary_sensors(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat (
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -142,7 +143,7 @@ async def test_overpowering_binary_sensors(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -224,7 +225,7 @@ async def test_window_binary_sensors(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -312,7 +313,7 @@ async def test_motion_binary_sensors(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -402,7 +403,7 @@ async def test_presence_binary_sensors(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -484,7 +485,7 @@ async def test_binary_sensors_over_climate_minimal(
            },
        )

-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
            hass, entry, "climate.theoverclimatemockname"
        )
        assert entity
--- a/custom_components/versatile_thermostat/tests/test_bugs.py
+++ b/custom_components/versatile_thermostat/tests/test_bugs.py
@@ -1,10 +1,12 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Test the Window management """
-from unittest.mock import patch
-from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from unittest.mock import patch, call
 from datetime import datetime, timedelta

 import logging

+from .commons import *
 logging.getLogger().setLevel(logging.DEBUG)


@@ -49,7 +51,7 @@ async def test_bug_56(
            },
        )

-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
            hass, entry, "climate.theoverclimatemockname"
        )
        assert entity
@@ -60,13 +62,11 @@ async def test_bug_56(
        # Should not failed
        entity.update_custom_attributes()

-        # try to call _async_control_heating
+        # try to call async_control_heating
        try:
-            await entity._async_control_heating()
+            ret = await entity.async_control_heating()
            # an exception should be send
-            assert False
-        except UnknownEntity:
-            pass
+            assert ret is False
        except Exception:  # pylint: disable=broad-exception-caught
            assert False

@@ -75,9 +75,9 @@ async def test_bug_56(
        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
        return_value=the_mock_underlying,  # dont find the underlying climate
    ):
-        # try to call _async_control_heating
+        # try to call async_control_heating
        try:
-            await entity._async_control_heating()
+            await entity.async_control_heating()
        except UnknownEntity:
            assert False
        except Exception:  # pylint: disable=broad-exception-caught
@@ -128,7 +128,7 @@ async def test_bug_63(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -180,7 +180,7 @@ async def test_bug_64(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -232,7 +232,7 @@ async def test_bug_66(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -247,7 +247,7 @@ async def test_bug_66(

    # Open the window and let the thermostat shut down
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -275,7 +275,7 @@ async def test_bug_66(

    # Close the window but too shortly
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -298,7 +298,7 @@ async def test_bug_66(

    # Reopen immediatly with sufficient time
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -321,7 +321,7 @@ async def test_bug_66(

    # Close the window but with sufficient time this time
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -343,3 +343,202 @@ async def test_bug_66(
        assert entity.window_state == STATE_OFF
        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_BOOST
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_82(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_turn_on_off_heater,
+    skip_send_event,
+):
+    """Test that when a underlying climate is not available the VTherm doesn't go into security mode"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data=PARTIAL_CLIMATE_CONFIG, # 5 minutes security delay
+    )
+
+    fake_underlying_climate = MockUnavailableClimate(hass, "mockUniqueId", "MockClimateName", {})
+
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=fake_underlying_climate,
+    ) as mock_find_climate:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        entity = find_my_entity("climate.theoverclimatemockname")
+
+        assert entity
+
+        assert entity.name == "TheOverClimateMockName"
+        assert entity.is_over_climate is True
+        # assert entity.hvac_action is HVACAction.OFF
+        assert entity.hvac_mode is HVACMode.OFF
+        # assert entity.hvac_mode is None
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_modes == [
+            PRESET_NONE,
+            PRESET_ECO,
+            PRESET_COMFORT,
+            PRESET_BOOST,
+        ]
+        assert entity.preset_mode is PRESET_NONE
+        assert entity._security_state is False
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+        assert mock_find_climate.call_count == 1
+        assert mock_find_climate.mock_calls[0] == call()
+        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
+
+        # Force security mode
+        assert entity._last_ext_temperature_mesure is not None
+        assert entity._last_temperature_mesure is not None
+        assert (entity._last_temperature_mesure.astimezone(tz) - now).total_seconds() < 1
+        assert (
+            entity._last_ext_temperature_mesure.astimezone(tz) - now
+        ).total_seconds() < 1
+
+        # Tries to turns on the Thermostat
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        assert entity.hvac_mode == HVACMode.HEAT
+
+        # 2. activate security feature when date is expired
+        with patch(
+            "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+        ) as mock_send_event, patch(
+            "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+        ):
+            event_timestamp = now - timedelta(minutes=6)
+
+            # set temperature to 15 so that on_percent will be > security_min_on_percent (0.2)
+            await send_temperature_change_event(entity, 15, event_timestamp)
+            # Should stay False
+            assert entity.security_state is False
+            assert entity.preset_mode == 'none'
+            assert entity._saved_preset_mode == 'none'
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_101(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_turn_on_off_heater,
+    skip_send_event,
+):
+    """Test that when a underlying climate target temp is changed, the VTherm change its own temperature target and switch to manual"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data=PARTIAL_CLIMATE_CONFIG, # 5 minutes security delay
+    )
+
+    # Underlying is in HEAT mode but should be shutdown at startup
+    fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {}, HVACMode.HEAT)
+
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=fake_underlying_climate,
+    ) as mock_find_climate, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        entity = find_my_entity("climate.theoverclimatemockname")
+
+        assert entity
+
+        assert entity.name == "TheOverClimateMockName"
+        assert entity.is_over_climate is True
+        assert entity.hvac_mode is HVACMode.OFF
+        # because the underlying is heating. In real life the underlying should be shut-off
+        assert entity.hvac_action is HVACAction.HEATING
+        # Underlying should have been shutdown
+        assert mock_underlying_set_hvac_mode.call_count == 1
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.OFF),
+            ]
+        )
+
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_mode is PRESET_NONE
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+        assert mock_find_climate.call_count == 1
+        assert mock_find_climate.mock_calls[0] == call()
+        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
+
+        # Force preset mode
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        assert entity.hvac_mode == HVACMode.HEAT
+        await entity.async_set_preset_mode(PRESET_COMFORT)
+        assert entity.preset_mode == PRESET_COMFORT
+
+        # 2. Change the target temp of underlying thermostat at now -> the event will be disgarded because to fast (to avoid loop cf issue 121)
+        await send_climate_change_event_with_temperature(entity, HVACMode.HEAT, HVACMode.HEAT, HVACAction.OFF, HVACAction.OFF, now, 12.75)
+        # Should NOT have been switched to Manual preset
+        assert entity.target_temperature == 17
+        assert entity.preset_mode is PRESET_COMFORT
+
+        # 2. Change the target temp of underlying thermostat at 11 sec later -> the event will be taken
+        # Wait 11 sec
+        event_timestamp = now + timedelta(seconds=11)
+        await send_climate_change_event_with_temperature(entity, HVACMode.HEAT, HVACMode.HEAT, HVACAction.OFF, HVACAction.OFF, event_timestamp, 12.75)
+        assert entity.target_temperature == 12.75
+        assert entity.preset_mode is PRESET_NONE
--- a/custom_components/versatile_thermostat/tests/test_config_flow.py
+++ b/custom_components/versatile_thermostat/tests/test_config_flow.py
@@ -29,7 +29,7 @@ async def test_show_form(hass: HomeAssistant) -> None:

@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_user_config_flow_over_switch(hass: HomeAssistant, skip_hass_states_get):
+async def test_user_config_flow_over_switch(hass: HomeAssistant, skip_hass_states_get):  # pylint: disable=unused-argument
    """Test the config flow with all thermostat_over_switch features"""
    result = await hass.config_entries.flow.async_init(
        DOMAIN, context={"source": SOURCE_USER}
@@ -128,7 +128,7 @@ async def test_user_config_flow_over_switch(hass: HomeAssistant, skip_hass_state

@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_user_config_flow_over_climate(hass: HomeAssistant, skip_hass_states_get):
+async def test_user_config_flow_over_climate(hass: HomeAssistant, skip_hass_states_get):  # pylint: disable=unused-argument
    """Test the config flow with all thermostat_over_climate features and no additional features"""
    result = await hass.config_entries.flow.async_init(
        DOMAIN, context={"source": SOURCE_USER}
@@ -157,38 +157,6 @@ async def test_user_config_flow_over_climate(hass: HomeAssistant, skip_hass_stat
        result["flow_id"], user_input=MOCK_PRESETS_CONFIG
    )

-    # assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    # assert result["step_id"] == "window"
-    # assert result["errors"] == {}
-
-    # result = await hass.config_entries.flow.async_configure(
-    #     result["flow_id"], user_input=MOCK_WINDOW_CONFIG
-    # )
-
-    # assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    # assert result["step_id"] == "motion"
-    # assert result["errors"] == {}
-
-    # result = await hass.config_entries.flow.async_configure(
-    #     result["flow_id"], user_input=MOCK_MOTION_CONFIG
-    # )
-
-    # assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    # assert result["step_id"] == "power"
-    # assert result["errors"] == {}
-
-    # result = await hass.config_entries.flow.async_configure(
-    #     result["flow_id"], user_input=MOCK_POWER_CONFIG
-    # )
-
-    # assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    # assert result["step_id"] == "presence"
-    # assert result["errors"] == {}
-
-    # result = await hass.config_entries.flow.async_configure(
-    #     result["flow_id"], user_input=MOCK_PRESENCE_CONFIG
-    # )
-
    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
    assert result["step_id"] == "advanced"
    assert result["errors"] == {}
@@ -216,7 +184,7 @@ async def test_user_config_flow_over_climate(hass: HomeAssistant, skip_hass_stat
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_config_flow_window_auto_ok(
-    hass: HomeAssistant, skip_hass_states_get, skip_control_heating
+    hass: HomeAssistant, skip_hass_states_get, skip_control_heating  # pylint: disable=unused-argument
 ):
    """Test the config flow with only window auto feature"""
    result = await hass.config_entries.flow.async_init(
@@ -313,7 +281,7 @@ async def test_user_config_flow_window_auto_ok(
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_config_flow_window_auto_ko(
-    hass: HomeAssistant, skip_hass_states_get
+    hass: HomeAssistant, skip_hass_states_get  # pylint: disable=unused-argument
 ):
    """Test the config flow with window auto and window features -> not allowed"""
    result = await hass.config_entries.flow.async_init(
@@ -385,7 +353,7 @@ async def test_user_config_flow_window_auto_ko(
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_config_flow_over_4_switches(
-    hass: HomeAssistant, skip_hass_states_get, skip_control_heating
+    hass: HomeAssistant, skip_hass_states_get, skip_control_heating  # pylint: disable=unused-argument
 ):
    """Test the config flow with 4 switchs thermostat_over_switch features"""

@@ -410,6 +378,7 @@ async def test_user_config_flow_over_4_switches(
        CONF_HEATER_3: "switch.mock_switch3",
        CONF_HEATER_4: "switch.mock_switch4",
        CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+        CONF_AC_MODE: False,
    }

    result = await hass.config_entries.flow.async_init(
--- a/custom_components/versatile_thermostat/tests/test_movement.py
+++ b/custom_components/versatile_thermostat/tests/test_movement.py
@@ -1,10 +1,10 @@
 """ Test the Window management """
 import asyncio
+from datetime import datetime, timedelta
+import logging
 from unittest.mock import patch, call, PropertyMock
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
-from datetime import datetime, timedelta

-import logging

 logging.getLogger().setLevel(logging.DEBUG)

@@ -43,10 +43,11 @@ async def test_movement_management_time_not_enough(
            CONF_TPI_COEF_INT: 0.3,
            CONF_TPI_COEF_EXT: 0.01,
            CONF_MINIMAL_ACTIVATION_DELAY: 30,
-            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_DELAY_MIN: 10,
            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
            CONF_MOTION_SENSOR: "binary_sensor.mock_motion_sensor",
-            CONF_MOTION_DELAY: 0,  # important to not been obliged to wait
+            CONF_MOTION_DELAY: 10,  # important to not been obliged to wait
+            CONF_MOTION_OFF_DELAY: 30,
            CONF_MOTION_PRESET: "boost",
            CONF_NO_MOTION_PRESET: "comfort",
            CONF_PRESENCE_SENSOR: "binary_sensor.mock_presence_sensor",
@@ -61,9 +62,9 @@ async def test_movement_management_time_not_enough(
    tz = get_tz(hass)  # pylint: disable=invalid-name
    now: datetime = datetime.now(tz=tz)

-    # start heating, in boost mode. We block the control_heating to avoid running a cycle
+    # start heating, in boost mode, when someone is present. We block the control_heating to avoid running a cycle
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
    ):
        await entity.async_set_hvac_mode(HVACMode.HEAT)
        await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -75,33 +76,37 @@ async def test_movement_management_time_not_enough(
        assert entity.motion_state is None
        assert entity.presence_state is None

-        event_timestamp = now - timedelta(minutes=4)
+        event_timestamp = now - timedelta(minutes=5)
        await send_temperature_change_event(entity, 18, event_timestamp)
        await send_ext_temperature_change_event(entity, 10, event_timestamp)

        await send_presence_change_event(entity, True, False, event_timestamp)
        assert entity.presence_state is "on"

-    # starts detecting motion
+    # starts detecting motion with time not enough
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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,
+        return_value=False,
    ), patch(
        "homeassistant.helpers.condition.state", return_value=False
-    ):
-        event_timestamp = now - timedelta(minutes=3)
-        await send_motion_change_event(entity, True, False, event_timestamp)
+    ) as mock_condition:
+        event_timestamp = now - timedelta(minutes=4)
+        try_condition = await send_motion_change_event(entity, True, False, event_timestamp)
+
+        # Will return False -> we will stay on movement False
+        await try_condition(None)

        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_ACTIVITY
        # because no motion is detected yet
        assert entity.target_temperature == 18
+        # state is not changed if time is not enough
        assert entity.motion_state is None
        assert entity.presence_state is "on"

@@ -111,9 +116,67 @@ async def test_movement_management_time_not_enough(
        assert mock_heater_off.call_count == 0
        assert mock_send_event.call_count == 0

-    # stop detecting motion with confirmation of stop
+    # starts detecting motion with time enough this time
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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=False,
+    ), patch(
+        "homeassistant.helpers.condition.state", return_value=True
+    ) as mock_condition:
+        event_timestamp = now - timedelta(minutes=3)
+        try_condition = await send_motion_change_event(entity, True, False, event_timestamp)
+
+        # Will return True -> we will switch to movement On
+        await try_condition(None)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        # because motion is detected yet
+        assert entity.target_temperature == 19
+        assert entity.motion_state is "on"
+        assert entity.presence_state is "on"
+
+    # stop detecting motion with off delay too low
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "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,
+    ) as mock_device_active, patch(
+        "homeassistant.helpers.condition.state", return_value=False
+    ) as mock_condition:
+        event_timestamp = now - timedelta(minutes=2)
+        try_condition = await send_motion_change_event(entity, False, True, event_timestamp)
+
+         # Will return False -> we will stay to movement On
+        await try_condition(None)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        # because no motion is detected yet
+        assert entity.target_temperature == 19
+        assert entity.motion_state is "on"
+        assert entity.presence_state is "on"
+
+        assert mock_send_event.call_count == 0
+        # The heater must heat now
+        assert mock_heater_on.call_count == 1
+        assert mock_heater_off.call_count == 0
+        assert mock_send_event.call_count == 0
+
+    # stop detecting motion with off delay enough long
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
    ) as mock_send_event, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
    ) as mock_heater_on, patch(
@@ -124,8 +187,11 @@ async def test_movement_management_time_not_enough(
    ) as mock_device_active, patch(
        "homeassistant.helpers.condition.state", return_value=True
    ) as mock_condition:
-        event_timestamp = now - timedelta(minutes=2)
-        await send_motion_change_event(entity, False, True, event_timestamp)
+        event_timestamp = now - timedelta(minutes=1)
+        try_condition = await send_motion_change_event(entity, False, True, event_timestamp)
+
+         # Will return True -> we will switch to movement Off
+        await try_condition(None)

        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_ACTIVITY
@@ -135,9 +201,8 @@ async def test_movement_management_time_not_enough(
        assert entity.presence_state is "on"

        assert mock_send_event.call_count == 0
-        # Change is not confirmed
+        # The heater must stop heating now
        assert mock_heater_on.call_count == 0
-        # Because device is active
        assert mock_heater_off.call_count == 1
        assert mock_send_event.call_count == 0

@@ -196,7 +261,7 @@ async def test_movement_management_time_enough_and_presence(

    # start heating, in boost mode. We block the control_heating to avoid running a cycle
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
    ):
        await entity.async_set_hvac_mode(HVACMode.HEAT)
        await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -217,7 +282,7 @@ async def test_movement_management_time_enough_and_presence(

    # starts detecting motion
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -246,7 +311,7 @@ async def test_movement_management_time_enough_and_presence(

    # stop detecting motion with confirmation of stop
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -328,7 +393,7 @@ async def test_movement_management_time_enoughand_not_presence(

    # start heating, in boost mode. We block the control_heating to avoid running a cycle
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
    ):
        await entity.async_set_hvac_mode(HVACMode.HEAT)
        await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -349,7 +414,7 @@ async def test_movement_management_time_enoughand_not_presence(

    # starts detecting motion
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -378,7 +443,7 @@ async def test_movement_management_time_enoughand_not_presence(

    # stop detecting motion with confirmation of stop
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -405,3 +470,131 @@ async def test_movement_management_time_enoughand_not_presence(
        assert entity.proportional_algorithm.on_percent == 0.11
        assert mock_heater_off.call_count == 0
        assert mock_send_event.call_count == 0
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_movement_management_with_stop_during_condition(
+    hass: HomeAssistant, skip_hass_states_is_state
+):
+    """Test the Presence management when the movement sensor switch to off and then to on during the test condition"""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverSwitchMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            "eco_away_temp": 17,
+            "comfort_away_temp": 18,
+            "boost_away_temp": 19,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: True,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: True,
+            CONF_HEATER: "switch.mock_switch",
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.3,
+            CONF_TPI_COEF_EXT: 0.01,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_MOTION_SENSOR: "binary_sensor.mock_motion_sensor",
+            CONF_MOTION_DELAY: 10,
+            CONF_MOTION_OFF_DELAY: 30,
+            CONF_MOTION_PRESET: "boost",
+            CONF_NO_MOTION_PRESET: "comfort",
+            CONF_PRESENCE_SENSOR: "binary_sensor.mock_presence_sensor",
+        },
+    )
+
+    entity: VersatileThermostat = await create_thermostat(
+        hass, entry, "climate.theoverswitchmockname"
+    )
+    assert entity
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    # start heating, in boost mode. We block the control_heating to avoid running a cycle
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ):
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        await entity.async_set_preset_mode(PRESET_ACTIVITY)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        # because no motion is detected yet
+        assert entity.target_temperature == 18
+        assert entity.motion_state is None
+        assert entity.presence_state is None
+
+        event_timestamp = now - timedelta(minutes=6)
+        await send_temperature_change_event(entity, 18, event_timestamp)
+        await send_ext_temperature_change_event(entity, 10, event_timestamp)
+
+        await send_presence_change_event(entity, False, True, event_timestamp)
+        assert entity.presence_state is "off"
+
+    # starts detecting motion
+    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,
+    ), patch("homeassistant.helpers.condition.state", return_value=True): # Not needed for this test
+        event_timestamp = now - timedelta(minutes=5)
+        try_condition1 = await send_motion_change_event(entity, True, False, event_timestamp)
+
+        assert try_condition1 is not None
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        # because motion is detected yet -> switch to Boost mode
+        assert entity.target_temperature == 18
+        assert entity.motion_state is None
+        assert entity.presence_state is "off"
+
+        # Send a stop detection
+        event_timestamp = now - timedelta(minutes=4)
+        try_condition = await send_motion_change_event(entity, False, True, event_timestamp)
+        assert try_condition is None    # The timer should not have been stopped
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        assert entity.target_temperature == 18
+        assert entity.motion_state is None
+        assert entity.presence_state is "off"
+
+        # Resend a start detection
+        event_timestamp = now - timedelta(minutes=3)
+        try_condition = await send_motion_change_event(entity, True, False, event_timestamp)
+        assert try_condition is None  # The timer should not have been restarted (we keep the first one)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_ACTIVITY
+        # still no motion detected
+        assert entity.target_temperature == 18
+        assert entity.motion_state is None
+        assert entity.presence_state is "off"
+
+        await try_condition1(None)
+        # We should have switch this time
+        assert entity.target_temperature == 19 # Boost
+        assert entity.motion_state is "on"     # switch to movement on
+        assert entity.presence_state is "off"  # Non change
+
--- a/custom_components/versatile_thermostat/tests/test_multiple_switch.py
+++ b/custom_components/versatile_thermostat/tests/test_multiple_switch.py
@@ -1,11 +1,11 @@
 """ Test the Multiple switch management """
 import asyncio
 from unittest.mock import patch, call, ANY
-from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
 from datetime import datetime, timedelta
-
 import logging

+from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+
 logging.getLogger().setLevel(logging.DEBUG)


@@ -15,7 +15,7 @@ async def test_one_switch_cycle(
    hass: HomeAssistant,
    skip_hass_states_is_state,
    skip_send_event,
-):
+):  # pylint: disable=unused-argument
    """Test that when multiple switch are configured the activation is distributed"""

    tz = get_tz(hass)  # pylint: disable=invalid-name
@@ -58,7 +58,7 @@ async def test_one_switch_cycle(

    # start heating, in boost mode. We block the control_heating to avoid running a cycle
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
    ):
        await entity.async_set_hvac_mode(HVACMode.HEAT)
        await entity.async_set_preset_mode(PRESET_BOOST)
@@ -75,14 +75,14 @@ async def test_one_switch_cycle(
    with patch(
        "homeassistant.core.StateMachine.is_state", return_value=False
    ) as mock_is_state:
-        assert entity._is_device_active is False
+        assert entity.is_device_active is False  # pylint: disable=protected-access

        # Should be call for the Switch
        assert mock_is_state.call_count == 1

    # Set temperature to a low level
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -117,7 +117,7 @@ async def test_one_switch_cycle(
    # Set a temperature at middle level
    event_timestamp = now - timedelta(minutes=4)
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -132,13 +132,14 @@ async def test_one_switch_cycle(
        assert mock_send_event.call_count == 0
        assert mock_heater_off.call_count == 0

-        # The first heater should be turned on but is already on but because above we mock call_later the heater is not on. But this time it will be really on
+        # The first heater should be turned on but is already on but because above we mock
+        # call_later the heater is not on. But this time it will be really on
        assert mock_heater_on.call_count == 1

    # Set another temperature at middle level
    event_timestamp = now - timedelta(minutes=3)
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -153,22 +154,25 @@ async def test_one_switch_cycle(
        assert mock_send_event.call_count == 0
        assert mock_heater_off.call_count == 0

-        # The heater is already on cycle. So we wait that the cycle ends and no heater action is done
+        # The heater is already on cycle. So we wait that the cycle ends and no heater action
+        # is done
        assert mock_heater_on.call_count == 0
        # assert entity.underlying_entity(0)._should_relaunch_control_heating is True

        # Simulate the relaunch
-        await entity.underlying_entity(0)._turn_on_later(None)
+        await entity.underlying_entity(0)._turn_on_later(   # pylint: disable=protected-access
+            None
+        )
        # wait restart
        await asyncio.sleep(0.1)

        assert mock_heater_on.call_count == 1
-        # TODO normal ? assert entity.underlying_entity(0)._should_relaunch_control_heating is False
+        # normal ? assert entity.underlying_entity(0)._should_relaunch_control_heating is False

    # Simulate the end of heater on cycle
    event_timestamp = now - timedelta(minutes=3)
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -177,7 +181,9 @@ async def test_one_switch_cycle(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
        return_value=True,
    ) as mock_device_active:
-        await entity.underlying_entity(0)._turn_off_later(None)
+        await entity.underlying_entity(0)._turn_off_later( # pylint: disable=protected-access
+            None
+        )

        # No special event
        assert mock_send_event.call_count == 0
@@ -189,7 +195,7 @@ async def test_one_switch_cycle(
    # Simulate the start of heater on cycle
    event_timestamp = now - timedelta(minutes=3)
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -198,7 +204,9 @@ async def test_one_switch_cycle(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
        return_value=True,
    ) as mock_device_active:
-        await entity.underlying_entity(0)._turn_on_later(None)
+        await entity.underlying_entity(0)._turn_on_later(  # pylint: disable=protected-access
+            None
+        )

        # No special event
        assert mock_send_event.call_count == 0
@@ -214,7 +222,7 @@ async def test_multiple_switchs(
    hass: HomeAssistant,
    skip_hass_states_is_state,
    skip_send_event,
-):
+):  # pylint: disable=unused-argument
    """Test that when multiple switch are configured the activation is distributed"""

    tz = get_tz(hass)  # pylint: disable=invalid-name
@@ -257,11 +265,14 @@ async def test_multiple_switchs(
    )
    assert entity
    assert entity.is_over_climate is False
+    assert entity.nb_underlying_entities == 4

    # start heating, in boost mode. We block the control_heating to avoid running a cycle
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
-    ):
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ), patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode:
        await entity.async_set_hvac_mode(HVACMode.HEAT)
        await entity.async_set_preset_mode(PRESET_BOOST)

@@ -273,18 +284,20 @@ async def test_multiple_switchs(
        event_timestamp = now - timedelta(minutes=4)
        await send_temperature_change_event(entity, 15, event_timestamp)

-    # Checks that all heaters are off
-    with patch(
-        "homeassistant.core.StateMachine.is_state", return_value=False
-    ) as mock_is_state:
-        assert entity._is_device_active is False
+        # Checks that all climates are off
+        assert entity.is_device_active is False  # pylint: disable=protected-access

        # Should be call for all Switch
-        assert mock_is_state.call_count == 4
+        assert mock_underlying_set_hvac_mode.call_count == 4
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.HEAT),
+            ]
+        )

    # Set temperature to a low level
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -322,7 +335,7 @@ async def test_multiple_switchs(
    # Set a temperature at middle level
    event_timestamp = now - timedelta(minutes=4)
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -337,5 +350,241 @@ async def test_multiple_switchs(
        assert mock_send_event.call_count == 0
        assert mock_heater_off.call_count == 0

-        # The first heater should be turned on but is already on but because call_later is mocked, it is only turned on here
+        # The first heater should be turned on but is already on but because call_later
+        # is mocked, it is only turned on here
        assert mock_heater_on.call_count == 1
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_multiple_climates(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_send_event,
+):  # pylint: disable=unused-argument
+    """Test that when multiple climates are configured the activation and deactivation
+    is propagated to all climates"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOver4ClimateMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOver4ClimateMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_CLIMATE: "switch.mock_climate1",
+            CONF_CLIMATE_2: "switch.mock_climate2",
+            CONF_CLIMATE_3: "switch.mock_climate3",
+            CONF_CLIMATE_4: "switch.mock_climate4",
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+        },
+    )
+
+    entity: VersatileThermostat = await create_thermostat(
+        hass, entry, "climate.theover4climatemockname"
+    )
+    assert entity
+    assert entity.is_over_climate is True
+    assert entity.nb_underlying_entities == 4
+
+    # start heating, in boost mode. We block the control_heating to avoid running a cycle
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ), patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode:
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        await entity.async_set_preset_mode(PRESET_BOOST)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_BOOST
+        assert entity.target_temperature == 19
+        assert entity.window_state is None
+
+        event_timestamp = now - timedelta(minutes=4)
+        await send_temperature_change_event(entity, 15, event_timestamp)
+
+        # Should be call for all Switch
+        assert mock_underlying_set_hvac_mode.call_count == 4
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.HEAT),
+            ]
+        )
+        assert entity.is_device_active is False  # pylint: disable=protected-access
+
+    # Stop heating, in boost mode. We block the control_heating to avoid running a cycle
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ), patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode:
+        await entity.async_set_hvac_mode(HVACMode.OFF)
+
+        assert entity.hvac_mode is HVACMode.OFF
+        assert entity.preset_mode is PRESET_BOOST
+        assert entity.target_temperature == 19
+        assert entity.window_state is None
+
+        event_timestamp = now - timedelta(minutes=4)
+        await send_temperature_change_event(entity, 15, event_timestamp)
+
+        # Should be call for all Switch
+        assert mock_underlying_set_hvac_mode.call_count == 4
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.OFF),
+            ]
+        )
+        assert entity.is_device_active is False  # pylint: disable=protected-access
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_multiple_climates_underlying_changes(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_send_event,
+):  # pylint: disable=unused-argument
+    """Test that when multiple switch are configured the activation of one underlying
+    climate activate the others"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOver4ClimateMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOver4ClimateMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_CLIMATE: "switch.mock_climate1",
+            CONF_CLIMATE_2: "switch.mock_climate2",
+            CONF_CLIMATE_3: "switch.mock_climate3",
+            CONF_CLIMATE_4: "switch.mock_climate4",
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+        },
+    )
+
+    entity: VersatileThermostat = await create_thermostat(
+        hass, entry, "climate.theover4climatemockname"
+    )
+    assert entity
+    assert entity.is_over_climate is True
+    assert entity.nb_underlying_entities == 4
+
+    # start heating, in boost mode. We block the control_heating to avoid running a cycle
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ), patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode:
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        await entity.async_set_preset_mode(PRESET_BOOST)
+
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_BOOST
+        assert entity.target_temperature == 19
+        assert entity.window_state is None
+
+        event_timestamp = now - timedelta(minutes=4)
+        await send_temperature_change_event(entity, 15, event_timestamp)
+
+        # Should be call for all Switch
+        assert mock_underlying_set_hvac_mode.call_count == 4
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.HEAT),
+            ]
+        )
+        assert entity.is_device_active is False  # pylint: disable=protected-access
+
+    # Stop heating on one underlying climate
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ), patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode:
+        # Wait 11 sec so that the event will not be discarded
+        event_timestamp = now + timedelta(seconds=11)
+        await send_climate_change_event(
+            entity,
+            HVACMode.OFF,
+            HVACMode.HEAT,
+            HVACAction.OFF,
+            HVACAction.HEATING,
+            event_timestamp,
+        )
+
+        # Should be call for all Switch
+        assert mock_underlying_set_hvac_mode.call_count == 4
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.OFF),
+            ]
+        )
+        assert entity.hvac_mode == HVACMode.OFF
+        assert entity.is_device_active is False  # pylint: disable=protected-access
+
+    # Start heating on one underlying climate
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
+    ), patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
+    ) as mock_underlying_set_hvac_mode, patch(
+        # notice that there is no need of return_value=HVACAction.IDLE because this is not
+        # a function but a property
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.hvac_action",
+        HVACAction.IDLE,
+    ):
+        # Wait 11 sec so that the event will not be discarded
+        event_timestamp = now + timedelta(seconds=11)
+        await send_climate_change_event(
+            entity,
+            HVACMode.HEAT,
+            HVACMode.OFF,
+            HVACAction.IDLE,
+            HVACAction.OFF,
+            event_timestamp,
+        )
+
+        # Should be call for all Switch
+        assert mock_underlying_set_hvac_mode.call_count == 4
+        mock_underlying_set_hvac_mode.assert_has_calls(
+            [
+                call.set_hvac_mode(HVACMode.HEAT),
+            ]
+        )
+        assert entity.hvac_mode == HVACMode.HEAT
+        assert entity.hvac_action == HVACAction.IDLE
+        assert entity.is_device_active is False  # pylint: disable=protected-access
--- a/custom_components/versatile_thermostat/tests/test_open_window_algo.py
+++ b/custom_components/versatile_thermostat/tests/test_open_window_algo.py
@@ -2,7 +2,7 @@

 from datetime import datetime, timedelta
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
-from ..open_window_algorithm import WindowOpenDetectionAlgorithm
+from custom_components.versatile_thermostat.open_window_algorithm import WindowOpenDetectionAlgorithm


 async def test_open_window_algo(
--- a/custom_components/versatile_thermostat/tests/test_power.py
+++ b/custom_components/versatile_thermostat/tests/test_power.py
@@ -81,7 +81,7 @@ async def test_power_management_hvac_off(

    # Send power max mesurement too low but HVACMode is off
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -162,7 +162,7 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is

    # Send power max mesurement too low and HVACMode is on
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -196,7 +196,7 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is

    # Send power mesurement low to unseet power preset
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -282,7 +282,7 @@ async def test_power_management_energy_over_switch(

    # set temperature to 15 so that on_percent will be set
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -311,7 +311,7 @@ async def test_power_management_energy_over_switch(

    # change temperature to a higher value
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -333,7 +333,7 @@ async def test_power_management_energy_over_switch(

    # change temperature to a much higher value so that heater will be shut down
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
--- a/custom_components/versatile_thermostat/tests/test_security.py
+++ b/custom_components/versatile_thermostat/tests/test_security.py
@@ -87,7 +87,7 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):

    # 2. activate security feature when date is expired
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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:
@@ -134,7 +134,7 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):

    # 3. Change the preset to Boost (we should stay in SECURITY)
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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:
@@ -149,7 +149,7 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):

    # 5. resolve the datetime issue
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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:
@@ -189,3 +189,117 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):

        # Heater is now on
        assert mock_heater_on.call_count == 1
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_security_over_climate(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_turn_on_off_heater,
+    skip_send_event,
+):
+    """Test that when a underlying climate is not available the VTherm doesn't go into security mode"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data=PARTIAL_CLIMATE_CONFIG, # 5 minutes security delay
+    )
+
+    fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {}, HVACMode.HEAT)
+
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=fake_underlying_climate,
+    ) as mock_find_climate:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        entity = find_my_entity("climate.theoverclimatemockname")
+
+        assert entity
+
+        assert entity.name == "TheOverClimateMockName"
+        assert entity.is_over_climate is True
+
+        # Because the underlying is HEATING. In real life the underlying will be shut-off
+        assert entity.hvac_action is HVACAction.HEATING
+        assert entity.hvac_mode is HVACMode.OFF
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_modes == [
+            PRESET_NONE,
+            PRESET_ECO,
+            PRESET_COMFORT,
+            PRESET_BOOST,
+        ]
+        assert entity.preset_mode is PRESET_NONE
+        assert entity._security_state is False
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                # At startup
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+        assert mock_find_climate.call_count == 1
+        assert mock_find_climate.mock_calls[0] == call()
+        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
+
+        # Force security mode
+        assert entity._last_ext_temperature_mesure is not None
+        assert entity._last_temperature_mesure is not None
+        assert (entity._last_temperature_mesure.astimezone(tz) - now).total_seconds() < 1
+        assert (
+            entity._last_ext_temperature_mesure.astimezone(tz) - now
+        ).total_seconds() < 1
+
+        # Tries to turns on the Thermostat
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        assert entity.hvac_mode == HVACMode.HEAT
+
+        # One call more
+        assert mock_send_event.call_count == 3
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.HEAT},
+                ),
+            ]
+        )
+
+        # 2. activate security feature when date is expired
+        with patch(
+            "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+        ) as mock_send_event, patch(
+            "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
+        ) as mock_heater_on:
+            event_timestamp = now - timedelta(minutes=6)
+
+            await send_temperature_change_event(entity, 15, event_timestamp)
+            # Should stay False because a climate is never in security mode
+            assert entity.security_state is False
+            assert entity.preset_mode == 'none'
+            assert entity._saved_preset_mode == 'none'
--- a/custom_components/versatile_thermostat/tests/test_sensors.py
+++ b/custom_components/versatile_thermostat/tests/test_sensors.py
@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Test the normal start of a Thermostat """
 from datetime import timedelta, datetime

@@ -12,8 +14,8 @@ from homeassistant.const import UnitOfTime, UnitOfPower, UnitOfEnergy, PERCENTAG

 from pytest_homeassistant_custom_component.common import MockConfigEntry

-from ..climate import VersatileThermostat
-from ..sensor import (
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.sensor import (
    EnergySensor,
    MeanPowerSensor,
    OnPercentSensor,
@@ -66,7 +68,7 @@ async def test_sensors_over_switch(
        },
    )

-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
        hass, entry, "climate.theoverswitchmockname"
    )
    assert entity
@@ -229,7 +231,7 @@ async def test_sensors_over_climate(
            },
        )

-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
            hass, entry, "climate.theoverclimatemockname"
        )
        assert entity
@@ -361,7 +363,7 @@ async def test_sensors_over_climate_minimal(
            },
        )

-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
            hass, entry, "climate.theoverclimatemockname"
        )
        assert entity
--- a/custom_components/versatile_thermostat/tests/test_start.py
+++ b/custom_components/versatile_thermostat/tests/test_start.py
@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Test the normal start of a Thermostat """
 from unittest.mock import patch, call

@@ -10,7 +12,9 @@ from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DO

 from pytest_homeassistant_custom_component.common import MockConfigEntry

-from ..climate import VersatileThermostat
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.thermostat_climate import ThermostatOverClimate
+from custom_components.versatile_thermostat.thermostat_switch import ThermostatOverSwitch

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

@@ -28,7 +32,7 @@ async def test_over_switch_full_start(hass: HomeAssistant, skip_hass_states_is_s
    )

    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
    ) as mock_send_event:
        entry.add_to_hass(hass)
        await hass.config_entries.async_setup(entry.entry_id)
@@ -41,12 +45,13 @@ async def test_over_switch_full_start(hass: HomeAssistant, skip_hass_states_is_s
                if entity.entity_id == entity_id:
                    return entity

-        entity: VersatileThermostat = find_my_entity("climate.theoverswitchmockname")
+        entity: BaseThermostat = find_my_entity("climate.theoverswitchmockname")

        assert entity
+        assert isinstance(entity, ThermostatOverSwitch)

        assert entity.name == "TheOverSwitchMockName"
-        assert entity._is_over_climate is False
+        assert entity.is_over_climate is False
        assert entity.hvac_action is HVACAction.OFF
        assert entity.hvac_mode is HVACMode.OFF
        assert entity.target_temperature == entity.min_temp
@@ -93,7 +98,7 @@ async def test_over_climate_full_start(hass: HomeAssistant, skip_hass_states_is_
    fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {})

    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
    ) as mock_send_event, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
        return_value=fake_underlying_climate,
@@ -112,9 +117,10 @@ async def test_over_climate_full_start(hass: HomeAssistant, skip_hass_states_is_
        entity = find_my_entity("climate.theoverclimatemockname")

        assert entity
+        assert isinstance(entity, ThermostatOverClimate)

        assert entity.name == "TheOverClimateMockName"
-        assert entity._is_over_climate is True
+        assert entity.is_over_climate is True
        assert entity.hvac_action is HVACAction.OFF
        assert entity.hvac_mode is HVACMode.OFF
        assert entity.target_temperature == entity.min_temp
@@ -160,7 +166,7 @@ async def test_over_4switch_full_start(hass: HomeAssistant, skip_hass_states_is_
    )

    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
    ) as mock_send_event:
        entry.add_to_hass(hass)
        await hass.config_entries.async_setup(entry.entry_id)
@@ -173,12 +179,12 @@ async def test_over_4switch_full_start(hass: HomeAssistant, skip_hass_states_is_
                if entity.entity_id == entity_id:
                    return entity

-        entity: VersatileThermostat = find_my_entity("climate.theover4switchmockname")
+        entity: BaseThermostat = find_my_entity("climate.theover4switchmockname")

        assert entity

        assert entity.name == "TheOver4SwitchMockName"
-        assert entity._is_over_climate is False
+        assert entity.is_over_climate is False
        assert entity.hvac_action is HVACAction.OFF
        assert entity.hvac_mode is HVACMode.OFF
        assert entity.target_temperature == entity.min_temp
--- a/tests/test_switch_ac.py
+++ b/tests/test_switch_ac.py
@@ -0,0 +1,140 @@
+""" Test the normal start of a Switch AC Thermostat """
+from unittest.mock import patch, call
+from datetime import datetime, timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.components.climate import HVACAction, HVACMode
+from homeassistant.config_entries import ConfigEntryState
+
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
+
+from pytest_homeassistant_custom_component.common import MockConfigEntry
+
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.thermostat_switch import ThermostatOverSwitch
+
+from .commons 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_over_switch_ac_full_start(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="TheOverSwitchACMockName",
+        unique_id="uniqueId",
+        data=FULL_SWITCH_AC_CONFIG,
+    )
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        # The name is in the CONF and not the title of the entry
+        entity: BaseThermostat = find_my_entity("climate.theoverswitchmockname")
+
+        assert entity
+        assert isinstance(entity, ThermostatOverSwitch)
+
+        assert entity.name == "TheOverSwitchMockName"
+        assert entity.is_over_climate is False     # pylint: disable=protected-access
+        assert entity.ac_mode is True
+        assert entity.hvac_action is HVACAction.OFF
+        assert entity.hvac_mode is HVACMode.OFF
+        assert entity.hvac_modes == [HVACMode.COOL, HVACMode.OFF]
+        assert entity.target_temperature == entity.max_temp
+        assert entity.preset_modes == [
+            PRESET_NONE,
+            PRESET_ECO,
+            PRESET_COMFORT,
+            PRESET_BOOST,
+            PRESET_ACTIVITY,
+        ]
+        assert entity.preset_mode is PRESET_NONE
+        assert entity._security_state is False             # pylint: disable=protected-access
+        assert entity._window_state is None       # pylint: disable=protected-access
+        assert entity._motion_state is None       # pylint: disable=protected-access
+        assert entity._presence_state is None       # pylint: disable=protected-access
+        assert entity._prop_algorithm is not None       # pylint: disable=protected-access
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+        # Select a hvacmode, presence and preset
+        await entity.async_set_hvac_mode(HVACMode.COOL)
+        assert entity.hvac_mode is HVACMode.COOL
+
+        event_timestamp = now - timedelta(minutes=4)
+        await send_presence_change_event(entity, True, False, event_timestamp)
+        assert entity._presence_state == STATE_ON   # pylint: disable=protected-access
+
+        await entity.async_set_hvac_mode(HVACMode.COOL)
+        assert entity.hvac_mode is HVACMode.COOL
+
+        await entity.async_set_preset_mode(PRESET_COMFORT)
+        assert entity.preset_mode is PRESET_COMFORT
+        assert entity.target_temperature == 23
+
+        # switch to Eco
+        await entity.async_set_preset_mode(PRESET_ECO)
+        assert entity.preset_mode is PRESET_ECO
+        assert entity.target_temperature == 25
+
+        # Unset the presence
+        event_timestamp = now - timedelta(minutes=3)
+        await send_presence_change_event(entity, False, True, event_timestamp)
+        assert entity._presence_state == STATE_OFF   # pylint: disable=protected-access
+        assert entity.target_temperature == 27 # eco_ac_away
+
+        # Open a window
+        with patch(
+            "homeassistant.helpers.condition.state", return_value=True
+        ):
+            event_timestamp = now - timedelta(minutes=2)
+            try_condition = await send_window_change_event(entity, True, False, event_timestamp)
+
+            # Confirme the window event
+            await try_condition(None)
+
+            assert entity.hvac_mode is HVACMode.OFF
+            assert entity.hvac_action is HVACAction.OFF
+            assert entity.target_temperature == 27 # eco_ac_away
+
+        # Close a window
+        with patch(
+            "homeassistant.helpers.condition.state", return_value=True
+        ):
+            event_timestamp = now - timedelta(minutes=2)
+            try_condition = await send_window_change_event(entity, False, True, event_timestamp)
+
+            # Confirme the window event
+            await try_condition(None)
+
+            assert entity.hvac_mode is HVACMode.COOL
+            assert (entity.hvac_action is HVACAction.OFF or entity.hvac_action is HVACAction.IDLE)
+            assert entity.target_temperature == 27 # eco_ac_away
--- a/custom_components/versatile_thermostat/tests/test_tpi.py
+++ b/custom_components/versatile_thermostat/tests/test_tpi.py
@@ -5,7 +5,9 @@ from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-impor

@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
-async def test_tpi_calculation(hass: HomeAssistant, skip_hass_states_is_state):
+async def test_tpi_calculation(
+    hass: HomeAssistant, skip_hass_states_is_state: None
+):  # pylint: disable=unused-argument
    """Test the TPI calculation"""

    entry = MockConfigEntry(
@@ -40,7 +42,7 @@ async def test_tpi_calculation(hass: HomeAssistant, skip_hass_states_is_state):
    )
    assert entity

-    tpi_algo = entity._prop_algorithm
+    tpi_algo = entity._prop_algorithm   # pylint: disable=protected-access
    assert tpi_algo

    tpi_algo.calculate(15, 10, 7)
@@ -50,36 +52,52 @@ async def test_tpi_calculation(hass: HomeAssistant, skip_hass_states_is_state):
    assert tpi_algo.off_time_sec == 0
    assert entity.mean_cycle_power is None  # no device power configured

-    tpi_algo.calculate(15, 14, 5)
+    tpi_algo.calculate(15, 14, 5, False)
    assert tpi_algo.on_percent == 0.4
    assert tpi_algo.calculated_on_percent == 0.4
    assert tpi_algo.on_time_sec == 120
    assert tpi_algo.off_time_sec == 180

    tpi_algo.set_security(0.1)
-    tpi_algo.calculate(15, 14, 5)
+    tpi_algo.calculate(15, 14, 5, False)
    assert tpi_algo.on_percent == 0.1
    assert tpi_algo.calculated_on_percent == 0.4
    assert tpi_algo.on_time_sec == 30  # >= minimal_activation_delay (=30)
    assert tpi_algo.off_time_sec == 270

    tpi_algo.unset_security()
-    tpi_algo.calculate(15, 14, 5)
+    tpi_algo.calculate(15, 14, 5, False)
    assert tpi_algo.on_percent == 0.4
    assert tpi_algo.calculated_on_percent == 0.4
    assert tpi_algo.on_time_sec == 120
    assert tpi_algo.off_time_sec == 180

    # Test minimal activation delay
-    tpi_algo.calculate(15, 14.7, 15)
+    tpi_algo.calculate(15, 14.7, 15, False)
    assert tpi_algo.on_percent == 0.09
    assert tpi_algo.calculated_on_percent == 0.09
    assert tpi_algo.on_time_sec == 0
    assert tpi_algo.off_time_sec == 300

    tpi_algo.set_security(0.09)
-    tpi_algo.calculate(15, 14.7, 15)
+    tpi_algo.calculate(15, 14.7, 15, False)
    assert tpi_algo.on_percent == 0.09
    assert tpi_algo.calculated_on_percent == 0.09
    assert tpi_algo.on_time_sec == 0
    assert tpi_algo.off_time_sec == 300
+
+    tpi_algo.unset_security()
+    tpi_algo.calculate(25, 30, 35, True)
+    assert tpi_algo.on_percent == 1
+    assert tpi_algo.calculated_on_percent == 1
+    assert tpi_algo.on_time_sec == 300
+    assert tpi_algo.off_time_sec == 0
+    assert entity.mean_cycle_power is None  # no device power configured
+
+    tpi_algo.set_security(0.09)
+    tpi_algo.calculate(25, 30, 35, True)
+    assert tpi_algo.on_percent == 0.09
+    assert tpi_algo.calculated_on_percent == 1
+    assert tpi_algo.on_time_sec == 0
+    assert tpi_algo.off_time_sec == 300
+    assert entity.mean_cycle_power is None  # no device power configured
--- a/tests/test_valve.py
+++ b/tests/test_valve.py
@@ -0,0 +1,259 @@
+# pylint: disable=line-too-long
+
+""" Test the normal start of a Switch AC Thermostat """
+from unittest.mock import patch, call
+from datetime import datetime, timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.components.climate import HVACAction, HVACMode
+from homeassistant.config_entries import ConfigEntryState
+
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
+
+from pytest_homeassistant_custom_component.common import MockConfigEntry
+
+from custom_components.versatile_thermostat.thermostat_valve import ThermostatOverValve
+
+from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_over_valve_full_start(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_ECO + "_temp": 17,
+            PRESET_COMFORT + "_temp": 19,
+            PRESET_BOOST + "_temp": 21,
+            CONF_USE_WINDOW_FEATURE: True,
+            CONF_USE_MOTION_FEATURE: True,
+            CONF_USE_POWER_FEATURE: True,
+            CONF_USE_PRESENCE_FEATURE: True,
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.3,
+            CONF_TPI_COEF_EXT: 0.01,
+            CONF_MOTION_SENSOR: "input_boolean.motion_sensor",
+            CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
+            CONF_WINDOW_DELAY: 10,
+            CONF_MOTION_DELAY: 10,
+            CONF_MOTION_OFF_DELAY: 30,
+            CONF_MOTION_PRESET: PRESET_COMFORT,
+            CONF_NO_MOTION_PRESET: PRESET_ECO,
+            CONF_POWER_SENSOR: "sensor.power_sensor",
+            CONF_MAX_POWER_SENSOR: "sensor.power_max_sensor",
+            CONF_PRESENCE_SENSOR: "person.presence_sensor",
+            PRESET_ECO + PRESET_AWAY_SUFFIX + "_temp": 17.1,
+            PRESET_COMFORT + PRESET_AWAY_SUFFIX + "_temp": 17.2,
+            PRESET_BOOST + PRESET_AWAY_SUFFIX + "_temp": 17.3,
+            CONF_PRESET_POWER: 10,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_DEVICE_POWER: 100,
+            CONF_AC_MODE: False
+        },
+    )
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        # The name is in the CONF and not the title of the entry
+        entity: ThermostatOverValve = find_my_entity("climate.theovervalvemockname")
+
+        assert entity
+        assert isinstance(entity, ThermostatOverValve)
+
+        assert entity.name == "TheOverValveMockName"
+        assert entity.is_over_climate is False
+        assert entity.is_over_switch is False
+        assert entity.is_over_valve is True
+        assert entity.ac_mode is False
+        assert entity.hvac_mode is HVACMode.OFF
+        assert entity.hvac_action is HVACAction.OFF
+        assert entity.hvac_modes == [HVACMode.HEAT, HVACMode.OFF]
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_modes == [
+            PRESET_NONE,
+            PRESET_ECO,
+            PRESET_COMFORT,
+            PRESET_BOOST,
+            PRESET_ACTIVITY,
+        ]
+        assert entity.preset_mode is PRESET_NONE
+        assert entity._security_state is False             # pylint: disable=protected-access
+        assert entity._window_state is None       # pylint: disable=protected-access
+        assert entity._motion_state is None       # pylint: disable=protected-access
+        assert entity._presence_state is None       # pylint: disable=protected-access
+        assert entity._prop_algorithm is not None       # pylint: disable=protected-access
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+    # Set the HVACMode to HEAT, with manual preset and target_temp to 18 before receiving temperature
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event:
+        # 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},
+                ),
+            ]
+        )
+
+        # set manual target temp
+        await entity.async_set_temperature(temperature=18)
+        assert entity.preset_mode == PRESET_NONE # Manual mode
+        assert entity.target_temperature == 18
+        # Nothing have changed cause we don't have room and external temperature
+        assert mock_send_event.call_count == 1
+
+
+    # Set temperature and external temperature
+    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
+        event_timestamp = now - timedelta(minutes=10)
+        await send_temperature_change_event(entity, 15, datetime.now())
+        assert entity.valve_open_percent == 90
+        await send_ext_temperature_change_event(entity, 10, datetime.now())
+        # Should heating strongly now
+        assert entity.valve_open_percent == 98
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+        assert mock_service_call.call_count == 2
+        mock_service_call.assert_has_calls([
+            call.async_call('number', 'set_value', {'entity_id': 'number.mock_valve', 'value': 90}),
+            call.async_call('number', 'set_value', {'entity_id': 'number.mock_valve', 'value': 98})
+        ])
+
+        assert mock_send_event.call_count == 0
+
+        # Change to preset Comfort
+        await entity.async_set_preset_mode(preset_mode=PRESET_COMFORT)
+        assert entity.preset_mode == PRESET_COMFORT
+        assert entity.target_temperature == 17.2
+        assert entity.valve_open_percent == 73
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+        # Change presence to on
+        event_timestamp = now - timedelta(minutes=4)
+        await send_presence_change_event(entity, True, False, event_timestamp)
+        assert entity.presence_state == STATE_ON   # pylint: disable=protected-access
+        assert entity.preset_mode is PRESET_COMFORT
+        assert entity.target_temperature == 19
+        assert entity.valve_open_percent == 100 # Full heating
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+    # Change internal temperature
+    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=0
+    ):
+        event_timestamp = now - timedelta(minutes=3)
+        await send_temperature_change_event(entity, 20, datetime.now())
+        assert entity.valve_open_percent == 0
+        assert entity.is_device_active is False
+        assert entity.hvac_action == HVACAction.IDLE
+
+
+        await send_temperature_change_event(entity, 17, datetime.now())
+        # switch to Eco
+        await entity.async_set_preset_mode(PRESET_ECO)
+        assert entity.preset_mode is PRESET_ECO
+        assert entity.target_temperature == 17
+        assert entity.valve_open_percent == 7
+
+        # Unset the presence
+        event_timestamp = now - timedelta(minutes=2)
+        await send_presence_change_event(entity, False, True, event_timestamp)
+        assert entity.presence_state == STATE_OFF   # pylint: disable=protected-access
+        assert entity.valve_open_percent == 10
+        assert entity.target_temperature == 17.1 # eco_away
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+        # Open a window
+        with patch(
+            "homeassistant.helpers.condition.state", return_value=True
+        ):
+            event_timestamp = now - timedelta(minutes=1)
+            try_condition = await send_window_change_event(entity, True, False, event_timestamp)
+
+            # Confirme the window event
+            await try_condition(None)
+
+            assert entity.hvac_mode is HVACMode.OFF
+            assert entity.hvac_action is HVACAction.OFF
+            assert entity.target_temperature == 17.1 # eco
+            assert entity.valve_open_percent == 0
+
+        # Close a window
+        with patch(
+            "homeassistant.helpers.condition.state", return_value=True
+        ):
+            event_timestamp = now - timedelta(minutes=0)
+            try_condition = await send_window_change_event(entity, False, True, event_timestamp)
+
+            # Confirme the window event
+            await try_condition(None)
+
+            assert entity.hvac_mode is HVACMode.HEAT
+            assert (entity.hvac_action is HVACAction.OFF or entity.hvac_action is HVACAction.IDLE)
+            assert entity.target_temperature == 17.1 # eco
+            assert entity.valve_open_percent == 10
--- a/custom_components/versatile_thermostat/tests/test_window.py
+++ b/custom_components/versatile_thermostat/tests/test_window.py
@@ -66,7 +66,7 @@ async def test_window_management_time_not_enough(

    # Open the window, but condition of time is not satisfied and check the thermostat don't turns off
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -94,7 +94,7 @@ async def test_window_management_time_not_enough(
        await try_window_condition(None)
        assert entity.window_state == STATE_OFF

-    await entity.remove_thermostat()
+    entity.remove_thermostat()


@pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -154,7 +154,7 @@ async def test_window_management_time_enough(

    # change temperature to force turning on the heater
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -172,7 +172,7 @@ async def test_window_management_time_enough(

    # Open the window, condition of time is satisfied, check the thermostat and heater turns off
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -200,7 +200,7 @@ async def test_window_management_time_enough(

    # Close the window
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -234,7 +234,7 @@ async def test_window_management_time_enough(
        assert entity.preset_mode is PRESET_BOOST

    # Clean the entity
-    await entity.remove_thermostat()
+    entity.remove_thermostat()


@pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -296,7 +296,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):

    # Make the temperature down
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -318,7 +318,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):

    # send one degre down in one minute
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -353,7 +353,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):

    # send another 0.1 degre in one minute -> no change
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -378,7 +378,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):

    # send another plus 1.1 degre in one minute -> restore state
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -418,7 +418,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
        assert entity.hvac_mode is HVACMode.HEAT

    # Clean the entity
-    await entity.remove_thermostat()
+    entity.remove_thermostat()


@pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -480,7 +480,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st

    # Make the temperature down
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -501,7 +501,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st

    # send one degre down in one minute
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -539,7 +539,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st

        # Waits for automatic disable
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -561,7 +561,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
        assert entity.preset_mode is PRESET_BOOST

    # Clean the entity
-    await entity.remove_thermostat()
+    entity.remove_thermostat()


@pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -625,7 +625,7 @@ async def test_window_auto_no_on_percent(

    # Make the temperature down
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -647,7 +647,7 @@ async def test_window_auto_no_on_percent(

    # send one degre down in one minute
    with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "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(
@@ -670,4 +670,4 @@ async def test_window_auto_no_on_percent(
        assert entity.hvac_mode is HVACMode.HEAT

    # Clean the entity
-    await entity.remove_thermostat()
+    entity.remove_thermostat()
Author	SHA1	Message	Date
Jean-Marc Collin	a5f74ec201	Add _entity_component_unrecorded_attributes to exclude attributes from record	2023-10-28 18:04:51 +02:00
Jean-Marc Collin	17a0217678	Removes old docs	2023-10-28 11:30:49 +02:00
Jean-Marc Collin	1c5790d096	Feature 131 control trv valve (#139 ) * Add configFlow and translations * Refacto VersatileThermostat with BaseThermostat. Tests ok * Add ThermostatValve. All tests ok --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2023-10-28 11:30:14 +02:00
Jean-Marc Collin	bf4eee85d8	Add Homematic TRV into incompatible devices	2023-10-22 09:59:29 +02:00
Jean-Marc Collin	f1116b79cc	Merge branch 'main' of github.com:jmcollin78/versatile_thermostat into main	2023-10-22 00:17:32 +02:00
Jean-Marc Collin	f37e896fe4	Update beer list.	2023-10-21 22:13:25 +00:00
Jean-Marc Collin	e0f1c968a7	Release 3.6.0 (#134 ) * Replace tests at the right place. Add missing config files. Run tests * FIX merge from #108 have lost some changes * FIX entity_not found error * Change port * Add tests for over switch AC mode * Issue #133 - Force temperature after off to on transition of over climate * Build release 3.6.0 --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2023-10-21 23:51:50 +02:00
Andrea Nicotra	eb54f2826f	move AC mode config under the right configuration step (#108 ) * move AC mode config under the right configuration step	2023-10-21 08:31:45 +02:00
Jean-Marc Collin	043fd5f7aa	Feature 128 activity preset (#132 ) * Issue #128 - add motion_off_delay * Fix movement detection --------- Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2023-10-21 08:28:19 +02:00
Jean-Marc Collin	7e4e407732	Issue #125 - remove thermometers for over climate mode.	2023-10-18 11:34:19 +02:00
Jean-Marc Collin	81900ceeea	Issue #120 - presence sensor not updated	2023-10-15 19:04:46 +02:00
Jean-Marc Collin	66297c6044	FIX non catched error (see issue #120 )	2023-10-15 18:39:13 +02:00
Jean-Marc Collin	f384225b0f	Maj documentation + issue #115	2023-10-15 18:16:24 +02:00
Jean-Marc Collin	e6ecd100f6	Issue #119 - Set preset target temperature not updating in ac mode	2023-10-15 12:22:15 +02:00
Jean-Marc Collin	7ac49d7864	undo remove other packages. Test don't run into gitlab-ci environment	2023-10-15 10:43:59 +02:00
Jean-Marc Collin	40da04838d	Bug #121 loop in over climate * Issue #121 - loop when underlying is slow * Issue #121 - try fix * Release 3.5.3 * Fix tests step	2023-10-15 10:29:54 +02:00
Jean-Marc Collin	fcdd93b4ae	Issue # 114 - add unit test for multi-climate VTherm	2023-10-08 13:08:34 +02:00
Jean-Marc Collin	56fdbf4fba	FIX Issue #114 - Thermostat not reporting on / off properly (90 sec delay)	2023-10-08 11:05:04 +02:00
Jean-Marc Collin	ef994e300b	Documentation	2023-10-08 01:29:25 +02:00
Jean-Marc Collin	72c4105bbd	Issue #113 - Add multi thermostat over climate	2023-10-08 01:23:25 +02:00
Jean-Marc Collin	79eb4a0a0d	Enhance documentation.	2023-10-07 18:44:39 +02:00
Jean-Marc Collin	b032198c66	Issue #103 - expose preset temp pour AC mode	2023-10-07 18:16:20 +02:00
Jean-Marc Collin	487c118b44	Issue #101 - Use target temperature of underlying if changed	2023-10-07 17:54:50 +02:00
Jean-Marc Collin	e29ff0568b	Issue #82 - unavailable climate goes into security mode	2023-10-07 10:49:40 +02:00
Jean-Marc Collin	814e4d3b83	Last HA versions	2023-10-03 08:09:12 +02:00
felix schwenzel	abb6531f49	Update climate.py (#112 ) without these parenthesis the `action` and therefore returned `hvac_action` seems to be `True` instead of i.e. `heating` (did not see that when using an underlying homekit devices climate device, but when the underlying was a generic thermostat)	2023-10-03 08:06:52 +02:00
Jean-Marc Collin	f970c18eaf	Issue #100 : compatibility with HA 2023.9.0	2023-09-08 08:48:09 +02:00
Jean-Marc Collin	af51ef62e0	Issue #99 : over climate VTherm a regulated by the device itself and should not goes into security	2023-08-30 09:06:26 +02:00
Jean-Marc Collin	b38fbd9d78	Issue #99 - security mode toggling 100 times within 2 minutes	2023-08-27 18:06:43 +02:00
Jean-Marc Collin	6e8e72e343	FIX Service name Github error	2023-08-16 22:30:46 +02:00
Jean-Marc Collin	2bebe3e210	Issue #95 - the integration would switch ac on and off rapidly and lock up home assistant if outside temp is NaN	2023-08-05 20:02:54 +02:00
Jean-Marc Collin	aa3b87762d	FIX AC climate stops even if already stopped	2023-07-30 21:25:20 +02:00
Jean-Marc Collin	f4cabbf2c0	FIX unit tests	2023-07-30 18:09:42 +02:00
Jean-Marc Collin	24b59e545b	FIX cancel_timer await	2023-07-29 11:22:50 +02:00
Jean-Marc Collin	5997a26c73	FIX #90 WarCOzes remark	2023-07-23 09:08:56 +02:00
Jean-Marc Collin	fe4b9ced81	Documentation	2023-07-22 17:23:42 +02:00
Jean-Marc Collin	c4fc976007	Terminate Add AC mode and fix remove_thermostat sync	2023-07-22 17:05:54 +02:00
Jean-Marc Collin	31d862acab	With config_flow ok	2023-07-22 12:21:54 +02:00
Jean-Marc Collin	9709a9eed0	Add AC mode configFlow	2023-07-22 10:47:10 +02:00
Jean-Marc Collin	61eae8c066	FIX #89 _is_aux_heat error	2023-06-25 12:27:00 +02:00