FIX A thermostat stays with security_default_on_percent when the preset change during security mode #49

Set preset internal #45
Notify (send event messages) when something important happens #43
Enhancing Security mode #42
Rename None preset to Manual #3

.devcontainer/configuration.yaml

@@ -118,3 +118,23 @@ template:
         unique_id: maison_occupee
         state: "{{is_state('person.jmc', 'home') }}"
         device_class: occupancy
+
+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
+
+        turn_off:
+          service: select.select_option
+          data:
+            option: comfort-2
+          target:
+            entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode

README-fr.md

@@ -13,43 +13,53 @@
   - [HACS installation (recommendé)](#hacs-installation-recommendé)
   - [Installation manuelle](#installation-manuelle)
 - [Configuration](#configuration)
-  - [Configuration minimale](#configuration-minimale)
+  - [Choix des attributs de base](#choix-des-attributs-de-base)
+  - [Sélectionnez l'entité pilotée](#sélectionnez-lentité-pilotée)
   - [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)
   - [Configurer le mode d'activité ou la détection de mouvement](#configurer-le-mode-dactivité-ou-la-détection-de-mouvement)
-  - [Configurer la gestion de l'alimentation](#configurer-la-gestion-de-lalimentation)
+  - [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)
 - [Exemples de réglage](#exemples-de-réglage)
   - [Chauffage électrique](#chauffage-électrique)
   - [Chauffage central (chauffage gaz ou fuel)](#chauffage-central-chauffage-gaz-ou-fuel)
-  - [Le capteur de température sera alimenté par batterie](#le-capteur-de-température-sera-alimenté-par-batterie)
-  - [Capteur de température réactif](#capteur-de-température-réactif)
-  - [Ma configuration prédéfinie](#ma-configuration-prédéfinie)
+  - [Le capteur de température alimenté par batterie](#le-capteur-de-température-alimenté-par-batterie)
+  - [Capteur de température réactif (sur secteur)](#capteur-de-température-réactif-sur-secteur)
+  - [Mes presets](#mes-presets)
 - [Algorithme](#algorithme)
   - [Algorithme TPI](#algorithme-tpi)
 - [Services](#services)
   - [Forcer la présence/occupation](#forcer-la-présenceoccupation)
   - [Modifier la température des préréglages](#modifier-la-température-des-préréglages)
+  - [Modifier les paramètres de sécurité](#modifier-les-paramètres-de-sécurité)
+- [Notifications](#notifications)
 - [Attributs personnalisés](#attributs-personnalisés)
 - [Quelques résultats](#quelques-résultats)
 - [Encore mieux](#encore-mieux)
   - [Encore mieux avec le composant Scheduler !](#encore-mieux-avec-le-composant-scheduler-)
   - [Encore bien mieux avec la custom:simple-thermostat front integration](#encore-bien-mieux-avec-la-customsimple-thermostat-front-integration)
   - [Toujours mieux avec Apex-chart pour régler votre thermostat](#toujours-mieux-avec-apex-chart-pour-régler-votre-thermostat)
+  - [Et toujours de mieux en mieux avec l'AappDaemon NOTIFIER pour notifier les évènements](#et-toujours-de-mieux-en-mieux-avec-laappdaemon-notifier-pour-notifier-les-évènements)
 - [Les contributions sont les bienvenues !](#les-contributions-sont-les-bienvenues)
 
-
 _Composant développé à l'aide de l'incroyable modèle de développement [[blueprint](https://github.com/custom-components/integration_blueprint)]._
 
 Ce composant personnalisé pour Home Assistant est une mise à niveau et est une réécriture complète du composant "Awesome thermostat" (voir [Github](https://github.com/dadge/awesome_thermostat)) avec l'ajout de fonctionnalités.
 
 # Quand l'utiliser et ne pas l'utiliser
-Ce thermostat a pour but de commander un radiateur qui ne fonctionne qu'en mode marche/arrêt. La configuration minimale nécessaire pour utiliser ce thermostat est :
-1. un équipement comme un radiateur (un interrupteur),
-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)
+Ce thermostat peut piloter 2 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)
+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)
+
+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.
 
 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.
 
@@ -65,7 +75,7 @@ Ce composant nommé __Versatile thermostat__ gère les cas d'utilisation suivant
 - Utiliser un algorithme **TPI (Time Proportional Interval)** grâce à l'algorithme [[Argonaute](https://forum.hacf.fr/u/argonaute/summary)] ,
 - Ajoutez une **gestion de délestage** ou une régulation pour ne pas dépasser une puissance totale définie. Lorsque la puissance maximale est dépassée, un préréglage caché de « puissance » est défini sur l'entité climatique. Lorsque la puissance passe en dessous du maximum, le préréglage précédent est restauré.
 - Ajouter la **gestion de la présence à domicile**. Cette fonctionnalité vous permet de modifier dynamiquement la température du préréglage en tenant compte d'un capteur de présence de votre maison.
-- Ajoutez des **services pour interagir avec le thermostat** à partir d'autres intégrations : vous pouvez forcer la présence / la non-présence à l'aide d'un service, et vous pouvez modifier dynamiquement la température des préréglages.
+- Ajoutez des **services pour interagir avec le thermostat** à partir d'autres intégrations : vous pouvez forcer la présence / la non-présence à l'aide d'un service, et vous pouvez modifier dynamiquement la température des préréglages et changer les paramètres de sécurité.
 
 # Comment installer cet incroyable Thermostat Versatile ?
 
@@ -100,28 +110,44 @@ La configuration peut être modifiée via la même interface. Sélectionnez simp
 
 Suivez ensuite les étapes de configuration comme suit :
 
-## Configuration minimale
+## Choix des attributs de base
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-main.png?raw=true)
 
 Donnez les principaux attributs obligatoires :
 1. un nom (sera le nom de l'intégration et aussi le nom de l'entité climate)
-2. un identifiant d'entité d'équipement qui représente l'élément chauffant. Cet équipement doit pouvoir s'allumer ou s'éteindre,
-3. un identifiant d'entité de capteur de température qui donne la température de la pièce dans laquelle le radiateur est installé,
-4. 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
-5. 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. Algorithme à utiliser. Aujourd'hui, seul l'algorithme TPI est disponible. Voir [algorithme](#algorithme)
+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)
+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),
+7. les températures minimales et maximales du thermostat,
+8. 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. 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**,
+      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
 
+## Sélectionnez l'entité pilotée
+En fonction de votre choix sur le type de thermostat, vous devrez choisir une entité de type switch ou une entité de type climate. Seules les entités compatibles sont présentées.
+
+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)
+
+Pour un thermostat de type ```thermostat_over_climate```:
+![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity2.png?raw=true)
+
 ## Configurez les coefficients de l'algorithme TPI
 
-Cliquez sur 'Valider' sur la page précédente et vous y arriverez :
+Si vous avez choisi un thermostat de type ```thermostat_over_switch``` vous arriverez sur cette page :
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-tpi.png?raw=true)
 
+Vous devez donner :
+1. le coefficient coef_int de l'algorithme TPI,
+2. le coefficient coef_ext de l'algorithme TPI
+
+
 Pour plus d'informations sur l'algorithme TPI et son réglage, veuillez vous référer à [algorithm](#algorithm).
 
 ## Configurer la température préréglée
@@ -144,7 +170,7 @@ Le mode préréglé (preset) vous permet de préconfigurer la température cibl
     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
-Cliquez sur 'Valider' sur la page précédente et vous y arriverez :
+Si vous avez choisi la fonctionnalité ```Avec détection des ouvertures```, cliquez sur 'Valider' sur la page précédente et vous y arriverez :
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-window.png?raw=true)
 
@@ -159,7 +185,7 @@ Et c'est tout ! votre thermostat s'éteindra lorsque les fenêtres seront ouvert
     2. Si vous n'avez pas de capteur de fenêtre/porte dans votre chambre, laissez simplement l'identifiant de l'entité du capteur vide
 
 ## Configurer le mode d'activité ou la détection de mouvement
-Cliquez sur 'Valider' sur la page précédente et vous y arriverez :
+Si vous avez choisi la fonctionnalité ```Avec détection de mouvement```, cliquez sur 'Valider' sur la page précédente et vous y arriverez :
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-motion.png?raw=true)
 
@@ -181,9 +207,9 @@ Pour que cela fonctionne, le thermostat climatique doit être en mode prérégl
 > ![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
 
-## Configurer la gestion de l'alimentation
+## Configurer la gestion de la puissance
 
-Cliquez sur 'Valider' sur la page précédente et vous arriverez ici :
+Si vous avez choisi la fonctionnalité ```Avec détection de la puissance```, cliquez sur 'Valider' sur la page précédente et vous arriverez ici :
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-power.png?raw=true)
 
@@ -193,13 +219,13 @@ 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.
+    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
-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).
+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).
 Pour configurer la présence remplissez ce formulaire :
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-presence.png?raw=true)
@@ -220,16 +246,23 @@ Le formulaire de configuration avancée est le suivant :
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-advanced.png?raw=true)
 
-Le premier délai (minimal_activation_delay_sec) en sec dans le délai minimum acceptable pour allumer le chauffage. Lorsque le calcul donne un délai de mise sous tension inférieur à cette valeur, le chauffage reste éteint.
+Le premier délai (minimal_activation_delay_sec) en secondes est le délai minimum acceptable pour allumer le chauffage. Lorsque le calcul donne un délai de mise sous tension inférieur à cette valeur, le chauffage reste éteint.
 
-Le deuxième délai (security_delay_min) est le délai maximal entre deux mesures de température avant de régler le préréglage sur ``security`` et d'éteindre le thermostat. Si le capteur de température ne donne plus de mesures de température, le thermostat et le radiateur s'éteindront après ce délai et le préréglage du thermostat sera réglé sur ``security``. Ceci est utile pour éviter une surchauffe si la batterie de votre capteur de température est trop faible.
+Le deuxième délai (``security_delay_min``) est le délai maximal entre deux mesures de température avant de régler le préréglage sur ``security``. Si le capteur de température ne donne plus de mesures de température, le thermostat et le radiateur passeront en mode ``security`` après ce délai. Ceci est utile pour éviter une surchauffe si la batterie de votre capteur de température est trop faible.
+
+Le troisième paramétre (``security_min_on_percent``) est la valeur minimal de ``on_percent`` en dessous de laquelle le préréglage sécurité ne sera pas activé. Ce paramètre permet de ne pas mettre en sécurité un thermostat, si le radiateur piloté ne chauffe pas suffisament.
+Mettre ce paramètre à ``0.00`` déclenchera le préréglage sécurité quelque soit la dernière consigne de chauffage, à l'inverse ``1.00`` ne déclenchera jamais le préréglage sécurité ( ce qui revient à désactiver la fonction).
+
+Le quatrième param§tre (``security_default_on_percent``) est la valeur de ``on_percent`` qui sera utilisée lorsque le thermostat passe en mode ``security``. Si vous mettez ``0`` alors le thermostat sera coupé lorsqu'il passe en mode ``security``, mettre 0,2% par exemple permet de garder un peu de chauffage (20% dans ce cas), même en mode ``security``. Ca évite de retrouver son logement totalement gelé lors d'une panne de thermomètre.
 
 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. Le préréglage ``security`` est un préréglage caché. Vous ne pouvez pas le sélectionner manuellement ou par le service prédéfini,
-    2. Lorsque le capteur de température viendra à vivre 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".
+    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.
 
 # Exemples de réglage
 
@@ -241,22 +274,36 @@ Voir [exemple de réglages](#examples-tuning) pour avoir des exemples de réglag
 - cycle : entre 30 et 60 min,
 - minimal_activation_delay_sec : 300 secondes (à cause du temps de réponse)
 
-## Le capteur de température sera alimenté par batterie
+## Le capteur de température alimenté par batterie
 - security_delay_min : 60 min (parce que ces capteurs sont paresseux)
+- security_min_on_percent : 0,5 (50% - on passe en preset ``security`` si le radiateur chauffait plus de 50% du temps)
+- security_default_on_percent : 0,1 (10% - en preset ``security``, on garde un fond de chauffe de 20% du temps)
 
-## Capteur de température réactif
+Il faut comprendre ces réglages comme suit :
+
+> Si le thermomètre n'envoie plus la température pendant 1 heure et que le pourcentage de chauffe (``on_percent``) était supérieur à 50 %, alors on ramène ce pourcentage de chauffe à 10 %.
+
+A vous d'adapter ces réglages à votre cas !
+
+Ce qui est important c'est de ne pas prendre trop de risque avec ces paramètres : supposez que vous êtes absent pour une longue période, que les piles de votre thermomètre arrivent en fin de vie, votre radiateur va chauffer 10% du temps pendant toute la durée de la panne.
+
+Versatile Thermostat vous permet d'être notifié lorsqu'un évènement de ce type survient. Mettez en place, les alertes qui vont bien dès l'utilisation de ce thermostat. Cf. (#notifications)
+
+## Capteur de température réactif (sur secteur)
 - security_delay_min : 15 min
+- security_min_on_percent : 0,7 (70% - on passe en preset ``security`` si le radiateur chauffait plus de 70% du temps)
+- security_default_on_percent : 0,25 (25% - en preset ``security``, on garde un fond de chauffe de 25% du temps)
 
-## Ma configuration prédéfinie
+## Mes presets
 Ceci est juste un exemple de la façon dont j'utilise le préréglage. A vous de vous adapter à votre configuration mais cela peut être utile pour comprendre son fonctionnement.
-``Éco`` : 17
-``Confort`` : 19
-``Boost`` : 20
+``Éco`` : 17 °C
+``Confort`` : 19 °C
+``Boost`` : 20 °C
 
 Lorsque la présence est désactivée :
-``Éco`` : 16,5
-``Confort`` : 17
-``Boost`` : 18
+``Éco`` : 16,5 °C
+``Confort`` : 17 °C
+``Boost`` : 18 °C
 
 Le détecteur de mouvement de mon bureau est configuré pour utiliser ``Boost`` lorsqu'un mouvement est détecté et ``Eco`` sinon.
 
@@ -309,7 +356,7 @@ Utilisez le code suivant pour régler la température du préréglage :
 ```
 service : thermostat_polyvalent.set_preset_temperature
 date:
-    prest : boost
+    preset : boost
     temperature : 17,8
     temperature_away : 15
 target:
@@ -319,6 +366,40 @@ target:
 > ![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.
 
+## Modifier les paramètres de sécurité
+Ce service permet de modifier dynamiquement les paramètres de sécurité décrits ici [Configuration avancée](#configuration-avancée).
+Si le thermostat est en mode ``security`` les nouveaux paramètres sont appliqués immédiatement.
+
+Pour changer les paramètres de sécurité utilisez le code suivant :
+```
+service : thermostat_polyvalent.set_security
+date:
+    min_on_percent: "0.5"
+    default_on_percent: "0.1"
+    delay_min: 60
+target:
+    entity_id : climate.my_thermostat
+```
+
+# 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: 
+
+- ``versatile_thermostat_security_event`` : un thermostat entre ou sort du preset ``security``
+- ``versatile_thermostat_power_event`` : un thermostat entre ou sort du preset ``power``
+- ``versatile_thermostat_temperature_event`` : une ou les deux mesures de température d'un thermostat n'ont pas été mis à jour depuis plus de `security_delay_min`` minutes
+- ``versatile_thermostat_hvac_mode_event`` : le thermostat est allumé ou éteint. Cet évènement est aussi diffusé au démarrage du thermostat
+- ``versatile_thermostat_preset_event`` : un nouveau preset est sélectionné sur le thermostat. Cet évènement est aussi diffusé au démarrage du thermostat
+
+Si vous avez bien suivi, lorsqu'un thermostat passe en mode sécurité, 3 évènements sont déclenchés :
+1. ``versatile_thermostat_temperature_event`` pour indiquer qu'un thermomètre ne répond plus,
+2. ``versatile_thermostat_preset_event`` pour indiquer le passage en preset ```security```,
+3. ``versatile_thermostat_hvac_mode_event`` pour indiquer l'extinction éventuelle du thermostat
+
+Chaque évènement porte les valeurs clés de l'évènement (températures, preset courant, puissance courante, ...) ainsi que les états du thermostat.
+
+Vous pouvez très facilement capter ses évènements dans une automatisation par exemple pour notifier les utilisateurs.
+
 # Attributs personnalisés
 
 Pour régler l'algorithme, vous avez accès à tout le contexte vu et calculé par le thermostat via des attributs dédiés. Vous pouvez voir (et utiliser) ces attributs dans l'IHM "Outils de développement / états" de HA. Entrez votre thermostat et vous verrez quelque chose comme ceci :
@@ -352,10 +433,12 @@ Les attributs personnalisés sont les suivants :
 | ``motion_state`` | Le dernier état connu du capteur de mouvement. Aucun si le mouvement n'est pas configuré |
 | ``overpowering_state`` | Le dernier état connu du capteur surpuissant. Aucun si la gestion de l'alimentation n'est pas configurée |
 | ``presence_state`` | Le dernier état connu du capteur de présence. Aucun si la gestion de présence n'est pas configurée |
-| ``delay_security_min`` | Le délai avant de régler le mode de sécurité lorsque le capteur de température est éteint |
+| ``security_delay_min`` | Le délai avant de régler le mode de sécurité lorsque le capteur de température est éteint |
+| ``security_min_on_percent`` | Pourcentage de chauffe en dessous duquel le thermostat ne passera pas en sécurité |
+| ``security_default_on_percent`` | Pourcentage de chauffe utilisé lorsque le thermostat est en sécurité |
 | ``last_temperature_datetime`` | La date et l'heure au format ISO8866 de la dernière réception de température interne |
 | ``last_ext_temperature_datetime`` | La date et l'heure au format ISO8866 de la dernière réception de température extérieure |
-| ``**état_sécurité**`` | L'état de sécurité. vrai ou faux |
+| ``security_state`` | L'état de sécurité. vrai ou faux |
 | ``minimal_activation_delay_sec`` | Le délai d'activation minimal en secondes |
 | ``last_update_datetime`` | La date et l'heure au format ISO8866 de cet état |
 | ``friendly_name`` | Le nom du thermostat |
@@ -480,6 +563,94 @@ series:
     yaxis_id: right
 ```
 
+## Et toujours de mieux en mieux avec l'AappDaemon NOTIFIER pour notifier les évènements
+Cette automatisation utilise l'excellente App Daemon nommée NOTIFIER développée par Horizon Domotique que vous trouverez en démonstration [ici](https://www.youtube.com/watch?v=chJylIK0ASo&ab_channel=HorizonDomotique) et le code est [ici](https://github.com/jlpouffier/home-assistant-config/blob/master/appdaemon/apps/notifier.py). Elle permet de notifier les utilisateurs du logement lorsqu'un des évènements touchant à la sécurité survient sur un des Versatile Thermostats.
+
+C'est un excellent exemple de l'utilisation des notifications décrites ici [notification](#notifications).
+
+```
+alias: Surveillance Mode Sécurité chauffage
+description: Envoi une notification si un thermostat passe en mode sécurité ou power
+trigger:
+  - platform: event
+    event_type: versatile_thermostat_security_event
+    id: versatile_thermostat_security_event
+  - platform: event
+    event_type: versatile_thermostat_power_event
+    id: versatile_thermostat_power_event
+  - platform: event
+    event_type: versatile_thermostat_temperature_event
+    id: versatile_thermostat_temperature_event
+condition: []
+action:
+  - choose:
+      - conditions:
+          - condition: trigger
+            id: versatile_thermostat_security_event
+        sequence:
+          - event: NOTIFIER
+            event_data:
+              action: send_to_jmc
+              title: >-
+                Radiateur {{ trigger.event.data.name }} - {{
+                trigger.event.data.type }} Sécurité
+              message: >-
+                Le radiateur {{ trigger.event.data.name }} est passé en {{
+                trigger.event.data.type }} sécurité car le thermomètre ne répond
+                plus.\n{{ trigger.event.data }}
+              callback:
+                - title: Stopper chauffage
+                  event: stopper_chauffage
+              image_url: /media/local/alerte-securite.jpg
+              click_url: /lovelace-chauffage/4
+              icon: mdi:radiator-off
+              tag: radiateur_security_alerte
+              persistent: true
+      - conditions:
+          - condition: trigger
+            id: versatile_thermostat_power_event
+        sequence:
+          - event: NOTIFIER
+            event_data:
+              action: send_to_jmc
+              title: >-
+                Radiateur {{ trigger.event.data.name }} - {{
+                trigger.event.data.type }} Délestage
+              message: >-
+                Le radiateur {{ trigger.event.data.name }} est passé en {{
+                trigger.event.data.type }} délestage car la puissance max est
+                dépassée.\n{{ trigger.event.data }}
+              callback:
+                - title: Stopper chauffage
+                  event: stopper_chauffage
+              image_url: /media/local/alerte-delestage.jpg
+              click_url: /lovelace-chauffage/4
+              icon: mdi:radiator-off
+              tag: radiateur_power_alerte
+              persistent: true
+      - conditions:
+          - condition: trigger
+            id: versatile_thermostat_temperature_event
+        sequence:
+          - event: NOTIFIER
+            event_data:
+              action: send_to_jmc
+              title: >-
+                Le thermomètre du radiateur {{ trigger.event.data.name }} ne
+                répond plus
+              message: >-
+                Le thermomètre du radiateur {{ trigger.event.data.name }} ne
+                répond plus depuis longtemps.\n{{ trigger.event.data }}
+              image_url: /media/local/thermometre-alerte.jpg
+              click_url: /lovelace-chauffage/4
+              icon: mdi:radiator-disabled
+              tag: radiateur_thermometre_alerte
+              persistent: true
+mode: queued
+max: 30
+```
+
+
 # Les contributions sont les bienvenues !
 
 Si vous souhaitez contribuer, veuillez lire les [directives de contribution](CONTRIBUTING.md)

README.md

@@ -14,6 +14,7 @@
   - [Manual installation](#manual-installation)
 - [Configuration](#configuration)
   - [Minimal configuration update](#minimal-configuration-update)
+  - [Select the driven entity](#select-the-driven-entity)
   - [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)
@@ -25,33 +26,40 @@
   - [Electrical heater](#electrical-heater)
   - [Central heating (gaz or fuel heating system)](#central-heating-gaz-or-fuel-heating-system)
   - [Temperature sensor will battery](#temperature-sensor-will-battery)
-  - [Reponsive temperature sensor](#reponsive-temperature-sensor)
+  - [Reactive temperature sensor (on mains)](#reactive-temperature-sensor-on-mains)
   - [My preset configuration](#my-preset-configuration)
 - [Algorithm](#algorithm)
   - [TPI algorithm](#tpi-algorithm)
 - [Services](#services)
   - [Force the presence / occupancy](#force-the-presence--occupancy)
   - [Change the temperature of presets](#change-the-temperature-of-presets)
+  - [Change security settings](#change-security-settings)
+- [Notifications](#notifications)
 - [Custom attributes](#custom-attributes)
 - [Some results](#some-results)
 - [Even better](#even-better)
   - [Even Better with Scheduler Component !](#even-better-with-scheduler-component-)
   - [Even-even better with custom:simple-thermostat front integration](#even-even-better-with-customsimple-thermostat-front-integration)
   - [Even better with Apex-chart to tune your Thermostat](#even-better-with-apex-chart-to-tune-your-thermostat)
+  - [And always better and better with the NOTIFIER daemon app to notify events](#and-always-better-and-better-with-the-notifier-daemon-app-to-notify-events)
 - [Contributions are welcome!](#contributions-are-welcome)
 
-
 _Component developed by using the amazing development template [[blueprint](https://github.com/custom-components/integration_blueprint)]._
 
 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.
 
 # When to use / not use
-This thermostat aims to command a heater which works only in on/off mode. The minimal needed configuration to use this thermostat is:
-1. an equipement like a heater (a switch),
-2. a temperature sensor for the room (or an input_number),
-3. an external temperature sensor (think of the meteo integration if you don't have one)
+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)
 
-Because this integration aims to command the heater considering the preset configured and the room temperature, those informations are mandatory.
+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.
 
 # Why another thermostat implementation ?
 
@@ -65,7 +73,7 @@ This component named __Versatile thermostat__ manage the following use cases :
 - Use a **TPI (Time Proportional Interval) algorithm** thank's to [[Argonaute](https://forum.hacf.fr/u/argonaute/summary)] algorithm ,
 - Add **power shedding management** or regulation to avoid exceeding a defined total power. When max power is exceeded, a hidden 'power' preset is set on the climate entity. When power goes below the max, the previous preset is restored.
 - Add **home presence management**. This feature allows you to dynamically change the temperature of preset considering a occupancy sensor of your home.
-- Add **services to interact with the thermostat** from others integration: you can force the presence / un-presence using a service, and you can dynamically change the temperature of the presets.
+- Add **services to interact with the thermostat** from others integration: you can force the presence / un-presence using a service, and you can dynamically change the temperature of the presets and change dynamically the security parameters.
 
 # How to install this incredible Versatile Thermostat ?
 
@@ -103,17 +111,28 @@ Then follow the configurations steps as follow:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-main.png?raw=true)
 
 Give the main mandatory attributes:
-1. a name (will be the integration name and also the climate entity name)
-2. an equipment entity id which represent the heater. This equipment should be able to switch on or off,
-3. a temporature sensor entity id which gives the temperature of the room in which the heater is installed,
-4. a temperature sensor entity giving the external temperature. If don't have any external sensor, you can use the local meteo integration
-5. a cycle duration in minutes. At each cycle, the heater will be turned on then off for a calculated period in order to reach the targeted temperature (see [preset](#configure-the-preset-temperature) below),
-6. Algorithm to use. Today only the TPI algorithm is available. See [algorithm](#algorithm)
+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)
+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),
+7. minimum and maximum thermostat temperatures,
+8. 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. 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**,
+      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
 
+## 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.
+
+For a ```thermostat_over_switch``` 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)
+
+For a ```thermostat_over_climate``` thermostat:
+![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-linked-entity2.png?raw=true)
+
 ## Configure the TPI algorithm coefficients
 Click on 'Validate' on the previous page and you will get there:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-tpi.png?raw=true)
@@ -139,7 +158,7 @@ The preset mode allows you to pre-configurate targeted temperature. Used in conj
     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
-Click on 'Validate' on the previous page and you will get there:
+If you choose the ```Window management``` feature, click on 'Validate' on the previous page and you will get there:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-window.png?raw=true)
 
 Give the following attributes:
@@ -153,7 +172,7 @@ And that's it ! your thermostat will turn off when the windows is open and be tu
     2. If you don't have any window/door sensor in your room, just leave the sensor entity id empty
 
 ## Configure the activity mode or motion detection
-Click on 'Validate' on the previous page and you will get there:
+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)
 
 We will now see how to configure the new Activity mode.
@@ -176,7 +195,7 @@ For this to work, the climate thermostat should be in ``Activity`` preset mode.
 
 ## Configure the power management
 
-Click on 'Validate' on the previous page and you will get there:
+If you choose the ```Power management``` feature, click on 'Validate' on the previous page and you will get there:
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-power.png?raw=true)
 
 This feature allows you to regulate the power consumption of your radiators. Known as shedding, this feature allows you to limit the electrical power consumption of your heater if overpowering conditions are detected. Give a **sensor to the current power consumption of your house**, a **sensor to the max power** that should not be exceeded, the **power consumption of your heater** and the algorithm will not start a radiator if the max power will be exceeded after radiator starts.
@@ -192,7 +211,7 @@ This allows you to change the max power along time using a Scheduler or whatever
     4. If you don't want to use this feature, just leave the entities id empty
 
 ## Configure the presence or occupancy
-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).
+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).
 To configure presence fills this form:
 
 ![image](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/config-presence.png?raw=true)
@@ -217,13 +236,20 @@ The first delay (minimal_activation_delay_sec) in sec in the minimum delay accep
 
 The second delay (security_delay_min) is the maximal delay between two temperature measure before setting the preset to ``security`` and turning off the thermostat. If the temperature sensor is no more giving temperature measures, the thermostat and heater will turns off after this delay and the preset of the thermostat will be set to ``security``. This is useful to avoid overheating is the battery of your temperature sensor is too low.
 
-See [exemple tuning](#examples-tuning) to have some commons tuning examples
+The third parameter (``security_min_on_percent``) is the minimum value of ``on_percent`` below which the security preset will not be activated. This parameter makes it possible not to put a thermostat in safety, if the controlled radiator does not heat sufficiently.
+Setting this parameter to ``0.00`` will trigger the security preset regardless of the last heating setpoint, conversely ``1.00`` will never trigger the security preset (which amounts to disabling the function).
+
+The fourth parameter (``security_default_on_percent``) is the ``on_percent`` value that will be used when the thermostat enters ``security`` mode. If you put ``0`` then the thermostat will be cut off when it goes into ``security`` mode, putting 0.2% for example allows you to keep a little heating (20% in this case), even in mode ``security``. It avoids finding your home totally frozen during a thermometer failure.
+
+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.
 
-> ![Tip](https://github.com/jmcollin78/versatile_thermostat/blob/main/images/tips.png?raw=true)  _*Notes*_
-    1. The ``security`` preset is a hidden preset. You cannot select it manually or by the preset service,
-    2. When the temperature sensor will comes to live and re-send temperatures, the preset will be restored to its previous value,
-    3. Beware that two temperatures are needed: internal temp and external temp and each should give temperature else the thermostat will be in ``security`` preset.
-    
 # Examples tuning
 
 ## Electrical heater
@@ -235,21 +261,35 @@ See [exemple tuning](#examples-tuning) to have some commons tuning examples
 - minimal_activation_delay_sec: 300 seconds (because of the response time)
 
 ## Temperature sensor will battery
-- security_delay_min: 60 min (because those sensors are leazy)
+- security_delay_min: 60 min (because these sensors are lazy)
+- security_min_on_percent: 0.5 (50% - we go to the ``security`` preset if the radiator was heating more than 50% of the time)
+- security_default_on_percent: 0.1 (10% - in preset ``security``, we keep a heating background 20% of the time)
 
-## Reponsive temperature sensor 
-- security_delay_min: 15 min
+These settings should be understood as follows:
+
+> If the thermometer no longer sends the temperature for 1 hour and the heating percentage (``on_percent``) was greater than 50%, then this heating percentage is reduced to 10%.
+
+It's up to you to adapt these settings to your case!
+
+What is important is not to take too many risks with these parameters: suppose you are away for a long period, that the batteries of your thermometer reach the end of their life, your radiator will heat up 10% of the time for the whole the duration of the outage.
+
+Versatile Thermostat allows you to be notified when an event of this type occurs. Set up the alerts that go well as soon as you use this thermostat. See (#notifications)
+
+## Reactive temperature sensor (on mains)
+- security_delay_min: 15min
+- security_min_on_percent: 0.7 (70% - we go to the ``security`` preset if the radiator was heating more than 70% of the time)
+- security_default_on_percent: 0.25 (25% - in preset ``security``, we keep a heating background 25% of the time)
 
 ## My preset configuration
 This is just an example of how I use the preset. It up to you to adapt to your configuration but it can be useful to understand how it works.
-``Eco``: 17
-``Comfort``: 19
-``Boost``: 20
+``Eco``: 17 °C
+``Comfort``: 19 °C
+``Boost``: 20 °C
 
 When presence if off:
-``Eco``: 16.5
-``Comfort``: 17
-``Boost``: 18
+``Eco``: 16.5 °C
+``Comfort``: 17 °C
+``Boost``: 18 °C
 
 Motion detector in my office is set to use ``Boost`` when motion is detected and ``Eco`` if not.
 
@@ -312,6 +352,40 @@ target:
 > ![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.
 
+## Change security settings
+This service is used to dynamically modify the security parameters described here [Advanced configuration](#configuration-avanced).
+If the thermostat is in ``security`` mode the new settings are applied immediately.
+
+To change the security settings use the following code:
+```
+service : thermostat_polyvalent.set_security
+date:
+    min_on_percent: "0.5"
+    default_on_percent: "0.1"
+    delay_min: 60
+target:
+    entity_id : climate.my_thermostat
+```
+
+# Notifications
+Significant thermostat events are notified via the message bus.
+The notified events are as follows:
+
+- ``versatile_thermostat_security_event``: a thermostat enters or exits the ``security`` preset
+- ``versatile_thermostat_power_event``: a thermostat enters or exits the ``power`` preset
+- ``versatile_thermostat_temperature_event``: one or both temperature measurements of a thermostat have not been updated for more than ``security_delay_min`` minutes
+- ``versatile_thermostat_hvac_mode_event``: the thermostat is on or off. This event is also broadcast when the thermostat starts up
+- ``versatile_thermostat_preset_event``: a new preset is selected on the thermostat. This event is also broadcast when the thermostat starts up
+
+If you have followed correctly, when a thermostat goes into safety mode, 3 events are triggered:
+1. ``versatile_thermostat_temperature_event`` to indicate that a thermometer has become unresponsive,
+2. ``versatile_thermostat_preset_event`` to indicate the switch to ```security``` preset,
+3. ``versatile_thermostat_hvac_mode_event`` to indicate the possible extinction of the thermostat
+
+Each event carries the key values ​​of the event (temperatures, current preset, current power, etc.) as well as the states of the thermostat.
+
+You can very easily capture its events in an automation, for example to notify users.
+
 # Custom attributes
 
 To tune the algorithm you have access to all context seen and calculted by the thermostat through dedicated attributes. You can see (and use) those attributes in the "Development tools / states" HMI of HA. Enter your thermostat and you will see something like this:
@@ -346,6 +420,8 @@ Custom attributes are the following:
 | ``overpowering_state`` | The last known state of the overpowering sensor. None if power management is not configured |
 | ``presence_state`` | The last known state of the presence sensor. None if presence management is not configured |
 | ``security_delay_min`` | The delay before setting the security mode when temperature sensor are off |
+| ``security_min_on_percent`` | The minimal on_percent below which security preset won't be trigger |
+| ``security_default_on_percent`` | The on_percent used when thermostat is in ``security`` |
 | ``last_temperature_datetime`` | The date and time in ISO8866 format of the last internal temperature reception |
 | ``last_ext_temperature_datetime`` | The date and time in ISO8866 format of the last external temperature reception |
 | ``security_state`` | The security state. true or false |
@@ -473,6 +549,93 @@ series:
     yaxis_id: right
 ```
 
+## And always better and better with the NOTIFIER daemon app to notify events
+This automation uses the excellent App Daemon named NOTIFIER developed by Horizon Domotique that you will find in demonstration [here](https://www.youtube.com/watch?v=chJylIK0ASo&ab_channel=HorizonDomotique) and the code is [here](https ://github.com/jlpouffier/home-assistant-config/blob/master/appdaemon/apps/notifier.py). It allows you to notify the users of the accommodation when one of the events affecting safety occurs on one of the Versatile Thermostats.
+
+This is a great example of using the notifications described here [notification](#notifications).
+
+```
+alias: Surveillance Mode Sécurité chauffage
+description: Envoi une notification si un thermostat passe en mode sécurité ou power
+trigger:
+  - platform: event
+    event_type: versatile_thermostat_security_event
+    id: versatile_thermostat_security_event
+  - platform: event
+    event_type: versatile_thermostat_power_event
+    id: versatile_thermostat_power_event
+  - platform: event
+    event_type: versatile_thermostat_temperature_event
+    id: versatile_thermostat_temperature_event
+condition: []
+action:
+  - choose:
+      - conditions:
+          - condition: trigger
+            id: versatile_thermostat_security_event
+        sequence:
+          - event: NOTIFIER
+            event_data:
+              action: send_to_jmc
+              title: >-
+                Radiateur {{ trigger.event.data.name }} - {{
+                trigger.event.data.type }} Sécurité
+              message: >-
+                Le radiateur {{ trigger.event.data.name }} est passé en {{
+                trigger.event.data.type }} sécurité car le thermomètre ne répond
+                plus.\n{{ trigger.event.data }}
+              callback:
+                - title: Stopper chauffage
+                  event: stopper_chauffage
+              image_url: /media/local/alerte-securite.jpg
+              click_url: /lovelace-chauffage/4
+              icon: mdi:radiator-off
+              tag: radiateur_security_alerte
+              persistent: true
+      - conditions:
+          - condition: trigger
+            id: versatile_thermostat_power_event
+        sequence:
+          - event: NOTIFIER
+            event_data:
+              action: send_to_jmc
+              title: >-
+                Radiateur {{ trigger.event.data.name }} - {{
+                trigger.event.data.type }} Délestage
+              message: >-
+                Le radiateur {{ trigger.event.data.name }} est passé en {{
+                trigger.event.data.type }} délestage car la puissance max est
+                dépassée.\n{{ trigger.event.data }}
+              callback:
+                - title: Stopper chauffage
+                  event: stopper_chauffage
+              image_url: /media/local/alerte-delestage.jpg
+              click_url: /lovelace-chauffage/4
+              icon: mdi:radiator-off
+              tag: radiateur_power_alerte
+              persistent: true
+      - conditions:
+          - condition: trigger
+            id: versatile_thermostat_temperature_event
+        sequence:
+          - event: NOTIFIER
+            event_data:
+              action: send_to_jmc
+              title: >-
+                Le thermomètre du radiateur {{ trigger.event.data.name }} ne
+                répond plus
+              message: >-
+                Le thermomètre du radiateur {{ trigger.event.data.name }} ne
+                répond plus depuis longtemps.\n{{ trigger.event.data }}
+              image_url: /media/local/thermometre-alerte.jpg
+              click_url: /lovelace-chauffage/4
+              icon: mdi:radiator-disabled
+              tag: radiateur_thermometre_alerte
+              persistent: true
+mode: queued
+max: 30
+```
+
 # Contributions are welcome!
 
 If you want to contribute to this please read the [Contribution guidelines](CONTRIBUTING.md)

custom_components/versatile_thermostat/climate.py

@@ -13,6 +13,8 @@ from homeassistant.core import (
     callback,
     CoreState,
     DOMAIN as HA_DOMAIN,
+    Event,
+    State,
 )
 
 from homeassistant.components.climate import ClimateEntity
@@ -20,7 +22,7 @@ from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.util.unit_system import UnitOfTemperature
+import homeassistant.helpers.config_validation as cv
 
 from homeassistant.helpers.event import (
     async_track_state_change_event,
@@ -34,17 +36,15 @@ from homeassistant.helpers import (
     entity_platform,
 )  # , config_validation as cv
 
-from homeassistant.components.climate.const import (
+from homeassistant.components.climate import (
     DOMAIN as CLIMATE_DOMAIN,
     ATTR_PRESET_MODE,
     # ATTR_FAN_MODE,
-    CURRENT_HVAC_COOL,
-    CURRENT_HVAC_HEAT,
-    CURRENT_HVAC_IDLE,
-    CURRENT_HVAC_OFF,
-    HVAC_MODE_COOL,
-    HVAC_MODE_HEAT,
-    HVAC_MODE_OFF,
+    HVACMode,
+    HVACAction,
+    # HVAC_MODE_COOL,
+    # HVAC_MODE_HEAT,
+    # HVAC_MODE_OFF,
     PRESET_ACTIVITY,
     # PRESET_AWAY,
     PRESET_BOOST,
@@ -53,7 +53,8 @@ from homeassistant.components.climate.const import (
     # PRESET_HOME,
     PRESET_NONE,
     # PRESET_SLEEP,
-    SUPPORT_PRESET_MODE,
+    ClimateEntityFeature,
+    # ClimateEntityFeature.PRESET_MODE,
     # SUPPORT_TARGET_TEMPERATURE,
     SERVICE_SET_FAN_MODE,
     SERVICE_SET_HUMIDITY,
@@ -63,6 +64,13 @@ from homeassistant.components.climate.const import (
     SERVICE_SET_TEMPERATURE,
 )
 
+# from homeassistant.components.climate import (
+# CURRENT_HVAC_HEAT,
+# HVACAction.IDLE,
+# HVACAction.OFF,
+# HVACAction.COOLING,
+# )
+
 from homeassistant.const import (
     # UnitOfTemperature,
     ATTR_TEMPERATURE,
@@ -109,8 +117,13 @@ from .const import (
     PROPORTIONAL_FUNCTION_TPI,
     SERVICE_SET_PRESENCE,
     SERVICE_SET_PRESET_TEMPERATURE,
+    SERVICE_SET_SECURITY,
     PRESET_AWAY_SUFFIX,
     CONF_SECURITY_DELAY_MIN,
+    CONF_SECURITY_MIN_ON_PERCENT,
+    CONF_SECURITY_DEFAULT_ON_PERCENT,
+    DEFAULT_SECURITY_MIN_ON_PERCENT,
+    DEFAULT_SECURITY_DEFAULT_ON_PERCENT,
     CONF_MINIMAL_ACTIVATION_DELAY,
     CONF_TEMP_MAX,
     CONF_TEMP_MIN,
@@ -120,6 +133,7 @@ from .const import (
     CONF_THERMOSTAT_CLIMATE,
     CONF_CLIMATE,
     UnknownEntity,
+    EventType,
 )
 
 from .prop_algorithm import PropAlgorithm
@@ -168,6 +182,16 @@ async def async_setup_entry(
         "service_set_preset_temperature",
     )
 
+    platform.async_register_entity_service(
+        SERVICE_SET_SECURITY,
+        {
+            vol.Optional("delay_min"): cv.positive_int,
+            vol.Optional("min_on_percent"): vol.Coerce(float),
+            vol.Optional("default_on_percent"): vol.Coerce(float),
+        },
+        "service_set_security",
+    )
+
 
 class VersatileThermostat(ClimateEntity, RestoreEntity):
     """Representation of a Versatile Thermostat device."""
@@ -175,8 +199,10 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
     # The list of VersatileThermostat entities
     # No more needed
     # _registry: dict[str, object] = {}
+    _last_temperature_mesure: datetime
+    _last_ext_temperature_mesure: datetime
 
-    def __init__(self, hass, unique_id, name, entry_infos) -> None:
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
         """Initialize the thermostat."""
 
         super().__init__()
@@ -211,7 +237,10 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         self._presence_state = None
         self._overpowering_state = None
         self._should_relaunch_control_heating = None
+
         self._security_delay_min = None
+        self._security_min_on_percent = None
+        self._security_default_on_percent = None
         self._security_state = None
 
         self._thermostat_type = None
@@ -234,7 +263,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         )
         # convert entry_infos into usable attributes
         presets = {}
-        for (key, value) in CONF_PRESETS.items():
+        for key, value in CONF_PRESETS.items():
             _LOGGER.debug("looking for key=%s, value=%s", key, value)
             if value in entry_infos:
                 presets[key] = entry_infos.get(value)
@@ -242,7 +271,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 _LOGGER.debug("value %s not found in Entry", value)
 
         presets_away = {}
-        for (key, value) in CONF_PRESETS_AWAY.items():
+        for key, value in CONF_PRESETS_AWAY.items():
             _LOGGER.debug("looking for key=%s, value=%s", key, value)
             if value in entry_infos:
                 presets_away[key] = entry_infos.get(value)
@@ -299,8 +328,9 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         # TODO if self.ac_mode:
         #    self.hvac_list = [HVAC_MODE_COOL, HVAC_MODE_OFF]
         # else:
-        self._hvac_list = [HVAC_MODE_HEAT, HVAC_MODE_OFF]
-        self._unit = UnitOfTemperature.CELSIUS
+        self._hvac_list = [HVACMode.HEAT, HVACMode.OFF]
+
+        self._unit = self._hass.config.units.temperature_unit
         # Will be restored if possible
         self._hvac_mode = None  # HVAC_MODE_OFF
         self._saved_hvac_mode = self._hvac_mode
@@ -317,8 +347,8 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             self._presets_away,
         )
         # Will be restored if possible
-        self._attr_preset_mode = None
-        self._saved_preset_mode = None
+        self._attr_preset_mode = PRESET_NONE
+        self._saved_preset_mode = PRESET_NONE
 
         # Power management
         self._device_power = entry_infos.get(CONF_DEVICE_POWER)
@@ -357,6 +387,14 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             self._tpi_coef_ext = 0
 
         self._security_delay_min = entry_infos.get(CONF_SECURITY_DELAY_MIN)
+        self._security_min_on_percent = (
+            entry_infos.get(CONF_SECURITY_MIN_ON_PERCENT)
+            or DEFAULT_SECURITY_MIN_ON_PERCENT
+        )
+        self._security_default_on_percent = (
+            entry_infos.get(CONF_SECURITY_DEFAULT_ON_PERCENT)
+            or DEFAULT_SECURITY_DEFAULT_ON_PERCENT
+        )
         self._minimal_activation_delay = entry_infos.get(CONF_MINIMAL_ACTIVATION_DELAY)
         self._last_temperature_mesure = datetime.now()
         self._last_ext_temperature_mesure = datetime.now()
@@ -385,7 +423,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         # Calculate all possible presets
         self._attr_preset_modes = [PRESET_NONE]
         if len(presets):
-            self._support_flags = SUPPORT_FLAGS | SUPPORT_PRESET_MODE
+            self._support_flags = SUPPORT_FLAGS | ClimateEntityFeature.PRESET_MODE
 
             for key, val in presets.items():
                 if val != 0.0:
@@ -512,6 +550,14 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             self._async_cancel_cycle()
             self._async_cancel_cycle = None
 
+    def find_underlying_climate(self, climate_entity_id) -> ClimateEntity:
+        """Find the underlying climate entity"""
+        component: EntityComponent[ClimateEntity] = self.hass.data[CLIMATE_DOMAIN]
+        for entity in component.entities:
+            if climate_entity_id == entity.entity_id:
+                return entity
+        return None
+
     async def async_startup(self):
         """Triggered on startup, used to get old state and set internal states accordingly"""
         _LOGGER.debug("%s - Calling async_startup", self)
@@ -523,19 +569,16 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
 
             # Get the underlying thermostat
             if self._is_over_climate:
-                component: EntityComponent[ClimateEntity] = self.hass.data[
-                    CLIMATE_DOMAIN
-                ]
-                for entity in component.entities:
-                    if self._climate_entity_id == entity.entity_id:
-                        _LOGGER.info(
-                            "%s - The underlying climate entity: %s have been succesfully found",
-                            self,
-                            entity,
-                        )
-                        self._underlying_climate = entity
-                        break
-                if self._underlying_climate is None:
+                self._underlying_climate = self.find_underlying_climate(
+                    self._climate_entity_id
+                )
+                if self._underlying_climate:
+                    _LOGGER.info(
+                        "%s - The underlying climate entity: %s have been succesfully found",
+                        self,
+                        self._underlying_climate,
+                    )
+                else:
                     _LOGGER.error(
                         "%s - Cannot find the underlying climate entity: %s. Thermostat will not be operational",
                         self,
@@ -721,12 +764,21 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                         float(old_state.attributes[ATTR_TEMPERATURE])
                     )
 
-            if old_state.attributes.get(ATTR_PRESET_MODE) in self._attr_preset_modes:
+            old_preset_mode = old_state.attributes.get(ATTR_PRESET_MODE)
+            # Never restore a Power or Security preset
+            if (
+                old_preset_mode in self._attr_preset_modes
+                and old_preset_mode not in HIDDEN_PRESETS
+            ):
                 self._attr_preset_mode = old_state.attributes.get(ATTR_PRESET_MODE)
                 self.save_preset_mode()
+            else:
+                self._attr_preset_mode = PRESET_NONE
 
             if not self._hvac_mode and old_state.state:
                 self._hvac_mode = old_state.state
+            else:
+                self._hvac_mode = HVACMode.OFF
 
         else:
             # No previous state, try and restore defaults
@@ -743,7 +795,10 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
 
         # Set default state to off
         if not self._hvac_mode:
-            self._hvac_mode = HVAC_MODE_OFF
+            self._hvac_mode = HVACMode.OFF
+
+        self.send_event(EventType.PRESET_EVENT, {"preset": self._attr_preset_mode})
+        self.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": self._hvac_mode})
 
         _LOGGER.info(
             "%s - restored state is target_temp=%.1f, preset_mode=%s, hvac_mode=%s",
@@ -823,6 +878,9 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
     @property
     def temperature_unit(self):
         """Return the unit of measurement."""
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.temperature_unit
+
         return self._unit
 
     @property
@@ -842,13 +900,13 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         if self._is_over_climate and self._underlying_climate:
             return self._underlying_climate.hvac_action
 
-        if self._hvac_mode == HVAC_MODE_OFF:
-            return CURRENT_HVAC_OFF
+        if self._hvac_mode == HVACMode.OFF:
+            return HVACAction.OFF
         if not self._is_device_active:
-            return CURRENT_HVAC_IDLE
+            return HVACAction.IDLE
         if self._ac_mode:
-            return CURRENT_HVAC_COOL
-        return CURRENT_HVAC_HEAT
+            return HVACAction.COOLING
+        return HVACAction.HEATING
 
     @property
     def target_temperature(self):
@@ -869,19 +927,104 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         if self._is_over_climate:
             if self._underlying_climate:
                 return self._underlying_climate.hvac_action not in [
-                    CURRENT_HVAC_IDLE,
-                    CURRENT_HVAC_OFF,
+                    HVACAction.IDLE,
+                    HVACAction.OFF,
                 ]
             else:
                 return None
         else:
-            return self.hass.states.is_state(self._heater_entity_id, STATE_ON)
+            return self._hass.states.is_state(self._heater_entity_id, STATE_ON)
 
     @property
     def current_temperature(self):
         """Return the sensor temperature."""
         return self._cur_temp
 
+    @property
+    def target_temperature_step(self) -> float | None:
+        """Return the supported step of target temperature."""
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.target_temperature_step
+
+        return None
+
+    @property
+    def target_temperature_high(self) -> float | None:
+        """Return the highbound target temperature we try to reach.
+
+        Requires ClimateEntityFeature.TARGET_TEMPERATURE_RANGE.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.target_temperature_high
+
+        return None
+
+    @property
+    def target_temperature_low(self) -> float | None:
+        """Return the lowbound target temperature we try to reach.
+
+        Requires ClimateEntityFeature.TARGET_TEMPERATURE_RANGE.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.target_temperature_low
+
+        return None
+
+    @property
+    def is_aux_heat(self) -> bool | None:
+        """Return true if aux heater.
+
+        Requires ClimateEntityFeature.AUX_HEAT.
+        """
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.is_aux_heat
+
+        return None
+
+    def turn_aux_heat_on(self) -> None:
+        """Turn auxiliary heater on."""
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.turn_aux_heat_on()
+
+        raise NotImplementedError()
+
+    async def async_turn_aux_heat_on(self) -> None:
+        """Turn auxiliary heater on."""
+        if self._is_over_climate and self._underlying_climate:
+            await self._underlying_climate.async_turn_aux_heat_on()
+
+        raise NotImplementedError()
+
+    def turn_aux_heat_off(self) -> None:
+        """Turn auxiliary heater off."""
+        if self._is_over_climate and self._underlying_climate:
+            return self._underlying_climate.turn_aux_heat_off()
+
+        raise NotImplementedError()
+
+    async def async_turn_aux_heat_off(self) -> None:
+        """Turn auxiliary heater off."""
+        if self._is_over_climate and self._underlying_climate:
+            await self._underlying_climate.async_turn_aux_heat_off()
+
+        raise NotImplementedError()
+
+    @property
+    def preset_mode(self) -> str | None:
+        """Return the current preset mode, e.g., home, away, temp.
+
+        Requires ClimateEntityFeature.PRESET_MODE.
+        """
+        return self._attr_preset_mode
+
+    @property
+    def preset_modes(self) -> list[str] | None:
+        """Return a list of available preset modes.
+
+        Requires ClimateEntityFeature.PRESET_MODE.
+        """
+        return self._attr_preset_modes
+
     async def async_set_hvac_mode(self, hvac_mode):
         """Set new target hvac mode."""
         _LOGGER.info("%s - Set hvac mode: %s", self, hvac_mode)
@@ -897,14 +1040,14 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             # await self._underlying_climate.async_set_hvac_mode(hvac_mode)
             self._hvac_mode = hvac_mode  # self._underlying_climate.hvac_mode
         else:
-            if hvac_mode == HVAC_MODE_HEAT:
-                self._hvac_mode = HVAC_MODE_HEAT
+            if hvac_mode == HVACMode.HEAT:
+                self._hvac_mode = HVACMode.HEAT
                 await self._async_control_heating(force=True)
-            elif hvac_mode == HVAC_MODE_COOL:
-                self._hvac_mode = HVAC_MODE_COOL
+            elif hvac_mode == HVACMode.COOL:
+                self._hvac_mode = HVACMode.COOL
                 await self._async_control_heating(force=True)
-            elif hvac_mode == HVAC_MODE_OFF:
-                self._hvac_mode = HVAC_MODE_OFF
+            elif hvac_mode == HVACMode.OFF:
+                self._hvac_mode = HVACMode.OFF
                 if self._is_device_active:
                     await self._async_underlying_entity_turn_off()
                 await self._async_control_heating(force=True)
@@ -912,8 +1055,11 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 _LOGGER.error("Unrecognized hvac mode: %s", hvac_mode)
                 return
         # Ensure we update the current operation after changing the mode
+        self.reset_last_temperature_time()
+
         self.update_custom_attributes()
         self.async_write_ha_state()
+        self.send_event(EventType.HVAC_MODE_EVENT, {"hvac_mode": self._hvac_mode})
 
     async def async_set_preset_mode(self, preset_mode):
         """Set new preset mode."""
@@ -934,6 +1080,17 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         if preset_mode == self._attr_preset_mode and not force:
             # I don't think we need to call async_write_ha_state if we didn't change the state
             return
+
+        # In security mode don't change preset but memorise the new expected preset when security will be off
+        if preset_mode != PRESET_SECURITY and self._security_state:
+            _LOGGER.debug(
+                "%s - is in security mode. Just memorise the new expected ", self
+            )
+            if preset_mode not in HIDDEN_PRESETS:
+                self._saved_preset_mode = preset_mode
+            return
+
+        old_preset_mode = self._attr_preset_mode
         if preset_mode == PRESET_NONE:
             self._attr_preset_mode = PRESET_NONE
             if self._saved_target_temp:
@@ -949,9 +1106,21 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 self.find_preset_temp(preset_mode)
             )
 
-        self.save_preset_mode()
+        self.reset_last_temperature_time(old_preset_mode)
 
+        self.save_preset_mode()
         self.recalculate()
+        self.send_event(EventType.PRESET_EVENT, {"preset": self._attr_preset_mode})
+
+    def reset_last_temperature_time(self, old_preset_mode=None):
+        """Reset to now the last temperature time if conditions are satisfied"""
+        if (
+            self._attr_preset_mode not in HIDDEN_PRESETS
+            and old_preset_mode not in HIDDEN_PRESETS
+        ):
+            self._last_temperature_mesure = (
+                self._last_ext_temperature_mesure
+            ) = datetime.now()
 
     def find_preset_temp(self, preset_mode):
         """Find the right temperature of a preset considering the presence if configured"""
@@ -1058,10 +1227,10 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         _LOGGER.info("%s - Change entry with the values: %s", self, config_entry.data)
 
     @callback
-    async def _async_temperature_changed(self, event):
-        """Handle temperature changes."""
-        new_state = event.data.get("new_state")
-        _LOGGER.info(
+    async def _async_temperature_changed(self, event: Event):
+        """Handle temperature of the temperature sensor changes."""
+        new_state: State = event.data.get("new_state")
+        _LOGGER.debug(
             "%s - Temperature changed. Event.new_state is %s",
             self,
             new_state,
@@ -1073,10 +1242,10 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         self.recalculate()
         await self._async_control_heating(force=False)
 
-    async def _async_ext_temperature_changed(self, event):
-        """Handle external temperature changes."""
-        new_state = event.data.get("new_state")
-        _LOGGER.info(
+    async def _async_ext_temperature_changed(self, event: Event):
+        """Handle external temperature opf the sensor changes."""
+        new_state: State = event.data.get("new_state")
+        _LOGGER.debug(
             "%s - external Temperature changed. Event.new_state is %s",
             self,
             new_state,
@@ -1135,10 +1304,10 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 await self.restore_hvac_mode()
             elif self._window_state == STATE_ON:
                 _LOGGER.info(
-                    "%s - Window is open. Set hvac_mode to '%s'", self, HVAC_MODE_OFF
+                    "%s - Window is open. Set hvac_mode to '%s'", self, HVACMode.OFF
                 )
                 self.save_hvac_mode()
-                await self.async_set_hvac_mode(HVAC_MODE_OFF)
+                await self.async_set_hvac_mode(HVACMode.OFF)
             self.update_custom_attributes()
 
         if self._window_call_cancel:
@@ -1210,7 +1379,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
     async def _check_switch_initial_state(self):
         """Prevent the device from keep running if HVAC_MODE_OFF."""
         _LOGGER.debug("%s - Calling _check_switch_initial_state", self)
-        if self._hvac_mode == HVAC_MODE_OFF and self._is_device_active:
+        if self._hvac_mode == HVACMode.OFF and self._is_device_active:
             _LOGGER.warning(
                 "The climate mode is OFF, but the switch device is ON. Turning off device %s",
                 self._heater_entity_id,
@@ -1240,9 +1409,13 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         )
         # old_state = event.data.get("old_state")
         if new_state is None or new_state.state not in [
-            HVAC_MODE_COOL,
-            HVAC_MODE_HEAT,
-            HVAC_MODE_OFF,
+            HVACMode.OFF,
+            HVACMode.HEAT,
+            HVACMode.COOL,
+            HVACMode.HEAT_COOL,
+            HVACMode.DRY,
+            HVACMode.AUTO,
+            HVACMode.FAN_ONLY,
         ]:
             return
         self._hvac_mode = new_state.state
@@ -1250,14 +1423,16 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         await self._async_control_heating(True)
 
     @callback
-    async def _async_update_temp(self, state):
+    async def _async_update_temp(self, state: State):
         """Update thermostat with latest state from sensor."""
         try:
             cur_temp = float(state.state)
             if math.isnan(cur_temp) or math.isinf(cur_temp):
                 raise ValueError(f"Sensor has illegal state {state.state}")
             self._cur_temp = cur_temp
-            self._last_temperature_mesure = datetime.now()
+            self._last_temperature_mesure = (
+                state.last_changed if state.last_changed is not None else datetime.now()
+            )
             # try to restart if we were in security mode
             if self._security_state:
                 await self.check_security()
@@ -1266,14 +1441,16 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             _LOGGER.error("Unable to update temperature from sensor: %s", ex)
 
     @callback
-    async def _async_update_ext_temp(self, state):
+    async def _async_update_ext_temp(self, state: State):
         """Update thermostat with latest state from sensor."""
         try:
             cur_ext_temp = float(state.state)
             if math.isnan(cur_ext_temp) or math.isinf(cur_ext_temp):
                 raise ValueError(f"Sensor has illegal state {state.state}")
             self._cur_ext_temp = cur_ext_temp
-            self._last_ext_temperature_mesure = datetime.now()
+            self._last_ext_temperature_mesure = (
+                state.last_changed if state.last_changed is not None else datetime.now()
+            )
             # try to restart if we were in security mode
             if self._security_state:
                 await self.check_security()
@@ -1504,11 +1681,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             self._device_power,
         )
         ret = self._current_power + self._device_power >= self._current_power_max
-        if (
-            not self._overpowering_state
-            and ret
-            and not self._hvac_mode == HVAC_MODE_OFF
-        ):
+        if not self._overpowering_state and ret and not self._hvac_mode == HVACMode.OFF:
             _LOGGER.warning(
                 "%s - overpowering is detected. Heater preset will be set to 'power'",
                 self,
@@ -1518,6 +1691,15 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             self.save_preset_mode()
             await self._async_underlying_entity_turn_off()
             await self._async_set_preset_mode_internal(PRESET_POWER)
+            self.send_event(
+                EventType.POWER_EVENT,
+                {
+                    "type": "start",
+                    "current_power": self._current_power,
+                    "device_power": self._device_power,
+                    "current_power_max": self._current_power_max,
+                },
+            )
 
         # Check if we need to remove the POWER preset
         if (
@@ -1533,6 +1715,15 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             if self._is_over_climate:
                 await self.restore_hvac_mode()
             await self.restore_preset_mode()
+            self.send_event(
+                EventType.POWER_EVENT,
+                {
+                    "type": "end",
+                    "current_power": self._current_power,
+                    "device_power": self._device_power,
+                    "current_power_max": self._current_power_max,
+                },
+            )
 
         self._overpowering_state = ret
         return self._overpowering_state
@@ -1540,33 +1731,43 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
     async def check_security(self) -> bool:
         """Check if last temperature date is too long"""
         now = datetime.now()
-        delta_temp = (now - self._last_temperature_mesure).total_seconds() / 60.0
-        delta_ext_temp = (
-            now - self._last_ext_temperature_mesure
+        delta_temp = (
+            now - self._last_temperature_mesure.replace(tzinfo=None)
         ).total_seconds() / 60.0
-        _LOGGER.debug(
-            "%s - checking security delta_temp=%.1f delta_ext_temp=%.1f",
-            self,
-            delta_temp,
-            delta_ext_temp,
-        )
+        delta_ext_temp = (
+            now - self._last_ext_temperature_mesure.replace(tzinfo=None)
+        ).total_seconds() / 60.0
+
+        mode_cond = self._is_over_climate or self._hvac_mode != HVACMode.OFF
 
         temp_cond: bool = (
             delta_temp > self._security_delay_min
             or delta_ext_temp > self._security_delay_min
         )
         climate_cond: bool = self._is_over_climate and self.hvac_action not in [
-            CURRENT_HVAC_COOL,
-            CURRENT_HVAC_IDLE,
+            HVACAction.COOLING,
+            HVACAction.IDLE,
         ]
         switch_cond: bool = (
             not self._is_over_climate
             and self._prop_algorithm is not None
-            and self._prop_algorithm.on_percent > 0.75
+            and self._prop_algorithm.calculated_on_percent
+            >= self._security_min_on_percent
+        )
+
+        _LOGGER.debug(
+            "%s - checking security delta_temp=%.1f delta_ext_temp=%.1f mod_cond=%s temp_cond=%s climate_cond=%s switch_cond=%s",
+            self,
+            delta_temp,
+            delta_ext_temp,
+            mode_cond,
+            temp_cond,
+            climate_cond,
+            switch_cond,
         )
 
         ret = False
-        if temp_cond and climate_cond:
+        if mode_cond and temp_cond and climate_cond:
             if not self._security_state:
                 _LOGGER.warning(
                     "%s - No temperature received for more than %.1f minutes (dt=%.1f, dext=%.1f) and underlying climate is %s. Set it into security mode",
@@ -1578,24 +1779,53 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 )
             ret = True
 
-        if temp_cond and switch_cond:
+        if mode_cond and temp_cond and switch_cond:
             if not self._security_state:
                 _LOGGER.warning(
-                    "%s - No temperature received for more than %.1f minutes (dt=%.1f, dext=%.1f) and on_percent is high (%.2f). Set it into security mode",
+                    "%s - No temperature received for more than %.1f minutes (dt=%.1f, dext=%.1f) and on_percent (%.2f) is over defined value (%.2f). Set it into security mode",
                     self,
                     self._security_delay_min,
                     delta_temp,
                     delta_ext_temp,
                     self._prop_algorithm.on_percent,
+                    self._security_min_on_percent,
                 )
             ret = True
 
+        if mode_cond and temp_cond and not self._security_state:
+            self.send_event(
+                EventType.TEMPERATURE_EVENT,
+                {
+                    "last_temperature_mesure": self._last_temperature_mesure.isoformat(),
+                    "last_ext_temperature_mesure": self._last_ext_temperature_mesure.isoformat(),
+                    "current_temp": self._cur_temp,
+                    "current_ext_temp": self._cur_ext_temp,
+                    "target_temp": self.target_temperature,
+                },
+            )
+
         if not self._security_state and ret:
             self._security_state = ret
             self.save_hvac_mode()
             self.save_preset_mode()
             await self._async_set_preset_mode_internal(PRESET_SECURITY)
-            await self.async_set_hvac_mode(HVAC_MODE_OFF)
+            # Turn off the underlying climate or heater if security default on_percent is 0
+            if self._is_over_climate or self._security_default_on_percent <= 0.0:
+                await self.async_set_hvac_mode(HVACMode.OFF)
+            if self._prop_algorithm:
+                self._prop_algorithm.set_security(self._security_default_on_percent)
+
+            self.send_event(
+                EventType.SECURITY_EVENT,
+                {
+                    "type": "start",
+                    "last_temperature_mesure": self._last_temperature_mesure.isoformat(),
+                    "last_ext_temperature_mesure": self._last_ext_temperature_mesure.isoformat(),
+                    "current_temp": self._cur_temp,
+                    "current_ext_temp": self._cur_ext_temp,
+                    "target_temp": self.target_temperature,
+                },
+            )
 
         if (
             self._security_state
@@ -1609,15 +1839,30 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 self._saved_preset_mode,
             )
             self._security_state = ret
-            await self.restore_hvac_mode()
+            # Restore hvac_mode if previously saved
+            if self._is_over_climate or self._security_default_on_percent <= 0.0:
+                await self.restore_hvac_mode()
             await self.restore_preset_mode()
+            if self._prop_algorithm:
+                self._prop_algorithm.unset_security()
+            self.send_event(
+                EventType.SECURITY_EVENT,
+                {
+                    "type": "end",
+                    "last_temperature_mesure": self._last_temperature_mesure.isoformat(),
+                    "last_ext_temperature_mesure": self._last_ext_temperature_mesure.isoformat(),
+                    "current_temp": self._cur_temp,
+                    "current_ext_temp": self._cur_ext_temp,
+                    "target_temp": self.target_temperature,
+                },
+            )
 
         return ret
 
     async def _async_control_heating(self, force=False, _=None):
         """The main function used to run the calculation at each cycle"""
 
-        _LOGGER.info(
+        _LOGGER.debug(
             "%s - Checking new cycle. hvac_mode=%s, security_state=%s, preset_mode=%s",
             self,
             self._hvac_mode,
@@ -1632,12 +1877,12 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             return
 
         security: bool = await self.check_security()
-        if security:
-            _LOGGER.debug("%s - End of cycle (security)", self)
+        if security and self._is_over_climate:
+            _LOGGER.debug("%s - End of cycle (security and over climate)", self)
             return
 
         # Stop here if we are off
-        if self._hvac_mode == HVAC_MODE_OFF:
+        if self._hvac_mode == HVACMode.OFF:
             _LOGGER.debug("%s - End of cycle (HVAC_MODE_OFF)", self)
             if self._is_device_active:
                 await self._async_underlying_entity_turn_off()
@@ -1646,7 +1891,8 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         if not self._is_over_climate:
             on_time_sec: int = self._prop_algorithm.on_time_sec
             off_time_sec: int = self._prop_algorithm.off_time_sec
-            _LOGGER.info(
+
+            _LOGGER.debug(
                 "%s - Checking new cycle. on_time_sec=%.0f, off_time_sec=%.0f, security_state=%s, preset_mode=%s",
                 self,
                 on_time_sec,
@@ -1670,7 +1916,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                     _LOGGER.debug("%s - End of cycle (2)", self)
                     return
 
-            if self._hvac_mode == HVAC_MODE_HEAT and on_time_sec > 0:
+            if self._hvac_mode == HVACMode.HEAT and on_time_sec > 0:
 
                 async def _turn_on_off_later(
                     on: bool, time, heater_action, next_cycle_action
@@ -1680,20 +1926,19 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                         self._async_cancel_cycle = None
                         _LOGGER.debug("%s - Stopping cycle during calculation", self)
 
-                    if self._hvac_mode == HVAC_MODE_OFF:
+                    if self._hvac_mode == HVACMode.OFF:
                         _LOGGER.debug("%s - End of cycle (HVAC_MODE_OFF - 2)", self)
                         if self._is_device_active:
                             await self._async_underlying_entity_turn_off()
                         return
 
                     if on:
-                        security = (
-                            await self.check_security()
-                            or await self.check_overpowering()
-                        )
-                        if security:
+                        if await self.check_overpowering():
                             _LOGGER.debug("%s - End of cycle (3)", self)
                             return
+                        # Security mode could have change the on_time percent
+                        await self.check_security()
+                        time = self._prop_algorithm.on_time_sec
 
                     action_label = "start" if on else "stop"
                     if self._should_relaunch_control_heating:
@@ -1708,7 +1953,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
 
                     if time > 0:
                         _LOGGER.info(
-                            "%s - !!! %s heating for %d min %d sec",
+                            "%s - %s heating for %d min %d sec",
                             self,
                             action_label,
                             time // 60,
@@ -1803,6 +2048,8 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             "overpowering_state": self._overpowering_state,
             "presence_state": self._presence_state,
             "security_delay_min": self._security_delay_min,
+            "security_min_on_percent": self._security_min_on_percent,
+            "security_default_on_percent": self._security_default_on_percent,
             "last_temperature_datetime": self._last_temperature_mesure.isoformat(),
             "last_ext_temperature_datetime": self._last_ext_temperature_mesure.isoformat(),
             "security_state": self._security_state,
@@ -1893,28 +2140,40 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             await self._async_set_preset_mode_internal(preset, force=True)
             await self._async_control_heating(force=True)
 
-    # No more needed
+    async def service_set_security(self, delay_min, min_on_percent, default_on_percent):
+        """Called by a service call:
+        service: versatile_thermostat.set_security
+        data:
+            delay_min: 15
+            min_on_percent: 0.5
+            default_on_percent: 0.2
+        target:
+            entity_id: climate.thermostat_2
+        """
+        _LOGGER.info(
+            "%s - Calling service_set_security, delay_min: %s, min_on_percent: %s, default_on_percent: %s",
+            self,
+            delay_min,
+            min_on_percent,
+            default_on_percent,
+        )
+        if delay_min:
+            self._security_delay_min = delay_min
+        if min_on_percent:
+            self._security_min_on_percent = min_on_percent
+        if default_on_percent:
+            self._security_default_on_percent = default_on_percent
 
+        if self._prop_algorithm and self._security_state:
+            self._prop_algorithm.set_security(self._security_default_on_percent)
 
-#    @classmethod
-#    def add_entity(cls, entry_id, entity):
-#        """Adds an entity into the VersatileRegistry entities"""
-#        _LOGGER.debug("Adding entity %s", entry_id)
-#        cls._registry[entry_id] = entity
-#        _LOGGER.debug("Entity registry is now %s", cls._registry)
-#
-#    @classmethod
-#    async def update_entity(cls, entry_id, infos):
-#        """Updates an existing entity referenced by entry_id with the infos in arguments"""
-#        entity: VersatileThermostat = cls._registry.get(entry_id)
-#        if entity is None:
-#            _LOGGER.warning(
-#                "Tries to update VersatileThermostat entity %s but was not found in thermostat registry",
-#                entry_id,
-#            )
-#            return
-#
-#        _LOGGER.debug("We have found the entity to update")
-#        entity.post_init(infos)
-#
-#        await entity.async_added_to_hass()
+        await self._async_control_heating()
+        self.update_custom_attributes()
+
+    def send_event(self, event_type: EventType, data: dict):
+        """Send an event"""
+        _LOGGER.info("%s - Sending event %s with data: %s", self, event_type, data)
+        data["entity_id"] = self.entity_id
+        data["name"] = self.name
+        data["state_attributes"] = self.state_attributes
+        self._hass.bus.fire(event_type.value, data)

custom_components/versatile_thermostat/config_flow.py

@@ -8,25 +8,20 @@ from collections.abc import Mapping
 import voluptuous as vol
 
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.const import TEMPERATURE, UnitOfPower
-from homeassistant.util.unit_system import TEMPERATURE_UNITS
 
-from homeassistant.core import callback, async_get_hass
+from homeassistant.core import callback
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow as HAConfigFlow,
     OptionsFlow,
 )
 
-from homeassistant.data_entry_flow import FlowHandler
-from homeassistant.data_entry_flow import FlowResult
+from homeassistant.data_entry_flow import FlowHandler, FlowResult
 
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.entity_registry import (
-    RegistryEntry,
-    async_get,
-)
+
+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.input_boolean import (
@@ -68,6 +63,10 @@ from .const import (
     CONF_PRESENCE_SENSOR,
     PROPORTIONAL_FUNCTION_TPI,
     CONF_SECURITY_DELAY_MIN,
+    CONF_SECURITY_MIN_ON_PERCENT,
+    CONF_SECURITY_DEFAULT_ON_PERCENT,
+    DEFAULT_SECURITY_MIN_ON_PERCENT,
+    DEFAULT_SECURITY_DEFAULT_ON_PERCENT,
     CONF_MINIMAL_ACTIVATION_DELAY,
     CONF_TEMP_MAX,
     CONF_TEMP_MIN,
@@ -126,35 +125,33 @@ 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.device_class == TEMPERATURE
-        #    or sensor.original_device_class == TEMPERATURE
-        sensor.unit_of_measurement
-        in [
-            UnitOfPower.KILO_WATT,
-            UnitOfPower.WATT,
-            UnitOfPower.BTU_PER_HOUR,
-        ]
-    )
+# 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):
@@ -183,55 +180,27 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             is_empty or self._infos.get(CONF_PRESENCE_SENSOR) is not None
         )
 
-        self.hass = async_get_hass()
-        ent_reg = async_get(hass=self.hass)
-
-        climates = []
-        switches = []
-        temp_sensors = []
-        power_sensors = []
-        window_sensors = []
-        presence_sensors = []
-
-        k: str
-        for k in ent_reg.entities:
-            v: RegistryEntry = ent_reg.entities[k]
-            _LOGGER.debug("Looking entity: %s", k)
-            # if k.startswith(CLIMATE_DOMAIN) and (
-            #    infos is None or k != infos.get("entity_id")
-            # ):
-            #    _LOGGER.debug("Climate !")
-            #    climates.append(k)
-            if k.startswith(SWITCH_DOMAIN) or k.startswith(INPUT_BOOLEAN_DOMAIN):
-                _LOGGER.debug("Switch !")
-                switches.append(k)
-            elif is_temperature_sensor(v):
-                _LOGGER.debug("Temperature sensor !")
-                temp_sensors.append(k)
-            elif is_power_sensor(v):
-                _LOGGER.debug("Power sensor !")
-                power_sensors.append(k)
-            elif k.startswith(PERSON_DOMAIN):
-                _LOGGER.debug("Presence sensor !")
-                presence_sensors.append(k)
-
-            # window sensor and presence 
-            if k.startswith(INPUT_BOOLEAN_DOMAIN) or k.startswith(BINARY_SENSOR_DOMAIN):
-                _LOGGER.debug("Window or presence sensor !")
-                window_sensors.append(k)
-                presence_sensors.append(k)
-
-        # Special case for climates which are not in EntityRegistry
-        climates = self.find_all_climates()
-
         self.STEP_USER_DATA_SCHEMA = vol.Schema(
             {
                 vol.Required(CONF_NAME): cv.string,
                 vol.Required(
                     CONF_THERMOSTAT_TYPE, default=CONF_THERMOSTAT_SWITCH
-                ): vol.In(CONF_THERMOSTAT_TYPES),
-                vol.Required(CONF_TEMP_SENSOR): vol.In(temp_sensors),
-                vol.Required(CONF_EXTERNAL_TEMP_SENSOR): vol.In(temp_sensors),
+                ): selector.SelectSelector(
+                    selector.SelectSelectorConfig(
+                        options=CONF_THERMOSTAT_TYPES, translation_key="thermostat_type"
+                    )
+                ),
+                vol.Required(CONF_TEMP_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[SENSOR_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                #  vol.In(temp_sensors),
+                vol.Required(CONF_EXTERNAL_TEMP_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[SENSOR_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),  # vol.In(temp_sensors),
                 vol.Required(CONF_CYCLE_MIN, default=5): cv.positive_int,
                 vol.Required(CONF_TEMP_MIN, default=7): vol.Coerce(float),
                 vol.Required(CONF_TEMP_MAX, default=35): vol.Coerce(float),
@@ -244,7 +213,11 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
 
         self.STEP_THERMOSTAT_SWITCH = vol.Schema(
             {
-                vol.Required(CONF_HEATER): vol.In(switches),
+                vol.Required(CONF_HEATER): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[SWITCH_DOMAIN, INPUT_BOOLEAN_DOMAIN]
+                    ),
+                ),  # vol.In(switches),
                 vol.Required(
                     CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI
                 ): vol.In(
@@ -257,7 +230,9 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
 
         self.STEP_THERMOSTAT_CLIMATE = vol.Schema(
             {
-                vol.Required(CONF_CLIMATE): vol.In(climates),
+                vol.Required(CONF_CLIMATE): selector.EntitySelector(
+                    selector.EntitySelectorConfig(domain=CLIMATE_DOMAIN),
+                ),  # vol.In(climates),
             }
         )
 
@@ -277,14 +252,22 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
 
         self.STEP_WINDOW_DATA_SCHEMA = vol.Schema(
             {
-                vol.Optional(CONF_WINDOW_SENSOR): vol.In(window_sensors),
+                vol.Optional(CONF_WINDOW_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[BINARY_SENSOR_DOMAIN, INPUT_BOOLEAN_DOMAIN]
+                    ),
+                ),  # vol.In(window_sensors),
                 vol.Optional(CONF_WINDOW_DELAY, default=30): cv.positive_int,
             }
         )
 
         self.STEP_MOTION_DATA_SCHEMA = vol.Schema(
             {
-                vol.Optional(CONF_MOTION_SENSOR): vol.In(window_sensors),
+                vol.Optional(CONF_MOTION_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[BINARY_SENSOR_DOMAIN, INPUT_BOOLEAN_DOMAIN]
+                    ),
+                ),  # vol.In(window_sensors),
                 vol.Optional(CONF_MOTION_DELAY, default=30): cv.positive_int,
                 vol.Optional(CONF_MOTION_PRESET, default="comfort"): vol.In(
                     CONF_PRESETS_SELECTIONABLE
@@ -297,8 +280,16 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
 
         self.STEP_POWER_DATA_SCHEMA = vol.Schema(
             {
-                vol.Optional(CONF_POWER_SENSOR): vol.In(power_sensors),
-                vol.Optional(CONF_MAX_POWER_SENSOR): vol.In(power_sensors),
+                vol.Optional(CONF_POWER_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[SENSOR_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),  # vol.In(power_sensors),
+                vol.Optional(CONF_MAX_POWER_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[SENSOR_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),  # vol.In(power_sensors),
                 vol.Optional(CONF_DEVICE_POWER, default="1"): vol.Coerce(float),
                 vol.Optional(CONF_PRESET_POWER, default="13"): vol.Coerce(float),
             }
@@ -306,7 +297,15 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
 
         self.STEP_PRESENCE_DATA_SCHEMA = vol.Schema(
             {
-                vol.Optional(CONF_PRESENCE_SENSOR): vol.In(presence_sensors),
+                vol.Optional(CONF_PRESENCE_SENSOR): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[
+                            PERSON_DOMAIN,
+                            BINARY_SENSOR_DOMAIN,
+                            INPUT_BOOLEAN_DOMAIN,
+                        ]
+                    ),
+                ),  # vol.In(presence_sensors),
             }
         ).extend(
             {
@@ -321,10 +320,18 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                     CONF_MINIMAL_ACTIVATION_DELAY, default=10
                 ): cv.positive_int,
                 vol.Required(CONF_SECURITY_DELAY_MIN, default=60): cv.positive_int,
+                vol.Required(
+                    CONF_SECURITY_MIN_ON_PERCENT,
+                    default=DEFAULT_SECURITY_MIN_ON_PERCENT,
+                ): vol.Coerce(float),
+                vol.Required(
+                    CONF_SECURITY_DEFAULT_ON_PERCENT,
+                    default=DEFAULT_SECURITY_DEFAULT_ON_PERCENT,
+                ): vol.Coerce(float),
             }
         )
 
-    async def validate_input(self, data: dict) -> dict[str]:
+    async def validate_input(self, data: dict) -> None:
         """Validate the user input allows us to connect.
 
         Data has the keys from STEP_*_DATA_SCHEMA with values provided by the user.

custom_components/versatile_thermostat/const.py

@@ -1,5 +1,6 @@
 """Constants for the Versatile Thermostat integration."""
 
+from enum import Enum
 from homeassistant.const import CONF_NAME
 from homeassistant.components.climate.const import (
     # PRESET_ACTIVITY,
@@ -44,6 +45,8 @@ CONF_MINIMAL_ACTIVATION_DELAY = "minimal_activation_delay"
 CONF_TEMP_MIN = "temp_min"
 CONF_TEMP_MAX = "temp_max"
 CONF_SECURITY_DELAY_MIN = "security_delay_min"
+CONF_SECURITY_MIN_ON_PERCENT = "security_min_on_percent"
+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"
@@ -102,6 +105,8 @@ ALL_CONF = (
         CONF_TEMP_MIN,
         CONF_TEMP_MAX,
         CONF_SECURITY_DELAY_MIN,
+        CONF_SECURITY_MIN_ON_PERCENT,
+        CONF_SECURITY_DEFAULT_ON_PERCENT,
         CONF_THERMOSTAT_TYPE,
         CONF_THERMOSTAT_SWITCH,
         CONF_THERMOSTAT_CLIMATE,
@@ -125,6 +130,20 @@ SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE
 
 SERVICE_SET_PRESENCE = "set_presence"
 SERVICE_SET_PRESET_TEMPERATURE = "set_preset_temperature"
+SERVICE_SET_SECURITY = "set_security"
+
+DEFAULT_SECURITY_MIN_ON_PERCENT = 0.5
+DEFAULT_SECURITY_DEFAULT_ON_PERCENT = 0.1
+
+
+class EventType(Enum):
+    """The event type that can be sent"""
+
+    SECURITY_EVENT: str = "versatile_thermostat_security_event"
+    POWER_EVENT: str = "versatile_thermostat_power_event"
+    TEMPERATURE_EVENT: str = "versatile_thermostat_temperature_event"
+    HVAC_MODE_EVENT: str = "versatile_thermostat_hvac_mode_event"
+    PRESET_EVENT: str = "versatile_thermostat_preset_event"
 
 
 class UnknownEntity(HomeAssistantError):

custom_components/versatile_thermostat/prop_algorithm.py

@@ -37,8 +37,11 @@ class PropAlgorithm:
         self._cycle_min = cycle_min
         self._minimal_activation_delay = minimal_activation_delay
         self._on_percent = 0
+        self._calculated_on_percent = 0
         self._on_time_sec = 0
         self._off_time_sec = self._cycle_min * 60
+        self._security = False
+        self._default_on_percent = 0
 
     def calculate(
         self, target_temp: float, current_temp: float, ext_current_temp: float
@@ -48,7 +51,7 @@ class PropAlgorithm:
             _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
             )
-            self._on_percent = 0
+            self._calculated_on_percent = 0
         else:
             delta_temp = target_temp - current_temp
             delta_ext_temp = (
@@ -56,7 +59,7 @@ class PropAlgorithm:
             )
 
             if self._function == PROPORTIONAL_FUNCTION_TPI:
-                self._on_percent = (
+                self._calculated_on_percent = (
                     self._tpi_coef_int * delta_temp
                     + self._tpi_coef_ext * delta_ext_temp
                 )
@@ -65,13 +68,42 @@ class PropAlgorithm:
                     "Proportional algorithm: unknown %s function. Heating will be disabled",
                     self._function,
                 )
-                self._on_percent = 0
+                self._calculated_on_percent = 0
+
+        self._calculate_internal()
+
+        _LOGGER.debug(
+            "heating percent calculated for current_temp %.1f, ext_current_temp %.1f and target_temp %.1f is %.2f, on_time is %d (sec), off_time is %d (sec)",  # pylint: disable=line-too-long
+            current_temp if current_temp else -9999.0,
+            ext_current_temp if ext_current_temp else -9999.0,
+            target_temp if target_temp else -9999.0,
+            self._calculated_on_percent,
+            self.on_time_sec,
+            self.off_time_sec,
+        )
+
+    def _calculate_internal(self):
+        """Finish the calculation to get the on_percent in seconds"""
 
         # calculated on_time duration in seconds
-        if self._on_percent > 1:
-            self._on_percent = 1
-        if self._on_percent < 0:
-            self._on_percent = 0
+        if self._calculated_on_percent > 1:
+            self._calculated_on_percent = 1
+        if self._calculated_on_percent < 0:
+            self._calculated_on_percent = 0
+
+        if self._security:
+            _LOGGER.debug(
+                "Security is On using the default_on_percent %f",
+                self._default_on_percent,
+            )
+            self._on_percent = self._default_on_percent
+        else:
+            _LOGGER.debug(
+                "Security is Off using the calculated_on_percent %f",
+                self._calculated_on_percent,
+            )
+            self._on_percent = self._calculated_on_percent
+
         self._on_time_sec = self._on_percent * self._cycle_min * 60
 
         # Do not heat for less than xx sec
@@ -92,21 +124,31 @@ class PropAlgorithm:
 
         self._off_time_sec = self._cycle_min * 60 - self._on_time_sec
 
-        _LOGGER.debug(
-            "heating percent calculated for current_temp %.1f, ext_current_temp %.1f and target_temp %.1f is %.2f, on_time is %d (sec), off_time is %d (sec)",  # pylint: disable=line-too-long
-            current_temp if current_temp else -9999.0,
-            ext_current_temp if ext_current_temp else -9999.0,
-            target_temp if target_temp else -9999.0,
-            self._on_percent,
-            self.on_time_sec,
-            self.off_time_sec,
-        )
+    def set_security(self, default_on_percent: float):
+        """Set a default value for on_percent (used for security mode)"""
+        self._security = True
+        self._default_on_percent = default_on_percent
+        self._calculate_internal()
+
+    def unset_security(self):
+        """Unset the security mode"""
+        self._security = False
+        self._calculate_internal()
 
     @property
     def on_percent(self) -> float:
-        """Returns the percentage the heater must be ON (1 means the heater will be always on, 0 never on)"""  # pylint: disable=line-too-long
+        """Returns the percentage the heater must be ON
+        In security mode this value is overriden with the _default_on_percent
+        (1 means the heater will be always on, 0 never on)"""  # pylint: disable=line-too-long
         return round(self._on_percent, 2)
 
+    @property
+    def calculated_on_percent(self) -> float:
+        """Returns the calculated percentage the heater must be ON
+        Calculated means NOT overriden even in security mode
+        (1 means the heater will be always on, 0 never on)"""  # pylint: disable=line-too-long
+        return round(self._calculated_on_percent, 2)
+
     @property
     def on_time_sec(self) -> int:
         """Returns the calculated time in sec the heater must be ON"""

custom_components/versatile_thermostat/requirements_dev.txt

@@ -0,0 +1 @@
+homeassistant

custom_components/versatile_thermostat/requirements_test.txt

@@ -0,0 +1,3 @@
+# -r requirements_dev.txt
+# aiodiscover
+pytest-homeassistant-custom-component

custom_components/versatile_thermostat/services.yaml

@@ -1,69 +1,117 @@
 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"
+    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

custom_components/versatile_thermostat/strings.json

@@ -89,7 +89,9 @@
         "description": "Configuration of advanced parameters. Leave the default values if you don't know what you are doing.\nThis parameters can lead to a very bad temperature or power regulation.",
         "data": {
           "minimal_activation_delay": "Delay in secondes under which the equipment will not be activated",
-          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state"
+          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state",
+          "security_min_on_percent": "Minimal heating percent value for security preset activation. Below this amount of on_percent the thermostat won't go into security preset",
+          "security_default_on_percent": "The default heating percent value in security preset. Set to 0 to switch off heater in security present"
         }
       }
     },
@@ -190,7 +192,9 @@
         "description": "Configuration of advanced parameters. Leave the default values if you don't know what you are doing.\nThis parameters can lead to a very bad temperature or power regulation.",
         "data": {
           "minimal_activation_delay": "Delay in secondes under which the equipment will not be activated",
-          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state"
+          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a security off state",
+          "security_min_on_percent": "Minimal heating percent value for security preset activation. Below this amount of on_percent the thermostat won't go into security preset",
+          "security_default_on_percent": "The default heating percent value in security preset. Set to 0 to switch off heater in security present"
         }
       }
     },
@@ -213,13 +217,27 @@
   "entity": {
     "climate": {
       "versatile_thermostat": {
-        "states_attributes": {
+        "state_attributes": {
           "preset_mode": {
-            "power": "Shedding",
-            "security": "Security"
+            "state": {
+              "power": "Shedding",
+              "security": "Security",
+              "none": "Manual"
+            }
           }
         }
       }
     }
+  },
+  "state_attributes": {
+    "_": {
+      "preset_mode": {
+        "state": {
+          "power": "Shedding",
+          "security": "Security",
+          "none": "Manual"
+        }
+      }
+    }
   }
 }

custom_components/versatile_thermostat/tests/__init__.py

@@ -0,0 +1 @@
+""" To make this repo a module """

custom_components/versatile_thermostat/tests/commons.py

@@ -0,0 +1,116 @@
+""" Some common resources """
+from unittest.mock import patch
+
+from homeassistant.core import HomeAssistant, Event, EVENT_STATE_CHANGED, State
+from homeassistant.const import UnitOfTemperature
+
+from homeassistant.config_entries import ConfigEntryState
+from pytest_homeassistant_custom_component.common import MockConfigEntry
+from homeassistant.helpers.entity_component import EntityComponent
+
+from ..climate import VersatileThermostat
+from ..const import DOMAIN, PRESET_SECURITY, PRESET_POWER, EventType
+
+from homeassistant.components.climate import (
+    ClimateEntity,
+    DOMAIN as CLIMATE_DOMAIN,
+    ATTR_PRESET_MODE,
+    HVACMode,
+    HVACAction,
+)
+
+from .const import (
+    MOCK_TH_OVER_SWITCH_USER_CONFIG,
+    MOCK_TH_OVER_CLIMATE_USER_CONFIG,
+    MOCK_TH_OVER_SWITCH_TYPE_CONFIG,
+    MOCK_TH_OVER_CLIMATE_TYPE_CONFIG,
+    MOCK_TH_OVER_SWITCH_TPI_CONFIG,
+    MOCK_PRESETS_CONFIG,
+    MOCK_WINDOW_CONFIG,
+    MOCK_MOTION_CONFIG,
+    MOCK_POWER_CONFIG,
+    MOCK_PRESENCE_CONFIG,
+    MOCK_ADVANCED_CONFIG,
+    # MOCK_DEFAULT_FEATURE_CONFIG,
+    PRESET_BOOST,
+    PRESET_COMFORT,
+    PRESET_NONE,
+    PRESET_ECO,
+    PRESET_ACTIVITY,
+)
+
+FULL_SWITCH_CONFIG = (
+    MOCK_TH_OVER_SWITCH_USER_CONFIG
+    | MOCK_TH_OVER_SWITCH_TYPE_CONFIG
+    | MOCK_TH_OVER_SWITCH_TPI_CONFIG
+    | MOCK_PRESETS_CONFIG
+    | MOCK_WINDOW_CONFIG
+    | MOCK_MOTION_CONFIG
+    | MOCK_POWER_CONFIG
+    | MOCK_PRESENCE_CONFIG
+    | MOCK_ADVANCED_CONFIG
+)
+
+PARTIAL_CLIMATE_CONFIG = (
+    MOCK_TH_OVER_CLIMATE_USER_CONFIG
+    | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG
+    | MOCK_PRESETS_CONFIG
+    | MOCK_ADVANCED_CONFIG
+)
+
+
+class MockClimate(ClimateEntity):
+    """A Mock Climate class used for Underlying climate mode"""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat."""
+
+        super().__init__()
+
+        self._hass = hass
+        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_modes = [HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT]
+        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
+
+
+async def create_thermostat(
+    hass: HomeAssistant, entry: MockConfigEntry, entity_id: str
+) -> VersatileThermostat:
+    """Creates and return a TPI Thermostat"""
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.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
+
+        entity = find_my_entity(entity_id)
+
+        return entity
+
+
+async def send_temperature_change_event(entity: VersatileThermostat, new_temp, date):
+    """Sending a new temperature event simulating a change on temperature sensor"""
+    temp_event = Event(
+        EVENT_STATE_CHANGED,
+        {
+            "new_state": State(
+                entity_id=entity.entity_id,
+                state=new_temp,
+                last_changed=date,
+                last_updated=date,
+            )
+        },
+    )
+    await entity._async_temperature_changed(temp_event)

custom_components/versatile_thermostat/tests/conftest.py

@@ -0,0 +1,80 @@
+"""Global fixtures for integration_blueprint integration."""
+# 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.
+# Fixtures can either be passed into tests as parameters, or if autouse=True, they
+# will automatically be used across all tests.
+#
+# Fixtures that are defined in conftest.py are available across all tests. You can also
+# define fixtures within a particular test file to scope them locally.
+#
+# pytest_homeassistant_custom_component provides some fixtures that are provided by
+# Home Assistant core. You can find those fixture definitions here:
+# https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/master/pytest_homeassistant_custom_component/common.py
+#
+# See here for more info: https://docs.pytest.org/en/latest/fixture.html (note that
+# pytest includes fixtures OOB which you can use as defined on this page)
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.core import HomeAssistant, StateMachine
+
+from custom_components.versatile_thermostat.config_flow import (
+    VersatileThermostatBaseConfigFlow,
+)
+
+from custom_components.versatile_thermostat.climate import (
+    VersatileThermostat,
+)
+
+pytest_plugins = "pytest_homeassistant_custom_component"
+
+
+# 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):
+    yield
+
+
+# This fixture is used to prevent HomeAssistant from attempting to create and dismiss persistent
+# notifications. These calls would fail without this fixture since the persistent_notification
+# integration is never loaded during a test.
+@pytest.fixture(name="skip_notifications", autouse=True)
+def skip_notifications_fixture():
+    """Skip notification calls."""
+    with patch("homeassistant.components.persistent_notification.async_create"), patch(
+        "homeassistant.components.persistent_notification.async_dismiss"
+    ):
+        yield
+
+
+# This fixture is used to bypass the validate_input function in config_flow
+# NOT USED Now (keeped for memory)
+@pytest.fixture(name="skip_validate_input")
+def skip_validate_input_fixture():
+    """Skip the validate_input in config flow"""
+    with patch.object(VersatileThermostatBaseConfigFlow, "validate_input"):
+        yield
+
+
+@pytest.fixture(name="skip_hass_states_get")
+def skip_hass_states_get_fixture():
+    """Skip the get state in HomeAssistant"""
+    with patch.object(StateMachine, "get"):
+        yield
+
+
+@pytest.fixture(name="skip_hass_states_is_state")
+def skip_hass_states_is_state_fixture():
+    """Skip the is_state in HomeAssistant"""
+    with patch.object(StateMachine, "is_state", return_value=False):
+        yield
+
+
+@pytest.fixture(name="skip_send_event")
+def skip_send_event_fixture():
+    """Skip the send_event in VersatileThermostat"""
+    with patch.object(VersatileThermostat, "send_event"):
+        yield

custom_components/versatile_thermostat/tests/const.py

@@ -0,0 +1,129 @@
+from homeassistant.components.climate.const import (
+    PRESET_BOOST,
+    PRESET_COMFORT,
+    PRESET_ECO,
+    PRESET_NONE,
+    PRESET_ACTIVITY,
+)
+from custom_components.versatile_thermostat.const import (
+    CONF_NAME,
+    CONF_HEATER,
+    CONF_THERMOSTAT_CLIMATE,
+    CONF_THERMOSTAT_SWITCH,
+    CONF_THERMOSTAT_TYPE,
+    CONF_TEMP_SENSOR,
+    CONF_EXTERNAL_TEMP_SENSOR,
+    CONF_CYCLE_MIN,
+    CONF_TEMP_MAX,
+    CONF_TEMP_MIN,
+    CONF_PROP_FUNCTION,
+    PROPORTIONAL_FUNCTION_TPI,
+    CONF_TPI_COEF_INT,
+    CONF_TPI_COEF_EXT,
+    CONF_MINIMAL_ACTIVATION_DELAY,
+    CONF_SECURITY_DELAY_MIN,
+    CONF_SECURITY_MIN_ON_PERCENT,
+    CONF_SECURITY_DEFAULT_ON_PERCENT,
+    CONF_USE_WINDOW_FEATURE,
+    CONF_USE_MOTION_FEATURE,
+    CONF_USE_POWER_FEATURE,
+    CONF_USE_PRESENCE_FEATURE,
+    CONF_WINDOW_SENSOR,
+    CONF_WINDOW_DELAY,
+    CONF_MOTION_SENSOR,
+    CONF_MOTION_DELAY,
+    CONF_MOTION_PRESET,
+    CONF_NO_MOTION_PRESET,
+    CONF_POWER_SENSOR,
+    CONF_MAX_POWER_SENSOR,
+    CONF_DEVICE_POWER,
+    CONF_PRESET_POWER,
+    CONF_PRESENCE_SENSOR,
+    PRESET_AWAY_SUFFIX,
+    CONF_CLIMATE,
+)
+
+MOCK_TH_OVER_SWITCH_USER_CONFIG = {
+    CONF_NAME: "TheOverSwitchMockName",
+    CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
+    CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+    CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+    CONF_CYCLE_MIN: 5,
+    CONF_TEMP_MIN: 15,
+    CONF_TEMP_MAX: 30,
+    CONF_USE_WINDOW_FEATURE: True,
+    CONF_USE_MOTION_FEATURE: True,
+    CONF_USE_POWER_FEATURE: True,
+    CONF_USE_PRESENCE_FEATURE: True,
+}
+
+MOCK_TH_OVER_CLIMATE_USER_CONFIG = {
+    CONF_NAME: "TheOverClimateMockName",
+    CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
+    CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+    CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+    CONF_CYCLE_MIN: 5,
+    CONF_TEMP_MIN: 15,
+    CONF_TEMP_MAX: 30,
+    # Keep default values which are False
+}
+
+MOCK_TH_OVER_SWITCH_TYPE_CONFIG = {
+    CONF_HEATER: "switch.mock_switch",
+    CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+}
+
+MOCK_TH_OVER_SWITCH_TPI_CONFIG = {
+    CONF_TPI_COEF_INT: 0.3,
+    CONF_TPI_COEF_EXT: 0.1,
+}
+
+MOCK_TH_OVER_CLIMATE_TYPE_CONFIG = {
+    CONF_CLIMATE: "climate.mock_climate",
+}
+
+MOCK_PRESETS_CONFIG = {
+    PRESET_ECO + "_temp": 16,
+    PRESET_COMFORT + "_temp": 17,
+    PRESET_BOOST + "_temp": 18,
+}
+
+MOCK_WINDOW_CONFIG = {
+    CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
+    CONF_WINDOW_DELAY: 10,
+}
+
+MOCK_MOTION_CONFIG = {
+    CONF_MOTION_SENSOR: "input_boolean.motion_sensor",
+    CONF_MOTION_DELAY: 10,
+    CONF_MOTION_PRESET: PRESET_COMFORT,
+    CONF_NO_MOTION_PRESET: PRESET_ECO,
+}
+
+MOCK_POWER_CONFIG = {
+    CONF_POWER_SENSOR: "sensor.power_sensor",
+    CONF_MAX_POWER_SENSOR: "sensor.power_max_sensor",
+    CONF_DEVICE_POWER: 1,
+    CONF_PRESET_POWER: 10,
+}
+
+MOCK_PRESENCE_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,
+}
+
+MOCK_ADVANCED_CONFIG = {
+    CONF_MINIMAL_ACTIVATION_DELAY: 10,
+    CONF_SECURITY_DELAY_MIN: 5,
+    CONF_SECURITY_MIN_ON_PERCENT: 0.4,
+    CONF_SECURITY_DEFAULT_ON_PERCENT: 0.3,
+}
+
+MOCK_DEFAULT_FEATURE_CONFIG = {
+    CONF_USE_WINDOW_FEATURE: False,
+    CONF_USE_MOTION_FEATURE: False,
+    CONF_USE_POWER_FEATURE: False,
+    CONF_USE_PRESENCE_FEATURE: False,
+}

custom_components/versatile_thermostat/tests/test_config_flow.py

@@ -0,0 +1,223 @@
+""" Test the Versatile Thermostat config flow """
+
+from homeassistant import data_entry_flow
+from homeassistant.core import HomeAssistant
+from homeassistant.config_entries import SOURCE_USER, ConfigEntry
+
+import pytest
+from pytest_homeassistant_custom_component.common import MockConfigEntry, load_fixture
+
+from custom_components.versatile_thermostat.const import DOMAIN
+from custom_components.versatile_thermostat import VersatileThermostatAPI
+
+from .const import (
+    MOCK_TH_OVER_SWITCH_USER_CONFIG,
+    MOCK_TH_OVER_CLIMATE_USER_CONFIG,
+    MOCK_TH_OVER_SWITCH_TYPE_CONFIG,
+    MOCK_TH_OVER_CLIMATE_TYPE_CONFIG,
+    MOCK_TH_OVER_SWITCH_TPI_CONFIG,
+    MOCK_PRESETS_CONFIG,
+    MOCK_WINDOW_CONFIG,
+    MOCK_MOTION_CONFIG,
+    MOCK_POWER_CONFIG,
+    MOCK_PRESENCE_CONFIG,
+    MOCK_ADVANCED_CONFIG,
+    MOCK_DEFAULT_FEATURE_CONFIG,
+)
+
+
+async def test_show_form(hass: HomeAssistant) -> None:
+    """Test that the form is served with no input"""
+    # Init the API
+    # hass.data["custom_components"] = None
+    # loader.async_get_custom_components(hass)
+    # VersatileThermostatAPI(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == SOURCE_USER
+
+
+async def test_user_config_flow_over_switch(hass, skip_hass_states_get):
+    """Test the config flow with all thermostat_over_switch features"""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == SOURCE_USER
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_TH_OVER_SWITCH_USER_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "type"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_TH_OVER_SWITCH_TYPE_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "tpi"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_TH_OVER_SWITCH_TPI_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "presets"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        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"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_ADVANCED_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert (
+        result["data"]
+        == MOCK_TH_OVER_SWITCH_USER_CONFIG
+        | MOCK_TH_OVER_SWITCH_TYPE_CONFIG
+        | MOCK_TH_OVER_SWITCH_TPI_CONFIG
+        | MOCK_PRESETS_CONFIG
+        | MOCK_WINDOW_CONFIG
+        | MOCK_MOTION_CONFIG
+        | MOCK_POWER_CONFIG
+        | MOCK_PRESENCE_CONFIG
+        | MOCK_ADVANCED_CONFIG
+    )
+    assert result["result"]
+    assert result["result"].domain == DOMAIN
+    assert result["result"].version == 1
+    assert result["result"].title == "TheOverSwitchMockName"
+    assert isinstance(result["result"], ConfigEntry)
+
+
+async def test_user_config_flow_over_climate(hass, skip_hass_states_get):
+    """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}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == SOURCE_USER
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_TH_OVER_CLIMATE_USER_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "type"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_TH_OVER_CLIMATE_TYPE_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "presets"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        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"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=MOCK_ADVANCED_CONFIG
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert (
+        result["data"]
+        == MOCK_TH_OVER_CLIMATE_USER_CONFIG
+        | MOCK_TH_OVER_CLIMATE_TYPE_CONFIG
+        | MOCK_PRESETS_CONFIG
+        | MOCK_ADVANCED_CONFIG
+        | MOCK_DEFAULT_FEATURE_CONFIG
+    )
+    assert result["result"]
+    assert result["result"].domain == DOMAIN
+    assert result["result"].version == 1
+    assert result["result"].title == "TheOverClimateMockName"
+    assert isinstance(result["result"], ConfigEntry)

custom_components/versatile_thermostat/tests/test_security.py

@@ -0,0 +1,180 @@
+""" Test the Security featrure """
+from unittest.mock import patch, call
+
+from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+
+from datetime import timedelta, datetime
+import logging
+
+logging.getLogger().setLevel(logging.DEBUG)
+
+
+async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):
+    """Test the security feature and https://github.com/jmcollin78/versatile_thermostat/issues/49:
+    1. creates a thermostat and check that security is off
+    2. activate security feature when date is expired
+    3. change the preset to boost
+    4. check that security is still on
+    5. resolve the date issue
+    6. check that security is off and preset is changed to boost
+    """
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data={
+            "name": "TheOverSwitchMockName",
+            "thermostat_type": "thermostat_over_switch",
+            "temperature_sensor_entity_id": "sensor.mock_temp_sensor",
+            "external_temperature_sensor_entity_id": "sensor.mock_ext_temp_sensor",
+            "cycle_min": 5,
+            "temp_min": 15,
+            "temp_max": 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            "use_window_feature": False,
+            "use_motion_feature": False,
+            "use_power_feature": False,
+            "use_presence_feature": False,
+            "heater_entity_id": "switch.mock_switch",
+            "proportional_function": "tpi",
+            "tpi_coef_int": 0.3,
+            "tpi_coef_ext": 0.01,
+            "minimal_activation_delay": 30,
+            "security_delay_min": 5,  # 5 minutes
+            "security_min_on_percent": 0.2,
+            "security_default_on_percent": 0.1,
+        },
+    )
+
+    # 1. creates a thermostat and check that security is off
+    now: datetime = datetime.now()
+    entity: VersatileThermostat = await create_thermostat(
+        hass, entry, "climate.theoverswitchmockname"
+    )
+    assert entity
+
+    assert entity._security_state is False
+    assert entity.preset_mode is not PRESET_SECURITY
+    assert entity.preset_modes == [
+        PRESET_NONE,
+        PRESET_ECO,
+        PRESET_COMFORT,
+        PRESET_BOOST,
+    ]
+    assert entity._last_ext_temperature_mesure is not None
+    assert entity._last_temperature_mesure is not None
+    assert (entity._last_temperature_mesure - now).total_seconds() < 1
+    assert (entity._last_ext_temperature_mesure - now).total_seconds() < 1
+
+    # set a preset
+    assert entity.preset_mode is PRESET_NONE
+    await entity.async_set_preset_mode(PRESET_COMFORT)
+    assert entity.preset_mode is PRESET_COMFORT
+
+    # Turn On the thermostat
+    assert entity.hvac_mode == HVACMode.OFF
+    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.climate.VersatileThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_heater_turn_on"
+    ) as mock_heater_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)
+        assert entity._security_state is True
+        assert entity.preset_mode == PRESET_SECURITY
+        assert entity._saved_preset_mode == PRESET_COMFORT
+        assert entity._prop_algorithm.on_percent == 0.1
+        assert entity._prop_algorithm.calculated_on_percent == 0.9
+
+        assert mock_send_event.call_count == 3
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_SECURITY}),
+                call.send_event(
+                    EventType.TEMPERATURE_EVENT,
+                    {
+                        "last_temperature_mesure": event_timestamp.isoformat(),
+                        "last_ext_temperature_mesure": entity._last_ext_temperature_mesure.isoformat(),
+                        "current_temp": 15,
+                        "current_ext_temp": None,
+                        "target_temp": 18,
+                    },
+                ),
+                call.send_event(
+                    EventType.SECURITY_EVENT,
+                    {
+                        "type": "start",
+                        "last_temperature_mesure": event_timestamp.isoformat(),
+                        "last_ext_temperature_mesure": entity._last_ext_temperature_mesure.isoformat(),
+                        "current_temp": 15,
+                        "current_ext_temp": None,
+                        "target_temp": 18,
+                    },
+                ),
+            ],
+            any_order=True,
+        )
+
+        assert mock_heater_on.call_count == 1
+
+    # 3. Change the preset to Boost (we should stay in SECURITY)
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_heater_turn_on"
+    ) as mock_heater_on:
+        await entity.async_set_preset_mode(PRESET_BOOST)
+
+        # 4. check that security is still on
+        assert entity._security_state is True
+        assert entity._prop_algorithm.on_percent == 0.1
+        assert entity._prop_algorithm.calculated_on_percent == 0.9
+        assert entity._saved_preset_mode == PRESET_BOOST
+        assert entity.preset_mode is PRESET_SECURITY
+
+    # 5. resolve the datetime issue
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_heater_turn_on"
+    ) as mock_heater_on:
+        event_timestamp = datetime.now()
+
+        # set temperature to 15 so that on_percent will be > security_min_on_percent (0.2)
+        await send_temperature_change_event(entity, 15.2, event_timestamp)
+
+        assert entity._security_state is False
+        assert entity.preset_mode == PRESET_BOOST
+        assert entity._saved_preset_mode == PRESET_BOOST
+        assert entity._prop_algorithm.on_percent == 1.0
+        assert entity._prop_algorithm.calculated_on_percent == 1.0
+
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_BOOST}),
+                call.send_event(
+                    EventType.SECURITY_EVENT,
+                    {
+                        "type": "end",
+                        "last_temperature_mesure": event_timestamp.isoformat(),
+                        "last_ext_temperature_mesure": entity._last_ext_temperature_mesure.isoformat(),
+                        "current_temp": 15.2,
+                        "current_ext_temp": None,
+                        "target_temp": 19,
+                    },
+                ),
+            ],
+            any_order=True,
+        )
+
+        assert mock_heater_on.call_count == 0

custom_components/versatile_thermostat/tests/test_start.py

@@ -0,0 +1,145 @@
+""" Test the normal start of a Thermostat """
+from unittest.mock import patch, call
+
+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 ..climate import VersatileThermostat
+
+from .commons import *
+
+
+async def test_over_switch_full_start(hass: HomeAssistant, skip_hass_states_is_state):
+    """Test the normal full start of a thermostat in thermostat_over_switch type"""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data=FULL_SWITCH_CONFIG,
+    )
+
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.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
+
+        entity: VersatileThermostat = find_my_entity("climate.theoverswitchmockname")
+
+        assert entity
+
+        assert entity.name == "TheOverSwitchMockName"
+        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
+        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
+        assert entity._window_state is None
+        assert entity._motion_state is None
+        assert entity._presence_state is None
+        assert entity._prop_algorithm is not 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},
+                ),
+            ]
+        )
+
+
+async def test_over_climate_full_start(hass: HomeAssistant, skip_hass_states_is_state):
+    """Test the normal full start of a thermostat in thermostat_over_climate type"""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data=PARTIAL_CLIMATE_CONFIG,
+    )
+
+    fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {})
+
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.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.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
+        assert entity._window_state is None
+        assert entity._motion_state is None
+        assert entity._presence_state is 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("climate.mock_climate")
+        mock_find_climate.assert_has_calls(
+            [call.find_underlying_entity("climate.mock_climate")]
+        )

custom_components/versatile_thermostat/tests/test_tpi.py

@@ -0,0 +1,81 @@
+""" Test the TPI algorithm """
+
+from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+
+
+async def test_tpi_calculation(hass: HomeAssistant, skip_hass_states_is_state):
+    """Test the TPI calculation"""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data={
+            "name": "TheOverSwitchMockName",
+            "thermostat_type": "thermostat_over_switch",
+            "temperature_sensor_entity_id": "sensor.mock_temp_sensor",
+            "external_temperature_sensor_entity_id": "sensor.mock_ext_temp_sensor",
+            "cycle_min": 5,
+            "temp_min": 15,
+            "temp_max": 30,
+            "use_window_feature": False,
+            "use_motion_feature": False,
+            "use_power_feature": False,
+            "use_presence_feature": False,
+            "heater_entity_id": "switch.mock_switch",
+            "proportional_function": "tpi",
+            "tpi_coef_int": 0.3,
+            "tpi_coef_ext": 0.01,
+            "minimal_activation_delay": 30,
+            "security_delay_min": 5,
+            "security_default_on_percent": 0.3,
+        },
+    )
+
+    entity: VersatileThermostat = await create_thermostat(
+        hass, entry, "climate.theoverswitchmockname"
+    )
+    assert entity
+
+    tpi_algo = entity._prop_algorithm
+    assert tpi_algo
+
+    tpi_algo.calculate(15, 10, 7)
+    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
+
+    tpi_algo.calculate(15, 14, 5)
+    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)
+    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)
+    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)
+    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)
+    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

custom_components/versatile_thermostat/translations/en.json

@@ -89,7 +89,9 @@
         "description": "Configuration of advanced parameters. Leave the default values if you don't know what you are doing.\nThis parameters can lead to a very bad temperature or power regulation.",
         "data": {
           "minimal_activation_delay": "Delay in secondes under which the equipment will not be activated",
-          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state"
+          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state",
+          "security_min_on_percent": "Minimal heating percent value for security preset activation. Below this amount of on_percent the thermostat won't go into security preset",
+          "security_default_on_percent": "The default heating percent value in security preset. Set to 0 to switch off heater in security present"
         }
       }
     },
@@ -190,7 +192,9 @@
         "description": "Configuration of advanced parameters. Leave the default values if you don't know what you are doing.\nThis parameters can lead to a very bad temperature or power regulation.",
         "data": {
           "minimal_activation_delay": "Delay in secondes under which the equipment will not be activated",
-          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state"
+          "security_delay_min": "Maximum allowed delay in minutes between two temperature mesures. Above this delay, the thermostat will turn to a sceurity off state",
+          "security_min_on_percent": "Minimal heating percent value for security preset activation. Below this amount of on_percent the thermostat won't go into security preset",
+          "security_default_on_percent": "The default heating percent value in security preset. Set to 0 to switch off heater in security present"
         }
       }
     },
@@ -213,13 +217,27 @@
   "entity": {
     "climate": {
       "versatile_thermostat": {
-        "states_attributes": {
+        "state_attributes": {
           "preset_mode": {
-            "power": "Shedding",
-            "security": "Security"
+            "state": {
+              "power": "Shedding",
+              "security": "Security",
+              "none": "Manual"
+            }
           }
         }
       }
     }
+  },
+  "state_attributes": {
+    "_": {
+      "preset_mode": {
+        "state": {
+          "power": "Shedding",
+          "security": "Security",
+          "none": "Manual"
+        }
+      }
+    }
   }
 }

custom_components/versatile_thermostat/translations/fr.json

@@ -87,8 +87,10 @@
         "title": "Parameters avancés",
         "description": "Configuration des paramètres avancés. Laissez les valeurs par défaut si vous ne savez pas ce que vous faites.\nCes paramètres peuvent induire des mauvais comportements du thermostat.",
         "data": {
-          "minimal_activation_delay": "Délai en seondes en-dessous duquel l'équipement ne sera pas activé",
-          "security_delay_min": "Délai maximal autorisé en minutes entre 2 mesures de températures. Au-dessus de ce délai, le thermostat se mettra en position éteinte de sécurité"
+          "minimal_activation_delay": "Délai en secondes en-dessous duquel l'équipement ne sera pas activé",
+          "security_delay_min": "Délai maximal autorisé en minutes entre 2 mesures de températures. Au-dessus de ce délai, le thermostat se mettra en position éteinte de sécurité",
+          "security_min_on_percent": "Seuil minimal de pourcentage de chauffage en-dessous duquel le préréglage sécurité ne sera jamais activé",
+          "security_default_on_percent": "Valeur par défaut pour le pourcentage de chauffage en mode sécurité. Mettre 0 pour éteindre le radiateur en mode sécurité"
         }
       }
     },
@@ -190,7 +192,9 @@
         "description": "Configuration des paramètres avancés. Laissez les valeurs par défaut si vous ne savez pas ce que vous faites.\nCes paramètres peuvent induire des mauvais comportements du thermostat.",
         "data": {
           "minimal_activation_delay": "Délai en seondes en-dessous duquel l'équipement ne sera pas activé",
-          "security_delay_min": "Délai maximal autorisé en minutes entre 2 mesures de températures. Au-dessus de ce délai, le thermostat se mettra en position éteinte de sécurité"
+          "security_delay_min": "Délai maximal autorisé en minutes entre 2 mesures de températures. Au-dessus de ce délai, le thermostat se mettra en position éteinte de sécurité",
+          "security_min_on_percent": "Seuil minimal de pourcentage de chauffage en-dessous duquel le préréglage sécurité ne sera jamais activé",
+          "security_default_on_percent": "Valeur par défaut pour le pourcentage de chauffage en mode sécurité. Mettre 0 pour éteindre le radiateur en mode sécurité"
         }
       }
     },
@@ -213,13 +217,27 @@
   "entity": {
     "climate": {
       "versatile_thermostat": {
-        "states_attributes": {
+        "state_attributes": {
           "preset_mode": {
-            "power": "Délestage",
-            "security": "Sécurité"
+            "state": {
+              "power": "Délestage",
+              "security": "Sécurité",
+              "none": "Manuel"
+            }
           }
         }
       }
     }
+  },
+  "state_attributes": {
+    "_": {
+      "preset_mode": {
+        "state": {
+          "power": "Délestage",
+          "security": "Sécurité",
+          "none": "Manuel"
+        }
+      }
+    }
   }
 }