Issue #103 - expose preset temp pour AC mode

without these parenthesis the `action` and therefore returned `hvac_action` seems to be `True` instead of i.e. `heating`
(did not see that when using an underlying homekit devices climate device, but when the underlying was a generic thermostat)

.devcontainer/configuration.yaml

@@ -1,196 +1,196 @@
 default_config:
 
 logger:
-  default: info
-  logs:
-    custom_components.versatile_thermostat: info
-    custom_components.versatile_thermostat.underlyings: debug
-    custom_components.versatile_thermostat.climate: debug
+    default: info
+    logs:
+        custom_components.versatile_thermostat: debug
+        custom_components.versatile_thermostat.underlyings: debug
+        custom_components.versatile_thermostat.climate: debug
 
 # If you need to debug uncommment the line below (doc: https://www.home-assistant.io/integrations/debugpy/)
 debugpy:
-  start: true
-  wait: false
-  port: 5678
+    start: true
+    wait: false
+    port: 5678
 
 input_number:
-  fake_temperature_sensor1:
-    name: Temperature
-    min: 0
-    max: 35
-    step: .1
-    icon: mdi:thermometer
-    unit_of_measurement: °C
-    mode: box
-  fake_external_temperature_sensor1:
-    name: Ext Temperature
-    min: -10
-    max: 35
-    step: .1
-    icon: mdi:home-thermometer
-    unit_of_measurement: °C
-    mode: box
-  fake_current_power:
-    name: Current power
-    min: 0
-    max: 1000
-    step: 10
-    icon: mdi:flash
-    unit_of_measurement: kW
-  fake_current_power_max:
-    name: Current power max threshold
-    min: 0
-    max: 1000
-    step: 10
-    icon: mdi:flash
-    unit_of_measurement: kW
+    fake_temperature_sensor1:
+        name: Temperature
+        min: 0
+        max: 35
+        step: .1
+        icon: mdi:thermometer
+        unit_of_measurement: °C
+        mode: box
+    fake_external_temperature_sensor1:
+        name: Ext Temperature
+        min: -10
+        max: 35
+        step: .1
+        icon: mdi:home-thermometer
+        unit_of_measurement: °C
+        mode: box
+    fake_current_power:
+        name: Current power
+        min: 0
+        max: 1000
+        step: 10
+        icon: mdi:flash
+        unit_of_measurement: kW
+    fake_current_power_max:
+        name: Current power max threshold
+        min: 0
+        max: 1000
+        step: 10
+        icon: mdi:flash
+        unit_of_measurement: kW
 
 input_boolean:
-  # input_boolean to simulate the windows entity. Only for development environment.
-  fake_window_sensor1:
-    name: Window 1
-    icon: mdi:window-closed-variant
-  # input_boolean to simulate the heater entity switch. Only for development environment.
-  fake_heater_switch3:
-    name: Heater 3
-    icon: mdi:radiator
-  fake_heater_switch2:
-    name: Heater 2
-    icon: mdi:radiator
-  fake_heater_switch1:
-    name: Heater 1
-    icon: mdi:radiator
-  fake_heater_4switch1:
-    name: Heater (multiswitch1)
-    icon: mdi:radiator
-  fake_heater_4switch2:
-    name: Heater (multiswitch2)
-    icon: mdi:radiator
-  fake_heater_4switch3:
-    name: Heater (multiswitch3)
-    icon: mdi:radiator
-  fake_heater_4switch4:
-    name: Heater (multiswitch4)
-    icon: mdi:radiator
-  # input_boolean to simulate the motion sensor entity. Only for development environment.
-  fake_motion_sensor1:
-    name: Motion Sensor 1
-    icon: mdi:run
-  # input_boolean to simulate the presence sensor entity. Only for development environment.
-  fake_presence_sensor1:
-    name: Presence Sensor 1
-    icon: mdi:home
+    # input_boolean to simulate the windows entity. Only for development environment.
+    fake_window_sensor1:
+        name: Window 1
+        icon: mdi:window-closed-variant
+    # input_boolean to simulate the heater entity switch. Only for development environment.
+    fake_heater_switch3:
+        name: Heater 3
+        icon: mdi:radiator
+    fake_heater_switch2:
+        name: Heater 2
+        icon: mdi:radiator
+    fake_heater_switch1:
+        name: Heater 1
+        icon: mdi:radiator
+    fake_heater_4switch1:
+        name: Heater (multiswitch1)
+        icon: mdi:radiator
+    fake_heater_4switch2:
+        name: Heater (multiswitch2)
+        icon: mdi:radiator
+    fake_heater_4switch3:
+        name: Heater (multiswitch3)
+        icon: mdi:radiator
+    fake_heater_4switch4:
+        name: Heater (multiswitch4)
+        icon: mdi:radiator
+    # input_boolean to simulate the motion sensor entity. Only for development environment.
+    fake_motion_sensor1:
+        name: Motion Sensor 1
+        icon: mdi:run
+    # input_boolean to simulate the presence sensor entity. Only for development environment.
+    fake_presence_sensor1:
+        name: Presence Sensor 1
+        icon: mdi:home
 
 climate:
-  - platform: generic_thermostat
-    name: Underlying thermostat1
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat2
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat3
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat4
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat5
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat6
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat7
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat8
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
-  - platform: generic_thermostat
-    name: Underlying thermostat9
-    heater: input_boolean.fake_heater_switch3
-    target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat1
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat2
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat3
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat4
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat5
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat6
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat7
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat8
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
+    - platform: generic_thermostat
+      name: Underlying thermostat9
+      heater: input_boolean.fake_heater_switch3
+      target_sensor: input_number.fake_temperature_sensor1
 
 recorder:
-  include:
-    domains:
-      - input_boolean
-      - input_number
-      - switch
-      - climate
-      - sensor
+    include:
+        domains:
+            - input_boolean
+            - input_number
+            - switch
+            - climate
+            - sensor
 
 template:
-  - binary_sensor:
-      - name: maison_occupee
-        unique_id: maison_occupee
-        state: "{{is_state('person.jmc', 'home') }}"
-        device_class: occupancy
-  - sensor:
-      - name: "Total énergie switch1"
-        unique_id: total_energie_switch1
-        unit_of_measurement: "kWh"
-        device_class: energy
-        state_class: total_increasing
-        state: >
-          {% set energy = state_attr('climate.thermostat_switch_1', 'total_energy') %}
-          {% if energy == 'unavailable' or energy is none%}unavailable{% else %}
-            {{ ((energy | float) / 1.0) | round(2, default=0) }}
-          {% endif %}
-      - name: "Total énergie climate 2"
-        unique_id: total_energie_climate2
-        unit_of_measurement: "kWh"
-        device_class: energy
-        state_class: total_increasing
-        state: >
-          {% set energy = state_attr('climate.thermostat_climate_2', 'total_energy') %}
-          {% if energy == 'unavailable' or energy is none%}unavailable{% else %}
-            {{ ((energy | float) / 1.0) | round(2, default=0) }}
-          {% endif %}
-      - name: "Total énergie chambre"
-        unique_id: total_energie_chambre
-        unit_of_measurement: "kWh"
-        device_class: energy
-        state_class: total_increasing
-        state: >
-          {% set energy = state_attr('climate.thermostat_chambre', 'total_energy') %}
-          {% if energy == 'unavailable' or energy is none%}unavailable{% else %}
-            {{ ((energy | float) / 1.0) | round(2, default=0) }}
-          {% endif %}
+    - binary_sensor:
+          - name: maison_occupee
+            unique_id: maison_occupee
+            state: "{{is_state('person.jmc', 'home') }}"
+            device_class: occupancy
+    - sensor:
+          - name: "Total énergie switch1"
+            unique_id: total_energie_switch1
+            unit_of_measurement: "kWh"
+            device_class: energy
+            state_class: total_increasing
+            state: >
+                {% set energy = state_attr('climate.thermostat_switch_1', 'total_energy') | float(default=-1) %}
+                {% if energy < 0 %}{{none}}{% else %}
+                  {{ energy | round(2, default=0) }}
+                {% endif %}
+          - name: "Total énergie climate 2"
+            unique_id: total_energie_climate2
+            unit_of_measurement: "kWh"
+            device_class: energy
+            state_class: total_increasing
+            state: >
+                {% set energy = state_attr('climate.thermostat_climate_2', 'total_energy') | float(default=-1) %}
+                {% if energy < 0 %}{{none}}{% else %}
+                  {{ energy | round(2, default=0) }}
+                {% endif %}
+          - name: "Total énergie chambre"
+            unique_id: total_energie_chambre
+            unit_of_measurement: "kWh"
+            device_class: energy
+            state_class: total_increasing
+            state: >
+                {% set energy = state_attr('climate.thermostat_chambre', 'total_energy') | float(default=-1) %}
+                {% if energy < 0 %}{{none}}{% else %}
+                  {{ energy | round(2, default=0) }}
+                {% endif %}
 
 switch:
-  - platform: template
-    switches:
-      pilote_sdb_rdc:
-        friendly_name: "Pilote chauffage SDB RDC"
-        value_template: "{{ is_state_attr('switch_seche_serviettes_sdb_rdc', 'sensor_state', 'on') }}"
-        turn_on:
-          service: select.select_option
-          data:
-            option: comfort
-          target:
-            entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode
+    - platform: template
+      switches:
+          pilote_sdb_rdc:
+              friendly_name: "Pilote chauffage SDB RDC"
+              value_template: "{{ is_state_attr('switch_seche_serviettes_sdb_rdc', 'sensor_state', 'on') }}"
+              turn_on:
+                  service: select.select_option
+                  data:
+                      option: comfort
+                  target:
+                      entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode
 
-        turn_off:
-          service: select.select_option
-          data:
-            option: comfort-2
-          target:
-            entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode
+              turn_off:
+                  service: select.select_option
+                  data:
+                      option: comfort-2
+                  target:
+                      entity_id: select.seche_serviettes_sdb_rdc_cable_outlet_mode
 
 frontend:
-  themes:
-    versatile_thermostat_theme:
-      state-binary_sensor-safety-on-color: "#FF0B0B"
-      state-binary_sensor-power-on-color: "#FF0B0B"
-      state-binary_sensor-window-on-color: "rgb(156, 39, 176)"
-      state-binary_sensor-motion-on-color: "rgb(156, 39, 176)"
-      state-binary_sensor-presence-on-color: "lightgreen"
+    themes:
+        versatile_thermostat_theme:
+            state-binary_sensor-safety-on-color: "#FF0B0B"
+            state-binary_sensor-power-on-color: "#FF0B0B"
+            state-binary_sensor-window-on-color: "rgb(156, 39, 176)"
+            state-binary_sensor-motion-on-color: "rgb(156, 39, 176)"
+            state-binary_sensor-presence-on-color: "lightgreen"

custom_components/versatile_thermostat/climate.py

@@ -18,7 +18,7 @@ from homeassistant.core import (
 from homeassistant.components.climate import ClimateEntity
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.entity import DeviceInfo, DeviceEntryType
+from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.reload import async_setup_reload_service
@@ -183,7 +183,7 @@ async def async_setup_entry(
     platform.async_register_entity_service(
         SERVICE_SET_PRESET_TEMPERATURE,
         {
-            vol.Required("preset"): vol.In(CONF_PRESETS),
+            vol.Required("preset"): vol.In(CONF_PRESETS_WITH_AC),
             vol.Optional("temperature"): vol.Coerce(float),
             vol.Optional("temperature_away"): vol.Coerce(float),
         },
@@ -505,7 +505,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         if len(presets):
             self._support_flags = SUPPORT_FLAGS | ClimateEntityFeature.PRESET_MODE
 
-            for key, val in CONF_PRESETS.items():  # TODO before presets.items():
+            for key, val in CONF_PRESETS.items():
                 if val != 0.0:
                     self._attr_preset_modes.append(key)
 
@@ -966,7 +966,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             # else OFF
             one_idle = False
             for under in self._underlyings:
-                if action := under.hvac_action not in [HVACAction.IDLE, HVACAction.OFF]:
+                if (action := under.hvac_action) not in [HVACAction.IDLE, HVACAction.OFF]:
                     return action
                 if under.hvac_action == HVACAction.IDLE:
                     one_idle = True
@@ -1582,6 +1582,8 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         if not new_state:
             return
 
+        new_hvac_mode = new_state.state
+
         old_state = event.data.get("old_state")
         old_hvac_action = (
             old_state.attributes.get("hvac_action")
@@ -1594,16 +1596,21 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             else None
         )
 
+        # Issue 99 - some AC turn hvac_mode=cool and hvac_action=idle when sending a HVACMode_OFF command
+        if self._hvac_mode == HVACMode.OFF and new_hvac_action == HVACAction.IDLE:
+            _LOGGER.debug("The underlying switch to idle instead of OFF. We will consider it as OFF")
+            new_hvac_mode = HVACMode.OFF
+
         _LOGGER.info(
-            "%s - Underlying climate changed. Event.new_state is %s, current_hvac_mode=%s, new_hvac_action=%s, old_hvac_action=%s",
+            "%s - Underlying climate changed. Event.new_hvac_mode is %s, current_hvac_mode=%s, new_hvac_action=%s, old_hvac_action=%s",
             self,
-            new_state,
+            new_hvac_mode,
             self._hvac_mode,
             new_hvac_action,
             old_hvac_action,
         )
 
-        if new_state.state in [
+        if new_hvac_mode in [
             HVACMode.OFF,
             HVACMode.HEAT,
             HVACMode.COOL,
@@ -1611,8 +1618,9 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             HVACMode.DRY,
             HVACMode.AUTO,
             HVACMode.FAN_ONLY,
+            None
         ]:
-            self._hvac_mode = new_state.state
+            self._hvac_mode = new_hvac_mode
 
         # Interpretation of hvac
         HVAC_ACTION_ON = [  # pylint: disable=invalid-name
@@ -1651,6 +1659,11 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 self._underlying_climate_delta_t,
             )
 
+        # Manage new target temperature set
+        if self._is_over_climate and new_state.attributes and (new_target_temp := new_state.attributes.get("temperature")) and new_target_temp != self.target_temperature:
+            _LOGGER.info("%s - Target temp have change to %s", self, new_target_temp)
+            await self.async_set_temperature(temperature = new_target_temp)
+
         self.update_custom_attributes()
         await self._async_control_heating()
 
@@ -2098,9 +2111,18 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             switch_cond,
         )
 
-        ret = False
-        if mode_cond and temp_cond and climate_cond:
-            if not self._security_state:
+        # Issue 99 - a climate is regulated by the device itself and not by VTherm. So a VTherm should never be in security !
+        shouldClimateBeInSecurity = False # temp_cond and climate_cond
+        shouldSwitchBeInSecurity = temp_cond and switch_cond
+        shouldBeInSecurity = shouldClimateBeInSecurity or shouldSwitchBeInSecurity
+
+        shouldStartSecurity = mode_cond and not self._security_state and shouldBeInSecurity
+        # attr_preset_mode is not necessary normaly. It is just here to be sure
+        shouldStopSecurity = self._security_state and not shouldBeInSecurity and self._attr_preset_mode == PRESET_SECURITY
+
+        # Logging and event
+        if shouldStartSecurity:
+            if shouldClimateBeInSecurity:
                 _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",
                     self,
@@ -2109,10 +2131,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                     delta_ext_temp,
                     self.hvac_action,
                 )
-            ret = True
-
-        if mode_cond and temp_cond and switch_cond:
-            if not self._security_state:
+            elif shouldSwitchBeInSecurity:
                 _LOGGER.warning(
                     "%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,
@@ -2122,9 +2141,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                     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,
                 {
@@ -2140,8 +2157,8 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 },
             )
 
-        if not self._security_state and ret:
-            self._security_state = ret
+        if shouldStartSecurity:
+            self._security_state = True
             self.save_hvac_mode()
             self.save_preset_mode()
             await self._async_set_preset_mode_internal(PRESET_SECURITY)
@@ -2167,18 +2184,14 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 },
             )
 
-        if (
-            self._security_state
-            and self._attr_preset_mode == PRESET_SECURITY
-            and not ret
-        ):
+        if shouldStopSecurity:
             _LOGGER.warning(
                 "%s - End of security mode. restoring hvac_mode to %s and preset_mode to %s",
                 self,
                 self._saved_hvac_mode,
                 self._saved_preset_mode,
             )
-            self._security_state = ret
+            self._security_state = False
             # Restore hvac_mode if previously saved
             if self._is_over_climate or self._security_default_on_percent <= 0.0:
                 await self.restore_hvac_mode(False)
@@ -2201,7 +2214,7 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
                 },
             )
 
-        return ret
+        return shouldBeInSecurity
 
     async def _async_control_heating(self, force=False, _=None):
         """The main function used to run the calculation at each cycle"""
@@ -2416,8 +2429,8 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
         """Called by a service call:
         service: versatile_thermostat.set_preset_temperature
         data:
-            temperature: 17.8
             preset: boost
+            temperature: 17.8
             temperature_away: 15
         target:
             entity_id: climate.thermostat_2

custom_components/versatile_thermostat/commons.py

@@ -4,7 +4,8 @@ from datetime import timedelta
 from homeassistant.core import HomeAssistant, callback, Event
 from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.entity import Entity, DeviceInfo, DeviceEntryType
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.helpers.event import async_track_state_change_event, async_call_later
 
 from .climate import VersatileThermostat

custom_components/versatile_thermostat/requirements_dev.txt

@@ -1,2 +1,2 @@
-homeassistant
+homeassistant==2023.10.1
 ffmpeg

custom_components/versatile_thermostat/requirements_test.txt

@@ -1,4 +1,4 @@
-# -r requirements_dev.txt
+-r requirements_dev.txt
 # aiodiscover
 ulid_transform
 pytest-homeassistant-custom-component

custom_components/versatile_thermostat/services.yaml

@@ -1,120 +1,124 @@
 reload:
-  description: Reload all Versatile Thermostat entities.
+    name: Reload
+    description: Reload all Versatile Thermostat entities.
 
 set_presence:
-  name: Set presence
-  description: Force the presence mode in thermostat
-  target:
-    entity:
-      integration: versatile_thermostat
-  fields:
-    presence:
-      name: Presence
-      description: Presence setting
-      required: true
-      advanced: false
-      example: "on"
-      default: "on"
-      selector:
-        select:
-          options:
-            - "on"
-            - "off"
-            - "home"
-            - "not_home"
+    name: Set presence
+    description: Force the presence mode in thermostat
+    target:
+        entity:
+            integration: versatile_thermostat
+    fields:
+        presence:
+            name: Presence
+            description: Presence setting
+            required: true
+            advanced: false
+            example: "on"
+            default: "on"
+            selector:
+                select:
+                    options:
+                        - "on"
+                        - "off"
+                        - "home"
+                        - "not_home"
 
 set_preset_temperature:
-  name: Set temperature preset
-  description: Change the target temperature of a preset
-  target:
-    entity:
-      integration: versatile_thermostat
-  fields:
-    preset:
-      name: Preset
-      description: Preset name
-      required: true
-      advanced: false
-      example: "comfort"
-      selector:
-        select:
-          options:
-            - "eco"
-            - "comfort"
-            - "boost"
-    temperature:
-      name: Temperature when present
-      description: Target temperature for the preset when present
-      required: false
-      advanced: false
-      example: "19.5"
-      default: "17"
-      selector:
-        number:
-          min: 7
-          max: 35
-          step: 0.1
-          unit_of_measurement: °
-          mode: slider
-    temperature_away:
-      name: Temperature when not present
-      description: Target temperature for the preset when not present
-      required: false
-      advanced: false
-      example: "17"
-      default: "15"
-      selector:
-        number:
-          min: 7
-          max: 35
-          step: 0.1
-          unit_of_measurement: °
-          mode: slider
+    name: Set temperature preset
+    description: Change the target temperature of a preset
+    target:
+        entity:
+            integration: versatile_thermostat
+    fields:
+        preset:
+            name: Preset
+            description: Preset name
+            required: true
+            advanced: false
+            example: "comfort"
+            selector:
+                select:
+                    options:
+                        - "eco"
+                        - "comfort"
+                        - "boost"
+                        - "eco_ac"
+                        - "comfort_ac"
+                        - "boost_ac"
+        temperature:
+            name: Temperature when present
+            description: Target temperature for the preset when present
+            required: false
+            advanced: false
+            example: "19.5"
+            default: "17"
+            selector:
+                number:
+                    min: 7
+                    max: 35
+                    step: 0.1
+                    unit_of_measurement: °
+                    mode: slider
+        temperature_away:
+            name: Temperature when not present
+            description: Target temperature for the preset when not present
+            required: false
+            advanced: false
+            example: "17"
+            default: "15"
+            selector:
+                number:
+                    min: 7
+                    max: 35
+                    step: 0.1
+                    unit_of_measurement: °
+                    mode: slider
 
 set_security:
-  name: Set security
-  description: Change the security parameters
-  target:
-    entity:
-      integration: versatile_thermostat
-  fields:
-    delay_min:
-      name: Delay in minutes
-      description: Maximum allowed delay in minutes between two temperature mesures
-      required: false
-      advanced: false
-      example: "30"
-      selector:
-        number:
-          min: 0
-          max: 9999
-          unit_of_measurement: "min"
-          mode: box
-    min_on_percent:
-      name: Minimal on_percent
-      description: Minimal heating percent value for security preset activation
-      required: false
-      advanced: false
-      example: "0.5"
-      default: "0.5"
-      selector:
-        number:
-          min: 0
-          max: 1
-          step: 0.05
-          unit_of_measurement: "%"
-          mode: slider
-    default_on_percent:
-      name: on_percent used in security mode
-      description: The default heating percent value in security preset
-      required: false
-      advanced: false
-      example: "0.1"
-      default: "0.1"
-      selector:
-        number:
-          min: 0
-          max: 1
-          step: 0.05
-          unit_of_measurement: "%"
-          mode: slider
+    name: Set security
+    description: Change the security parameters
+    target:
+        entity:
+            integration: versatile_thermostat
+    fields:
+        delay_min:
+            name: Delay in minutes
+            description: Maximum allowed delay in minutes between two temperature mesures
+            required: false
+            advanced: false
+            example: "30"
+            selector:
+                number:
+                    min: 0
+                    max: 9999
+                    unit_of_measurement: "min"
+                    mode: box
+        min_on_percent:
+            name: Minimal on_percent
+            description: Minimal heating percent value for security preset activation
+            required: false
+            advanced: false
+            example: "0.5"
+            default: "0.5"
+            selector:
+                number:
+                    min: 0
+                    max: 1
+                    step: 0.05
+                    unit_of_measurement: "%"
+                    mode: slider
+        default_on_percent:
+            name: on_percent used in security mode
+            description: The default heating percent value in security preset
+            required: false
+            advanced: false
+            example: "0.1"
+            default: "0.1"
+            selector:
+                number:
+                    min: 0
+                    max: 1
+                    step: 0.05
+                    unit_of_measurement: "%"
+                    mode: slider

custom_components/versatile_thermostat/tests/commons.py

@@ -83,6 +83,32 @@ _LOGGER = logging.getLogger(__name__)
 class MockClimate(ClimateEntity):
     """A Mock Climate class used for Underlying climate mode"""
 
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos, hvac_mode:HVACMode = HVACMode.OFF) -> None:
+        """Initialize the thermostat."""
+
+        super().__init__()
+
+        self.hass = hass
+        self.platform = 'climate'
+        self.entity_id= self.platform+'.'+unique_id
+        self._attr_extra_state_attributes = {}
+        self._unique_id = unique_id
+        self._name = name
+        self._attr_hvac_action = HVACAction.OFF
+        self._attr_hvac_mode = hvac_mode
+        self._attr_hvac_modes = [HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT]
+        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
+        self._attr_target_temperature = 20
+        self._attr_current_temperature = 15
+
+    def set_temperature(self, temperature):
+        """ Set the target temperature"""
+        self._attr_target_temperature = temperature
+        self.async_write_ha_state()
+
+class MockUnavailableClimate(ClimateEntity):
+    """A Mock Climate class used for Underlying climate mode"""
+
     def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
         """Initialize the thermostat."""
 
@@ -92,12 +118,11 @@ class MockClimate(ClimateEntity):
         self._attr_extra_state_attributes = {}
         self._unique_id = unique_id
         self._name = name
-        self._attr_hvac_action = HVACAction.OFF
-        self._attr_hvac_mode = HVACMode.OFF
+        self._attr_hvac_action = None
+        self._attr_hvac_mode = None
         self._attr_hvac_modes = [HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT]
         self._attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-
 class MagicMockClimate(MagicMock):
     """A Magic Mock class for a underlying climate entity"""
 
@@ -455,6 +480,51 @@ async def send_climate_change_event(
         await asyncio.sleep(0.1)
     return ret
 
+async def send_climate_change_event_with_temperature(
+    entity: VersatileThermostat,
+    new_hvac_mode: HVACMode,
+    old_hvac_mode: HVACMode,
+    new_hvac_action: HVACAction,
+    old_hvac_action: HVACAction,
+    date,
+    temperature,
+    sleep=True,
+):
+    """Sending a new climate event simulating a change on the underlying climate state"""
+    _LOGGER.info(
+        "------- Testu: sending send_temperature_change_event, new_hvac_mode=%s old_hvac_mode=%s new_hvac_action=%s old_hvac_action=%s date=%s temperature=%s on %s",
+        new_hvac_mode,
+        old_hvac_mode,
+        new_hvac_action,
+        old_hvac_action,
+        date,
+        temperature,
+        entity,
+    )
+    climate_event = Event(
+        EVENT_STATE_CHANGED,
+        {
+            "new_state": State(
+                entity_id=entity.entity_id,
+                state=new_hvac_mode,
+                attributes={"hvac_action": new_hvac_action, "temperature": temperature},
+                last_changed=date,
+                last_updated=date,
+            ),
+            "old_state": State(
+                entity_id=entity.entity_id,
+                state=old_hvac_mode,
+                attributes={"hvac_action": old_hvac_action},
+                last_changed=date,
+                last_updated=date,
+            ),
+        },
+    )
+    ret = await entity._async_climate_changed(climate_event)
+    if sleep:
+        await asyncio.sleep(0.1)
+    return ret
+
 
 def cancel_switchs_cycles(entity: VersatileThermostat):
     """This method will cancel all running cycle on all underlying switch entity"""

custom_components/versatile_thermostat/tests/test_bugs.py

@@ -1,5 +1,5 @@
 """ Test the Window management """
-from unittest.mock import patch
+from unittest.mock import patch, call
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
 from datetime import datetime, timedelta
 
@@ -343,3 +343,186 @@ async def test_bug_66(
         assert entity.window_state == STATE_OFF
         assert entity.hvac_mode is HVACMode.HEAT
         assert entity.preset_mode is PRESET_BOOST
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_82(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_turn_on_off_heater,
+    skip_send_event,
+):
+    """Test that when a underlying climate is not available the VTherm doesn't go into security mode"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data=PARTIAL_CLIMATE_CONFIG, # 5 minutes security delay
+    )
+
+    fake_underlying_climate = MockUnavailableClimate(hass, "mockUniqueId", "MockClimateName", {})
+
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=fake_underlying_climate,
+    ) as mock_find_climate:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        entity = find_my_entity("climate.theoverclimatemockname")
+
+        assert entity
+
+        assert entity.name == "TheOverClimateMockName"
+        assert entity._is_over_climate is True
+        # assert entity.hvac_action is HVACAction.OFF
+        # assert entity.hvac_mode is HVACMode.OFF
+        assert entity.hvac_mode is None
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_modes == [
+            PRESET_NONE,
+            PRESET_ECO,
+            PRESET_COMFORT,
+            PRESET_BOOST,
+        ]
+        assert entity.preset_mode is PRESET_NONE
+        assert entity._security_state is False
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+        assert mock_find_climate.call_count == 1
+        assert mock_find_climate.mock_calls[0] == call()
+        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
+
+        # Force security mode
+        assert entity._last_ext_temperature_mesure is not None
+        assert entity._last_temperature_mesure is not None
+        assert (entity._last_temperature_mesure.astimezone(tz) - now).total_seconds() < 1
+        assert (
+            entity._last_ext_temperature_mesure.astimezone(tz) - now
+        ).total_seconds() < 1
+
+        # Tries to turns on the Thermostat
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        assert entity.hvac_mode == None
+
+        # 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.underlyings.UnderlyingSwitch.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)
+            # Should stay False
+            assert entity.security_state is False
+            assert entity.preset_mode == 'none'
+            assert entity._saved_preset_mode == 'none'
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_101(
+    hass: HomeAssistant,
+    skip_hass_states_is_state,
+    skip_turn_on_off_heater,
+    skip_send_event,
+):
+    """Test that when a underlying climate target temp is changed, the VTherm change its own temperature target and switch to manual"""
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data=PARTIAL_CLIMATE_CONFIG, # 5 minutes security delay
+    )
+
+    fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {}, HVACMode.HEAT)
+
+    with patch(
+        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+    ) as mock_send_event, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=fake_underlying_climate,
+    ) as mock_find_climate:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        entity = find_my_entity("climate.theoverclimatemockname")
+
+        assert entity
+
+        assert entity.name == "TheOverClimateMockName"
+        assert entity._is_over_climate is True
+        assert entity.hvac_action is HVACAction.OFF
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_mode is PRESET_NONE
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+        assert mock_find_climate.call_count == 1
+        assert mock_find_climate.mock_calls[0] == call()
+        mock_find_climate.assert_has_calls([call.find_underlying_entity()])
+
+        # Force preset mode
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        assert entity.hvac_mode == HVACMode.HEAT
+        await entity.async_set_preset_mode(PRESET_COMFORT)
+        assert entity.preset_mode == PRESET_COMFORT
+
+        # 2. Change the target temp of underlying thermostat
+        await send_climate_change_event_with_temperature(entity, HVACMode.HEAT, HVACMode.HEAT, HVACAction.OFF, HVACAction.OFF, now, 12.75)
+        # Should have been switched to Manual preset
+        assert entity.target_temperature == 12.75
+        assert entity.preset_mode is PRESET_NONE
+
+
+

custom_components/versatile_thermostat/tests/test_security.py

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