Persistence of boiler srv attribute

[#425 ] - Boiler management entities are generated independently of this option selection (#426 )
Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>
2024-03-25 07:25:42 +00:00 · 2024-03-25 08:00:08 +01:00 · 2024-03-23 11:49:09 +01:00 · 2024-03-23 09:07:55 +01:00 · 2024-03-23 08:30:17 +01:00 · 2024-03-23 07:21:18 +01:00
16 changed files with 363 additions and 96 deletions
--- a/custom_components/versatile_thermostat/base_thermostat.py
+++ b/custom_components/versatile_thermostat/base_thermostat.py
@@ -7,7 +7,7 @@ import logging

 from datetime import timedelta, datetime
 from types import MappingProxyType
-from typing import Any
+from typing import Any, TypeVar, Generic

 from homeassistant.util import dt as dt_util
 from homeassistant.core import (
@@ -140,6 +140,7 @@ from .ema import ExponentialMovingAverage

 _LOGGER = logging.getLogger(__name__)
 ConfigData = MappingProxyType[str, Any]
+T = TypeVar("T", bound=UnderlyingEntity)


 def get_tz(hass: HomeAssistant):
@@ -148,7 +149,7 @@ def get_tz(hass: HomeAssistant):
    return dt_util.get_time_zone(hass.config.time_zone)


-class BaseThermostat(ClimateEntity, RestoreEntity):
+class BaseThermostat(ClimateEntity, RestoreEntity, Generic[T]):
    """Representation of a base class for all Versatile Thermostat device."""

    _entity_component_unrecorded_attributes = (
@@ -278,7 +279,7 @@ class BaseThermostat(ClimateEntity, RestoreEntity):

        self._last_change_time = None

-        self._underlyings: list[UnderlyingEntity] = []
+        self._underlyings: list[T] = []

        self._ema_temp = None
        self._ema_algo = None
@@ -2005,13 +2006,17 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
            self._device_power,
        )

-        if self.is_over_climate:
-            power_consumption_max = self._device_power
+        # issue 407 - power_consumption_max is power we need to add. If already active we don't need to add more power
+        if self.is_device_active:
+            power_consumption_max = 0
        else:
-            power_consumption_max = max(
-                self._device_power / self.nb_underlying_entities,
-                self._device_power * self._prop_algorithm.on_percent,
-            )
+            if self.is_over_climate:
+                power_consumption_max = self._device_power
+            else:
+                power_consumption_max = max(
+                    self._device_power / self.nb_underlying_entities,
+                    self._device_power * self._prop_algorithm.on_percent,
+                )

        ret = (self._current_power + power_consumption_max) >= self._current_power_max
        if not self._overpowering_state and ret and self._hvac_mode != HVACMode.OFF:
@@ -2711,4 +2716,4 @@ class BaseThermostat(ClimateEntity, RestoreEntity):
        if self._ac_mode:
            await self.async_set_hvac_mode(HVACMode.COOL)
        else:
-            await self.async_set_hvac_mode(HVACMode.HEATING)
+            await self.async_set_hvac_mode(HVACMode.HEAT)
--- a/custom_components/versatile_thermostat/binary_sensor.py
+++ b/custom_components/versatile_thermostat/binary_sensor.py
@@ -39,6 +39,7 @@ from .const import (
    CONF_USE_WINDOW_FEATURE,
    CONF_THERMOSTAT_TYPE,
    CONF_THERMOSTAT_CENTRAL_CONFIG,
+    CONF_USE_CENTRAL_BOILER_FEATURE,
    CONF_CENTRAL_BOILER_ACTIVATION_SRV,
    CONF_CENTRAL_BOILER_DEACTIVATION_SRV,
    overrides,
@@ -63,10 +64,13 @@ async def async_setup_entry(
    name = entry.data.get(CONF_NAME)
    vt_type = entry.data.get(CONF_THERMOSTAT_TYPE)

+    entities = None
+
    if vt_type == CONF_THERMOSTAT_CENTRAL_CONFIG:
-        entities = [
-            CentralBoilerBinarySensor(hass, unique_id, name, entry.data),
-        ]
+        if entry.data.get(CONF_USE_CENTRAL_BOILER_FEATURE):
+            entities = [
+                CentralBoilerBinarySensor(hass, unique_id, name, entry.data),
+            ]
    else:
        entities = [
            SecurityBinarySensor(hass, unique_id, name, entry.data),
@@ -81,7 +85,8 @@ async def async_setup_entry(
        if entry.data.get(CONF_USE_POWER_FEATURE):
            entities.append(OverpoweringBinarySensor(hass, unique_id, name, entry.data))

-    async_add_entities(entities, True)
+    if entities:
+        async_add_entities(entities, True)


 class SecurityBinarySensor(VersatileThermostatBaseEntity, BinarySensorEntity):
--- a/custom_components/versatile_thermostat/config_flow.py
+++ b/custom_components/versatile_thermostat/config_flow.py
@@ -242,6 +242,14 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
                and infos.get(CONF_PRESENCE_SENSOR, None) is None
            ):
                return False
+
+            if self._infos[CONF_USE_CENTRAL_BOILER_FEATURE] and (
+                not self._infos.get(CONF_CENTRAL_BOILER_ACTIVATION_SRV, False)
+                or len(self._infos.get(CONF_CENTRAL_BOILER_ACTIVATION_SRV)) <= 0
+                or not self._infos.get(CONF_CENTRAL_BOILER_DEACTIVATION_SRV, False)
+                or len(self._infos.get(CONF_CENTRAL_BOILER_DEACTIVATION_SRV)) <= 0
+            ):
+                return False
        else:
            if (
                infos.get(CONF_NAME) is None
@@ -857,6 +865,9 @@ class VersatileThermostatOptionsFlowHandler(
        if not self._infos[CONF_USE_PRESENCE_FEATURE]:
            self._infos[CONF_USE_PRESENCE_CENTRAL_CONFIG] = False
            self._infos[CONF_PRESENCE_SENSOR] = None
+        if not self._infos[CONF_USE_CENTRAL_BOILER_FEATURE]:
+            self._infos[CONF_CENTRAL_BOILER_ACTIVATION_SRV] = None
+            self._infos[CONF_CENTRAL_BOILER_DEACTIVATION_SRV] = None

        _LOGGER.info(
            "Recreating entry %s due to configuration change. New config is now: %s",
--- a/custom_components/versatile_thermostat/keep_alive.py
+++ b/custom_components/versatile_thermostat/keep_alive.py
@@ -24,11 +24,16 @@ class IntervalCaller:
    Convenience wrapper around Home Assistant's `async_track_time_interval` function.
    """

-    def __init__(self, hass: HomeAssistant, interval_sec: int) -> None:
+    def __init__(self, hass: HomeAssistant, interval_sec: float) -> None:
        self._hass = hass
        self._interval_sec = interval_sec
        self._remove_handle: CALLBACK_TYPE | None = None

+    @property
+    def interval_sec(self) -> float:
+        """Return the calling interval in seconds."""
+        return self._interval_sec
+
    def cancel(self):
        """Cancel the regular calls to the action function."""
        if self._remove_handle:
@@ -43,7 +48,11 @@ class IntervalCaller:

        async def callback(_time: datetime):
            try:
-                _LOGGER.debug("Calling keep-alive action")
+                _LOGGER.debug(
+                    "Calling keep-alive action '%s' (%ss interval)",
+                    action.__name__,
+                    self._interval_sec,
+                )
                await action()
            except Exception as e:  # pylint: disable=broad-exception-caught
                _LOGGER.error(e)
--- a/custom_components/versatile_thermostat/manifest.json
+++ b/custom_components/versatile_thermostat/manifest.json
@@ -14,6 +14,6 @@
  "quality_scale": "silver",
  "requirements": [],
  "ssdp": [],
-  "version": "6.0.1",
+  "version": "6.0.2",
  "zeroconf": []
 }
--- a/custom_components/versatile_thermostat/number.py
+++ b/custom_components/versatile_thermostat/number.py
@@ -51,6 +51,7 @@ from .const import (
    CONF_USE_PRESETS_CENTRAL_CONFIG,
    CONF_USE_PRESENCE_CENTRAL_CONFIG,
    CONF_USE_PRESENCE_FEATURE,
+    CONF_USE_CENTRAL_BOILER_FEATURE,
    overrides,
 )

@@ -100,7 +101,7 @@ async def async_setup_entry(
        if not entry.data.get(CONF_USE_PRESETS_CENTRAL_CONFIG, False):
            if entry.data.get(CONF_AC_MODE, False):
                for preset in CONF_PRESETS_WITH_AC_VALUES:
-                    _LOGGER.warning(
+                    _LOGGER.debug(
                        "%s - configuring Number non central, AC, non AWAY for preset %s",
                        name,
                        preset,
@@ -112,7 +113,7 @@ async def async_setup_entry(
                    )
            else:
                for preset in CONF_PRESETS_VALUES:
-                    _LOGGER.warning(
+                    _LOGGER.debug(
                        "%s - configuring Number non central, non AC, non AWAY for preset %s",
                        name,
                        preset,
@@ -128,7 +129,7 @@ async def async_setup_entry(
        ) is True and not entry.data.get(CONF_USE_PRESENCE_CENTRAL_CONFIG, False):
            if entry.data.get(CONF_AC_MODE, False):
                for preset in CONF_PRESETS_AWAY_WITH_AC_VALUES:
-                    _LOGGER.warning(
+                    _LOGGER.debug(
                        "%s - configuring Number non central, AC, AWAY for preset %s",
                        name,
                        preset,
@@ -140,7 +141,7 @@ async def async_setup_entry(
                    )
            else:
                for preset in CONF_PRESETS_AWAY_VALUES:
-                    _LOGGER.warning(
+                    _LOGGER.debug(
                        "%s - configuring Number non central, non AC, AWAY for preset %s",
                        name,
                        preset,
@@ -153,11 +154,12 @@ async def async_setup_entry(

    # For central config only
    else:
-        entities.append(
-            ActivateBoilerThresholdNumber(hass, unique_id, name, entry.data)
-        )
+        if entry.data.get(CONF_USE_CENTRAL_BOILER_FEATURE):
+            entities.append(
+                ActivateBoilerThresholdNumber(hass, unique_id, name, entry.data)
+            )
        for preset in CONF_PRESETS_WITH_AC_VALUES:
-            _LOGGER.warning(
+            _LOGGER.debug(
                "%s - configuring Number central, AC, non AWAY for preset %s",
                name,
                preset,
@@ -169,7 +171,7 @@ async def async_setup_entry(
            )

        for preset in CONF_PRESETS_AWAY_WITH_AC_VALUES:
-            _LOGGER.warning(
+            _LOGGER.debug(
                "%s - configuring Number central, AC, AWAY for preset %s", name, preset
            )
            entities.append(
@@ -178,7 +180,8 @@ async def async_setup_entry(
                )
            )

-    async_add_entities(entities, True)
+    if len(entities) > 0:
+        async_add_entities(entities, True)


 class ActivateBoilerThresholdNumber(
--- a/custom_components/versatile_thermostat/sensor.py
+++ b/custom_components/versatile_thermostat/sensor.py
@@ -79,7 +79,6 @@ async def async_setup_entry(
            entities = [
                NbActiveDeviceForBoilerSensor(hass, unique_id, name, entry.data)
            ]
-            async_add_entities(entities, True)
    else:
        entities = [
            LastTemperatureSensor(hass, unique_id, name, entry.data),
@@ -108,6 +107,7 @@ async def async_setup_entry(
                RegulatedTemperatureSensor(hass, unique_id, name, entry.data)
            )

+    if entities:
        async_add_entities(entities, True)


@@ -730,7 +730,7 @@ class NbActiveDeviceForBoilerSensor(SensorEntity):
                entity.name,
            )
            if (
-                entity.hvac_mode == HVACMode.HEAT
+                entity.hvac_mode in [HVACMode.HEAT, HVACMode.AUTO]
                and entity.hvac_action == HVACAction.HEATING
            ):
                for under in entity.underlying_entities:
--- a/custom_components/versatile_thermostat/strings.json
+++ b/custom_components/versatile_thermostat/strings.json
@@ -14,7 +14,7 @@
      },
      "menu": {
        "title": "Menu",
-        "description": "Configure your thermostat. You will be able to finalize the configuration when all needed parameters are valued.",
+        "description": "Configure your thermostat. You will be able to finalize the configuration when all required parameters are entered.",
        "menu_options": {
          "main": "Main attributes",
          "central_boiler": "Central boiler",
@@ -40,11 +40,11 @@
          "temperature_sensor_entity_id": "Room temperature sensor entity id",
          "external_temperature_sensor_entity_id": "Outdoor temperature sensor entity id",
          "cycle_min": "Cycle duration (minutes)",
-          "temp_min": "Minimal temperature allowed",
-          "temp_max": "Maximal temperature allowed",
+          "temp_min": "Minimum temperature allowed",
+          "temp_max": "Maximum temperature allowed",
          "step_temperature": "Temperature step",
          "device_power": "Device power",
-          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
+          "use_central_mode": "Enable the control by central entity (requires central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_main_central_config": "Use additional central main configuration. Check to use the central main configuration (outdoor temperature, min, max, step, ...).",
          "used_by_controls_central_boiler": "Used by central boiler. Check if this VTherm should have control on the central boiler"
        },
@@ -60,7 +60,7 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm need heating, the boiler will be turned on. If no VTherm needs heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
        }
      },
      "type": {
@@ -84,16 +84,16 @@
          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
-          "auto_regulation_periode_min": "Regulation minimal period",
+          "auto_regulation_periode_min": "Regulation minimum period",
          "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
          "inverse_switch_command": "Inverse switch command",
          "auto_fan_mode": " Auto fan mode"
        },
        "data_description": {
          "heater_entity_id": "Mandatory heater entity id",
-          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not used",
-          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
-          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
+          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not required",
+          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not required",
+          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not required",
          "heater_keep_alive": "Optional heater switch state refresh interval. Leave empty if not required.",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
          "climate_entity_id": "Underlying climate entity id",
@@ -129,7 +129,7 @@
      },
      "presets": {
        "title": "Presets",
-        "description": "Check if the thermostat will use central presets. Uncheck and the thermostat will have its own preset entities",
+        "description": "Select if the thermostat will use central preset - deselect for the thermostat to have its own presets",
        "data": {
          "use_presets_central_config": "Use central presets configuration"
        }
@@ -152,8 +152,8 @@
          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
          "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
          "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
-          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
-          "window_action": "Action to do if window is deteted as open"
+          "use_window_central_config": "Select to use the central window configuration. Deselect to use a specific window configuration for this VTherm",
+          "window_action": "Action to perform if window is deteted as open"
        }
      },
      "motion": {
@@ -178,7 +178,7 @@
      },
      "power": {
        "title": "Power management",
-        "description": "Power management attributes.\nGives the power and max power sensor of your home.\nThen specify the power consumption of the heater when on.\nAll sensors and device power should have the same unit (kW or W).",
+        "description": "Power management attributes.\nGives the power and max power sensor of your home.\nSpecify the power consumption of the heater when on.\nAll sensors and device power should use the same unit (kW or W).",
        "data": {
          "power_sensor_entity_id": "Power",
          "max_power_sensor_entity_id": "Max power",
@@ -197,7 +197,7 @@
        "description": "Presence management attributes.\nGives the a presence sensor of your home (true is someone is present) and give the corresponding temperature preset setting.",
        "data": {
          "presence_sensor_entity_id": "Presence sensor",
-          "use_presence_central_config": "Use central presence temperature configuration. Uncheck to use specific temperature entities"
+          "use_presence_central_config": "Use central presence temperature configuration. Deselect to use specific temperature entities"
        },
        "data_description": {
          "presence_sensor_entity_id": "Presence sensor entity id"
@@ -207,16 +207,16 @@
        "title": "Advanced parameters",
        "description": "Configuration of advanced parameters. Leave the default values if you don't know what you are doing.\nThese parameters can lead to very poor temperature control or bad power regulation.",
        "data": {
-          "minimal_activation_delay": "Minimal activation delay",
+          "minimal_activation_delay": "Minimum activation delay",
          "security_delay_min": "Safety delay (in minutes)",
-          "security_min_on_percent": "Minimal power percent to enable safety mode",
+          "security_min_on_percent": "Minimum power percent to enable safety mode",
          "security_default_on_percent": "Power percent to use in safety mode",
          "use_advanced_central_config": "Use central advanced configuration"
        },
        "data_description": {
          "minimal_activation_delay": "Delay in seconds under which the equipment will not be activated",
          "security_delay_min": "Maximum allowed delay in minutes between two temperature measurements. Above this delay the thermostat will turn to a safety off state",
-          "security_min_on_percent": "Minimal heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
+          "security_min_on_percent": "Minimum heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
@@ -226,7 +226,7 @@
      "unknown": "Unexpected error",
      "unknown_entity": "Unknown entity id",
      "window_open_detection_method": "Only one window open detection method should be used. Use either window sensor or automatic detection through temperature threshold but not both",
-      "no_central_config": "You cannot check 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it."
+      "no_central_config": "You cannot select 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it."
    },
    "abort": {
      "already_configured": "Device is already configured"
@@ -246,7 +246,7 @@
      },
      "menu": {
        "title": "Menu",
-        "description": "Configure your thermostat. You will be able to finalize the configuration when all needed parameters are valued.",
+        "description": "Configure your thermostat. You will be able to finalize the configuration when all required parameters are entered.",
        "menu_options": {
          "main": "Main attributes",
          "central_boiler": "Central boiler",
@@ -272,11 +272,11 @@
          "temperature_sensor_entity_id": "Room temperature sensor entity id",
          "external_temperature_sensor_entity_id": "Outdoor temperature sensor entity id",
          "cycle_min": "Cycle duration (minutes)",
-          "temp_min": "Minimal temperature allowed",
-          "temp_max": "Maximal temperature allowed",
+          "temp_min": "Minimum temperature allowed",
+          "temp_max": "Maximum temperature allowed",
          "step_temperature": "Temperature step",
          "device_power": "Device power",
-          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
+          "use_central_mode": "Enable the control by central entity (requires central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_main_central_config": "Use additional central main configuration. Check to use the central main configuration (outdoor temperature, min, max, step, ...).",
          "used_by_controls_central_boiler": "Used by central boiler. Check if this VTherm should have control on the central boiler"
        },
@@ -292,7 +292,7 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm need heating, the boiler will be turned on. If no VTherm needs heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
        }
      },
      "type": {
@@ -316,7 +316,7 @@
          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
-          "auto_regulation_periode_min": "Regulation minimal period",
+          "auto_regulation_periode_min": "Regulation minimum period",
          "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
          "inverse_switch_command": "Inverse switch command",
          "auto_fan_mode": " Auto fan mode"
@@ -439,16 +439,16 @@
        "title": "Advanced - {name}",
        "description": "Advanced parameters. Leave the default values if you don't know what you are doing.\nThese parameters can lead to very poor temperature control or bad power regulation.",
        "data": {
-          "minimal_activation_delay": "Minimal activation delay",
+          "minimal_activation_delay": "Minimum activation delay",
          "security_delay_min": "Safety delay (in minutes)",
-          "security_min_on_percent": "Minimal power percent to enable safety mode",
+          "security_min_on_percent": "Minimum power percent to enable safety mode",
          "security_default_on_percent": "Power percent to use in safety mode",
          "use_advanced_central_config": "Use central advanced configuration"
        },
        "data_description": {
          "minimal_activation_delay": "Delay in seconds under which the equipment will not be activated",
          "security_delay_min": "Maximum allowed delay in minutes between two temperature measurements. Above this delay the thermostat will turn to a safety off state",
-          "security_min_on_percent": "Minimal heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
+          "security_min_on_percent": "Minimum heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
@@ -572,4 +572,4 @@
      }
    }
  }
-}
+}
--- a/custom_components/versatile_thermostat/thermostat_climate.py
+++ b/custom_components/versatile_thermostat/thermostat_climate.py
@@ -58,7 +58,7 @@ from .underlyings import UnderlyingClimate
 _LOGGER = logging.getLogger(__name__)


-class ThermostatOverClimate(BaseThermostat):
+class ThermostatOverClimate(BaseThermostat[UnderlyingClimate]):
    """Representation of a base class for a Versatile Thermostat over a climate"""

    _auto_regulation_mode: str | None = None
--- a/custom_components/versatile_thermostat/thermostat_switch.py
+++ b/custom_components/versatile_thermostat/thermostat_switch.py
@@ -27,7 +27,7 @@ from .prop_algorithm import PropAlgorithm
 _LOGGER = logging.getLogger(__name__)


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

    _entity_component_unrecorded_attributes = (
@@ -136,11 +136,11 @@ class ThermostatOverSwitch(BaseThermostat):
        """Custom attributes"""
        super().update_custom_attributes()

+        under0: UnderlyingSwitch = self._underlyings[0]
        self._attr_extra_state_attributes["is_over_switch"] = self.is_over_switch
        self._attr_extra_state_attributes["is_inversed"] = self.is_inversed
-        self._attr_extra_state_attributes["underlying_switch_0"] = self._underlyings[
-            0
-        ].entity_id
+        self._attr_extra_state_attributes["keep_alive_sec"] = under0.keep_alive_sec
+        self._attr_extra_state_attributes["underlying_switch_0"] = under0.entity_id
        self._attr_extra_state_attributes["underlying_switch_1"] = (
            self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
        )
--- a/custom_components/versatile_thermostat/thermostat_valve.py
+++ b/custom_components/versatile_thermostat/thermostat_valve.py
@@ -31,7 +31,7 @@ from .underlyings import UnderlyingValve
 _LOGGER = logging.getLogger(__name__)


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

    _entity_component_unrecorded_attributes = (
--- a/custom_components/versatile_thermostat/translations/en.json
+++ b/custom_components/versatile_thermostat/translations/en.json
@@ -14,7 +14,7 @@
      },
      "menu": {
        "title": "Menu",
-        "description": "Configure your thermostat. You will be able to finalize the configuration when all needed parameters are valued.",
+        "description": "Configure your thermostat. You will be able to finalize the configuration when all required parameters are entered.",
        "menu_options": {
          "main": "Main attributes",
          "central_boiler": "Central boiler",
@@ -40,11 +40,11 @@
          "temperature_sensor_entity_id": "Room temperature sensor entity id",
          "external_temperature_sensor_entity_id": "Outdoor temperature sensor entity id",
          "cycle_min": "Cycle duration (minutes)",
-          "temp_min": "Minimal temperature allowed",
-          "temp_max": "Maximal temperature allowed",
+          "temp_min": "Minimum temperature allowed",
+          "temp_max": "Maximum temperature allowed",
          "step_temperature": "Temperature step",
          "device_power": "Device power",
-          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
+          "use_central_mode": "Enable the control by central entity (requires central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_main_central_config": "Use additional central main configuration. Check to use the central main configuration (outdoor temperature, min, max, step, ...).",
          "used_by_controls_central_boiler": "Used by central boiler. Check if this VTherm should have control on the central boiler"
        },
@@ -60,7 +60,7 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm need heating, the boiler will be turned on. If no VTherm needs heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
        }
      },
      "type": {
@@ -84,16 +84,16 @@
          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
-          "auto_regulation_periode_min": "Regulation minimal period",
+          "auto_regulation_periode_min": "Regulation minimum period",
          "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
          "inverse_switch_command": "Inverse switch command",
          "auto_fan_mode": " Auto fan mode"
        },
        "data_description": {
          "heater_entity_id": "Mandatory heater entity id",
-          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not used",
-          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not used",
-          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not used",
+          "heater_entity2_id": "Optional 2nd Heater entity id. Leave empty if not required",
+          "heater_entity3_id": "Optional 3rd Heater entity id. Leave empty if not required",
+          "heater_entity4_id": "Optional 4th Heater entity id. Leave empty if not required",
          "heater_keep_alive": "Optional heater switch state refresh interval. Leave empty if not required.",
          "proportional_function": "Algorithm to use (TPI is the only one for now)",
          "climate_entity_id": "Underlying climate entity id",
@@ -129,7 +129,7 @@
      },
      "presets": {
        "title": "Presets",
-        "description": "Check if the thermostat will use central presets. Uncheck and the thermostat will have its own preset entities",
+        "description": "Select if the thermostat will use central preset - deselect for the thermostat to have its own presets",
        "data": {
          "use_presets_central_config": "Use central presets configuration"
        }
@@ -152,8 +152,8 @@
          "window_auto_open_threshold": "Recommended value: between 3 and 10. Leave empty if automatic window open detection is not used",
          "window_auto_close_threshold": "Recommended value: 0. Leave empty if automatic window open detection is not used",
          "window_auto_max_duration": "Recommended value: 60 (one hour). Leave empty if automatic window open detection is not used",
-          "use_window_central_config": "Check to use the central window configuration. Uncheck to use a specific window configuration for this VTherm",
-          "window_action": "Action to do if window is deteted as open"
+          "use_window_central_config": "Select to use the central window configuration. Deselect to use a specific window configuration for this VTherm",
+          "window_action": "Action to perform if window is deteted as open"
        }
      },
      "motion": {
@@ -178,7 +178,7 @@
      },
      "power": {
        "title": "Power management",
-        "description": "Power management attributes.\nGives the power and max power sensor of your home.\nThen specify the power consumption of the heater when on.\nAll sensors and device power should have the same unit (kW or W).",
+        "description": "Power management attributes.\nGives the power and max power sensor of your home.\nSpecify the power consumption of the heater when on.\nAll sensors and device power should use the same unit (kW or W).",
        "data": {
          "power_sensor_entity_id": "Power",
          "max_power_sensor_entity_id": "Max power",
@@ -197,7 +197,7 @@
        "description": "Presence management attributes.\nGives the a presence sensor of your home (true is someone is present) and give the corresponding temperature preset setting.",
        "data": {
          "presence_sensor_entity_id": "Presence sensor",
-          "use_presence_central_config": "Use central presence temperature configuration. Uncheck to use specific temperature entities"
+          "use_presence_central_config": "Use central presence temperature configuration. Deselect to use specific temperature entities"
        },
        "data_description": {
          "presence_sensor_entity_id": "Presence sensor entity id"
@@ -207,16 +207,16 @@
        "title": "Advanced parameters",
        "description": "Configuration of advanced parameters. Leave the default values if you don't know what you are doing.\nThese parameters can lead to very poor temperature control or bad power regulation.",
        "data": {
-          "minimal_activation_delay": "Minimal activation delay",
+          "minimal_activation_delay": "Minimum activation delay",
          "security_delay_min": "Safety delay (in minutes)",
-          "security_min_on_percent": "Minimal power percent to enable safety mode",
+          "security_min_on_percent": "Minimum power percent to enable safety mode",
          "security_default_on_percent": "Power percent to use in safety mode",
          "use_advanced_central_config": "Use central advanced configuration"
        },
        "data_description": {
          "minimal_activation_delay": "Delay in seconds under which the equipment will not be activated",
          "security_delay_min": "Maximum allowed delay in minutes between two temperature measurements. Above this delay the thermostat will turn to a safety off state",
-          "security_min_on_percent": "Minimal heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
+          "security_min_on_percent": "Minimum heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
@@ -226,7 +226,7 @@
      "unknown": "Unexpected error",
      "unknown_entity": "Unknown entity id",
      "window_open_detection_method": "Only one window open detection method should be used. Use either window sensor or automatic detection through temperature threshold but not both",
-      "no_central_config": "You cannot check 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it."
+      "no_central_config": "You cannot select 'use central configuration' because no central configuration was found. You need to create a Versatile Thermostat of type 'Central Configuration' to use it."
    },
    "abort": {
      "already_configured": "Device is already configured"
@@ -246,7 +246,7 @@
      },
      "menu": {
        "title": "Menu",
-        "description": "Configure your thermostat. You will be able to finalize the configuration when all needed parameters are valued.",
+        "description": "Configure your thermostat. You will be able to finalize the configuration when all required parameters are entered.",
        "menu_options": {
          "main": "Main attributes",
          "central_boiler": "Central boiler",
@@ -272,11 +272,11 @@
          "temperature_sensor_entity_id": "Room temperature sensor entity id",
          "external_temperature_sensor_entity_id": "Outdoor temperature sensor entity id",
          "cycle_min": "Cycle duration (minutes)",
-          "temp_min": "Minimal temperature allowed",
-          "temp_max": "Maximal temperature allowed",
+          "temp_min": "Minimum temperature allowed",
+          "temp_max": "Maximum temperature allowed",
          "step_temperature": "Temperature step",
          "device_power": "Device power",
-          "use_central_mode": "Enable the control by central entity (need central config). Check to enable the control of the VTherm with the select central_mode entities.",
+          "use_central_mode": "Enable the control by central entity (requires central config). Check to enable the control of the VTherm with the select central_mode entities.",
          "use_main_central_config": "Use additional central main configuration. Check to use the central main configuration (outdoor temperature, min, max, step, ...).",
          "used_by_controls_central_boiler": "Used by central boiler. Check if this VTherm should have control on the central boiler"
        },
@@ -292,7 +292,7 @@
          "use_motion_feature": "Use motion detection",
          "use_power_feature": "Use power management",
          "use_presence_feature": "Use presence detection",
-          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm need heating, the boiler will be turned on. If no VTherm needs heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
+          "use_central_boiler_feature": "Use a central boiler. Check to add a control to your central boiler. You will have to configure the VTherm which will have a control of the central boiler after seecting this checkbox to take effect. If one VTherm requires heating, the boiler will be turned on. If no VTherm requires heating, the boiler will be turned off. Commands for turning on/off the central boiler are given in the related configuration page"
        }
      },
      "type": {
@@ -316,7 +316,7 @@
          "valve_entity4_id": "4th valve number",
          "auto_regulation_mode": "Self-regulation",
          "auto_regulation_dtemp": "Regulation threshold",
-          "auto_regulation_periode_min": "Regulation minimal period",
+          "auto_regulation_periode_min": "Regulation minimum period",
          "auto_regulation_use_device_temp": "Use internal temperature of the underlying",
          "inverse_switch_command": "Inverse switch command",
          "auto_fan_mode": " Auto fan mode"
@@ -439,16 +439,16 @@
        "title": "Advanced - {name}",
        "description": "Advanced parameters. Leave the default values if you don't know what you are doing.\nThese parameters can lead to very poor temperature control or bad power regulation.",
        "data": {
-          "minimal_activation_delay": "Minimal activation delay",
+          "minimal_activation_delay": "Minimum activation delay",
          "security_delay_min": "Safety delay (in minutes)",
-          "security_min_on_percent": "Minimal power percent to enable safety mode",
+          "security_min_on_percent": "Minimum power percent to enable safety mode",
          "security_default_on_percent": "Power percent to use in safety mode",
          "use_advanced_central_config": "Use central advanced configuration"
        },
        "data_description": {
          "minimal_activation_delay": "Delay in seconds under which the equipment will not be activated",
          "security_delay_min": "Maximum allowed delay in minutes between two temperature measurements. Above this delay the thermostat will turn to a safety off state",
-          "security_min_on_percent": "Minimal heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
+          "security_min_on_percent": "Minimum heating percent value for safety preset activation. Below this amount of power percent the thermostat won't go into safety preset",
          "security_default_on_percent": "The default heating power percent value in safety preset. Set to 0 to switch off heater in safety preset",
          "use_advanced_central_config": "Check to use the central advanced configuration. Uncheck to use a specific advanced configuration for this VTherm"
        }
@@ -572,4 +572,4 @@
      }
    }
  }
-}
+}
--- a/custom_components/versatile_thermostat/underlyings.py
+++ b/custom_components/versatile_thermostat/underlyings.py
@@ -188,7 +188,7 @@ class UnderlyingSwitch(UnderlyingEntity):
        thermostat: Any,
        switch_entity_id: str,
        initial_delay_sec: int,
-        keep_alive_sec: int,
+        keep_alive_sec: float,
    ) -> None:
        """Initialize the underlying switch"""

@@ -217,6 +217,11 @@ class UnderlyingSwitch(UnderlyingEntity):
        """Tells if the switch command should be inversed"""
        return self._thermostat.is_inversed

+    @property
+    def keep_alive_sec(self) -> float:
+        """Return the switch keep-alive interval in seconds."""
+        return self._keep_alive.interval_sec
+
    @overrides
    def startup(self):
        super().startup()
--- a/tests/test_bugs.py
+++ b/tests/test_bugs.py
@@ -1,7 +1,9 @@
 # pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long

 """ Test the Window management """
-from unittest.mock import patch, call
+import asyncio
+
+from unittest.mock import patch, call, PropertyMock
 from datetime import datetime, timedelta

 import logging
@@ -718,3 +720,207 @@ async def test_bug_272(
                ),
            ]
        )
+
+
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_bug_407(hass: HomeAssistant, skip_hass_states_is_state):
+    """Test the followin case in power management:
+    1. a heater is active (heating). So the power consumption takes the heater power into account. We suppose the power consumption is near the threshold,
+    2. the user switch preset let's say from Comfort to Boost,
+    3. expected: no shredding should occur because the heater was already active,
+    4. constated: the heater goes into shredding.
+
+    """
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverSwitchMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverSwitchMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_SWITCH,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 19,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: True,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_HEATER: "switch.mock_switch",
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.3,
+            CONF_TPI_COEF_EXT: 0.01,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_POWER_SENSOR: "sensor.mock_power_sensor",
+            CONF_MAX_POWER_SENSOR: "sensor.mock_power_max_sensor",
+            CONF_DEVICE_POWER: 100,
+            CONF_PRESET_POWER: 12,
+        },
+    )
+
+    entity: ThermostatOverSwitch = await create_thermostat(
+        hass, entry, "climate.theoverswitchmockname"
+    )
+    assert entity
+
+    tpi_algo = entity._prop_algorithm
+    assert tpi_algo
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    await send_temperature_change_event(entity, 16, now)
+    await send_ext_temperature_change_event(entity, 10, now)
+
+    # 1. An already active heater will not switch to overpowering
+    with patch(
+        "homeassistant.core.ServiceRegistry.async_call"
+    ) as mock_service_call, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
+        return_value=True,
+    ):
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        await entity.async_set_preset_mode(PRESET_COMFORT)
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_COMFORT
+        assert entity.overpowering_state is None
+        assert entity.target_temperature == 18
+        # waits that the heater starts
+        await asyncio.sleep(0.1)
+        assert mock_service_call.call_count >= 1
+        assert entity.is_device_active is True
+
+        # Send power max mesurement
+        await send_max_power_change_event(entity, 110, datetime.now())
+        # Send power mesurement (theheater is already in the power measurement)
+        await send_power_change_event(entity, 100, datetime.now())
+        # No overpowering yet
+        assert await entity.check_overpowering() is False
+        # All configuration is complete and power is < power_max
+        assert entity.preset_mode is PRESET_COMFORT
+        assert entity.overpowering_state is False
+        assert entity.is_device_active is True
+
+    # 2. An already active heater that switch preset will not switch to overpowering
+    with patch(
+        "homeassistant.core.ServiceRegistry.async_call"
+    ) as mock_service_call, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
+        return_value=True,
+    ):
+        # change preset to Boost
+        await entity.async_set_preset_mode(PRESET_BOOST)
+        # waits that the heater starts
+        await asyncio.sleep(0.1)
+
+        assert await entity.check_overpowering() is False
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_BOOST
+        assert entity.overpowering_state is False
+        assert entity.target_temperature == 19
+        assert mock_service_call.call_count >= 1
+
+    # 3. if heater is stopped (is_device_active==False), then overpowering should be started
+    with patch(
+        "homeassistant.core.ServiceRegistry.async_call"
+    ) as mock_service_call, patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
+        return_value=False,
+    ):
+        # change preset to Boost
+        await entity.async_set_preset_mode(PRESET_COMFORT)
+        # waits that the heater starts
+        await asyncio.sleep(0.1)
+
+        assert await entity.check_overpowering() is True
+        assert entity.hvac_mode is HVACMode.HEAT
+        assert entity.preset_mode is PRESET_POWER
+        assert entity.overpowering_state is True
+
+
+async def test_bug_339(
+    hass: HomeAssistant,
+    # skip_hass_states_is_state,
+    init_central_config_with_boiler_fixture,
+):
+    """Test that the counter of active Vtherm in central boiler is
+    correctly updated with underlying is in auto and device is active
+    """
+
+    api = VersatileThermostatAPI.get_vtherm_api(hass)
+
+    climate1 = MockClimate(
+        hass=hass,
+        unique_id="climate1",
+        name="theClimate1",
+        hvac_mode=HVACMode.AUTO,
+        hvac_modes=[HVACMode.AUTO, HVACMode.OFF, HVACMode.HEAT, HVACMode.COOL],
+        hvac_action=HVACAction.HEATING,
+    )
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverClimateMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverClimateMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_CLIMATE,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 8,
+            CONF_TEMP_MAX: 18,
+            "frost_temp": 10,
+            "eco_temp": 17,
+            "comfort_temp": 18,
+            "boost_temp": 21,
+            CONF_USE_WINDOW_FEATURE: False,
+            CONF_USE_MOTION_FEATURE: False,
+            CONF_USE_POWER_FEATURE: False,
+            CONF_USE_PRESENCE_FEATURE: False,
+            CONF_CLIMATE: climate1.entity_id,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_SECURITY_DEFAULT_ON_PERCENT: 0.1,
+            CONF_USE_MAIN_CENTRAL_CONFIG: True,
+            CONF_USE_PRESETS_CENTRAL_CONFIG: True,
+            CONF_USE_ADVANCED_CENTRAL_CONFIG: True,
+            CONF_USED_BY_CENTRAL_BOILER: True,
+        },
+    )
+
+    with patch(
+        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
+        return_value=climate1,
+    ):
+        entity: ThermostatOverValve = await create_thermostat(
+            hass, entry, "climate.theoverclimatemockname"
+        )
+        assert entity
+        assert entity.name == "TheOverClimateMockName"
+        assert entity.is_over_climate
+        assert entity.underlying_entities[0].entity_id == "climate.climate1"
+        assert api.nb_active_device_for_boiler_threshold == 1
+
+    await entity.async_set_hvac_mode(HVACMode.AUTO)
+    # Simulate a state change in underelying
+    await api.nb_active_device_for_boiler_entity.calculate_nb_active_devices(None)
+
+    # The VTherm should be active
+    assert entity.underlying_entity(0).is_device_active is True
+    assert entity.is_device_active is True
+    assert api.nb_active_device_for_boiler == 1
+
+    entity.remove_thermostat()
--- a/tests/test_central_config.py
+++ b/tests/test_central_config.py
@@ -94,8 +94,8 @@ async def test_add_a_central_config(hass: HomeAssistant, skip_hass_states_is_sta
    assert api.nb_active_device_for_boiler_entity is None
    assert api.nb_active_device_for_boiler is None

-    assert api.nb_active_device_for_boiler_threshold_entity is not None
-    assert api.nb_active_device_for_boiler_threshold == 1  # the default value
+    assert api.nb_active_device_for_boiler_threshold_entity is None
+    assert api.nb_active_device_for_boiler_threshold is None


 # @pytest.mark.parametrize("expected_lingering_tasks", [True])
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -168,6 +168,7 @@ async def test_window_management_time_enough(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=False,
    ):
        await send_temperature_change_event(entity, 15, datetime.now())
@@ -188,6 +189,7 @@ async def test_window_management_time_enough(
        "homeassistant.helpers.condition.state", return_value=True
    ) as mock_condition, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        await send_window_change_event(entity, True, False, datetime.now())
@@ -216,6 +218,7 @@ async def test_window_management_time_enough(
        "homeassistant.helpers.condition.state", return_value=True
    ) as mock_condition, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=False,
    ):
        try_function = await send_window_change_event(
@@ -319,6 +322,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -341,6 +345,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -514,6 +519,7 @@ async def test_window_auto_fast_and_sensor(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -536,6 +542,7 @@ async def test_window_auto_fast_and_sensor(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -646,6 +653,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
    ) as mock_set_hvac_mode, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -689,7 +697,8 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
        "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
    ) as mock_set_hvac_mode, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
-        return_value=False,
+        new_callable=PropertyMock,
+        return_value=True,
    ):
        # simulate the expiration of the delay
        await dearm_window_auto(None)
@@ -783,6 +792,7 @@ async def test_window_auto_no_on_percent(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -805,6 +815,7 @@ async def test_window_auto_no_on_percent(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -890,6 +901,7 @@ async def test_window_bypass(hass: HomeAssistant, skip_hass_states_is_state):
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=False,
    ):
        await send_temperature_change_event(entity, 15, datetime.now())
@@ -916,6 +928,7 @@ async def test_window_bypass(hass: HomeAssistant, skip_hass_states_is_state):
        "homeassistant.helpers.condition.state", return_value=True
    ) as mock_condition, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        await send_window_change_event(entity, True, False, datetime.now())
@@ -941,6 +954,7 @@ async def test_window_bypass(hass: HomeAssistant, skip_hass_states_is_state):
        "homeassistant.helpers.condition.state", return_value=True
    ) as mock_condition, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=False,
    ):
        try_function = await send_window_change_event(
@@ -1038,6 +1052,7 @@ async def test_window_auto_bypass(hass: HomeAssistant, skip_hass_states_is_state
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -1062,6 +1077,7 @@ async def test_window_auto_bypass(hass: HomeAssistant, skip_hass_states_is_state
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -1145,6 +1161,7 @@ async def test_window_bypass_reactivate(hass: HomeAssistant, skip_hass_states_is
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=False,
    ):
        await send_temperature_change_event(entity, 15, datetime.now())
@@ -1165,6 +1182,7 @@ async def test_window_bypass_reactivate(hass: HomeAssistant, skip_hass_states_is
        "homeassistant.helpers.condition.state", return_value=True
    ) as mock_condition, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        await send_window_change_event(entity, True, False, datetime.now())
@@ -1191,6 +1209,7 @@ async def test_window_bypass_reactivate(hass: HomeAssistant, skip_hass_states_is
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=False,
    ):
        await entity.service_set_window_bypass_state(True)
@@ -1588,6 +1607,7 @@ async def test_window_action_eco_temp(hass: HomeAssistant, skip_hass_states_is_s
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -1609,6 +1629,7 @@ async def test_window_action_eco_temp(hass: HomeAssistant, skip_hass_states_is_s
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -1783,6 +1804,7 @@ async def test_window_action_frost_temp(hass: HomeAssistant, skip_hass_states_is
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
@@ -1804,6 +1826,7 @@ async def test_window_action_frost_temp(hass: HomeAssistant, skip_hass_states_is
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off, patch(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.is_device_active",
+        new_callable=PropertyMock,
        return_value=True,
    ):
        event_timestamp = event_timestamp + timedelta(minutes=1)
Author	SHA1	Message	Date
Jean-Marc Collin	91ba2387b2	Persistence of boiler srv attribute	2024-03-25 07:25:42 +00:00
Jean-Marc Collin	162efb4709	[#425 ] - Boiler management entities are generated independently of this option selection (#426 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-03-25 08:00:08 +01:00
Paulo Ferreira de Castro	6a97622226	Expose the keep_alive_sec attribute in HASS Developer Tools - States (#381 ) * Typing: Make BaseThermostat generic on the UnderlyingEntity type * Typing: Change the type of IntervalCaller._interval_sec from int to float This makes the IntervalCaller class more reusable. * Keep-alive: Expose UnderlyingSwitch.keep_alive_sec as a HASS Dev Tools attribute Also improve a keep-alive log message.	2024-03-23 11:49:09 +01:00
Jean-Marc Collin	5db7a49e75	[#339 ] - AUTO mode not counted for active boiler (#424 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-03-23 09:07:55 +01:00
Jean-Marc Collin	d7cdf79561	[#407 ] - shredding if heating (#423 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-03-23 08:30:17 +01:00
Jean-Marc Collin	07ac7beb7d	[#419 ] - Turnon don't work anymore (#422 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-03-23 07:21:18 +01:00
Jean-Marc Collin	7ded723c8b	[#420 ] - Message d'erreur dans home assistant (#421 ) Co-authored-by: Jean-Marc Collin <jean-marc.collin-extern@renault.com>	2024-03-23 07:17:55 +01:00
EPicLURcher	5369111f2d	English translations (#417 ) * Update strings.json * Update en.json * Update strings.json * Update strings.json * Update en.json	2024-03-20 23:11:50 +01:00