Implementation ok

jmcollin78 · Dec 10, 2023 · ac9a18e · ac9a18e
1 parent a7480e1
commit ac9a18e
Show file tree

Hide file tree

Showing 17 changed files with 234 additions and 58 deletions.
diff --git a/custom_components/versatile_thermostat/base_thermostat.py b/custom_components/versatile_thermostat/base_thermostat.py
@@ -272,6 +272,9 @@ def post_init(self, entry_infos):
         )
 
         self._ac_mode = entry_infos.get(CONF_AC_MODE) is True
+        self._attr_max_temp = entry_infos.get(CONF_TEMP_MAX)
+        self._attr_min_temp = entry_infos.get(CONF_TEMP_MIN)
+
         # convert entry_infos into usable attributes
         presets = {}
         items = CONF_PRESETS_WITH_AC.items() if self._ac_mode else CONF_PRESETS.items()
@@ -281,6 +284,9 @@ def post_init(self, entry_infos):
                 presets[key] = entry_infos.get(value)
             else:
                 _LOGGER.debug("value %s not found in Entry", value)
+                presets[key] = (
+                    self._attr_max_temp if self._ac_mode else self._attr_min_temp
+                )
 
         presets_away = {}
         items = (
@@ -294,6 +300,9 @@ def post_init(self, entry_infos):
                 presets_away[key] = entry_infos.get(value)
             else:
                 _LOGGER.debug("value %s not found in Entry", value)
+                presets_away[key] = (
+                    self._attr_max_temp if self._ac_mode else self._attr_min_temp
+                )
 
         if self._window_call_cancel is not None:
             self._window_call_cancel()
@@ -310,8 +319,6 @@ def post_init(self, entry_infos):
         self._proportional_function = entry_infos.get(CONF_PROP_FUNCTION)
         self._temp_sensor_entity_id = entry_infos.get(CONF_TEMP_SENSOR)
         self._ext_temp_sensor_entity_id = entry_infos.get(CONF_EXTERNAL_TEMP_SENSOR)
-        self._attr_max_temp = entry_infos.get(CONF_TEMP_MAX)
-        self._attr_min_temp = entry_infos.get(CONF_TEMP_MIN)
         # Default value not configurable
         self._attr_target_temperature_step = 0.1
         self._power_sensor_entity_id = entry_infos.get(CONF_POWER_SENSOR)

diff --git a/custom_components/versatile_thermostat/config_flow.py b/custom_components/versatile_thermostat/config_flow.py
@@ -331,15 +331,15 @@ def __init__(self, infos) -> None:
 
         self.STEP_PRESETS_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
             {
-                vol.Optional(v, default=0.0): vol.Coerce(float)
+                vol.Optional(v, default=0): vol.Coerce(float)
                 for (k, v) in CONF_PRESETS.items()
             }
         )
 
         self.STEP_PRESETS_WITH_AC_DATA_SCHEMA = (  # pylint: disable=invalid-name
             vol.Schema(  # pylint: disable=invalid-name
                 {
-                    vol.Optional(v, default=0.0): vol.Coerce(float)
+                    vol.Optional(v, default=0): vol.Coerce(float)
                     for (k, v) in CONF_PRESETS_WITH_AC.items()
                 }
             )

diff --git a/custom_components/versatile_thermostat/const.py b/custom_components/versatile_thermostat/const.py
@@ -29,6 +29,7 @@
 
 PRESET_POWER = "power"
 PRESET_SECURITY = "security"
+PRESET_FROST_PROTECTION = "frost"
 
 HIDDEN_PRESETS = [PRESET_POWER, PRESET_SECURITY]
 
@@ -112,6 +113,7 @@
 CONF_PRESETS = {
     p: f"{p}_temp"
     for p in (
+        PRESET_FROST_PROTECTION,
         PRESET_ECO,
         PRESET_COMFORT,
         PRESET_BOOST,
@@ -121,6 +123,7 @@
 CONF_PRESETS_WITH_AC = {
     p: f"{p}_temp"
     for p in (
+        PRESET_FROST_PROTECTION,
         PRESET_ECO,
         PRESET_COMFORT,
         PRESET_BOOST,
@@ -136,6 +139,7 @@
 CONF_PRESETS_AWAY = {
     p: f"{p}_temp"
     for p in (
+        PRESET_FROST_PROTECTION + PRESET_AWAY_SUFFIX,
         PRESET_ECO + PRESET_AWAY_SUFFIX,
         PRESET_COMFORT + PRESET_AWAY_SUFFIX,
         PRESET_BOOST + PRESET_AWAY_SUFFIX,
@@ -145,6 +149,7 @@
 CONF_PRESETS_AWAY_WITH_AC = {
     p: f"{p}_temp"
     for p in (
+        PRESET_FROST_PROTECTION + PRESET_AWAY_SUFFIX,
         PRESET_ECO + PRESET_AWAY_SUFFIX,
         PRESET_COMFORT + PRESET_AWAY_SUFFIX,
         PRESET_BOOST + PRESET_AWAY_SUFFIX,
@@ -154,7 +159,12 @@
     )
 }
 
-CONF_PRESETS_SELECTIONABLE = [PRESET_ECO, PRESET_COMFORT, PRESET_BOOST]
+CONF_PRESETS_SELECTIONABLE = [
+    PRESET_FROST_PROTECTION,
+    PRESET_ECO,
+    PRESET_COMFORT,
+    PRESET_BOOST,
+]
 
 CONF_PRESETS_VALUES = list(CONF_PRESETS.values())
 CONF_PRESETS_AWAY_VALUES = list(CONF_PRESETS_AWAY.values())
@@ -213,6 +223,7 @@
         CONF_AUTO_REGULATION_DTEMP,
         CONF_AUTO_REGULATION_PERIOD_MIN,
         CONF_INVERSE_SWITCH,
+        CONF_AUTO_FAN_MODE,
     ]
     + CONF_PRESETS_VALUES
     + CONF_PRESETS_AWAY_VALUES

diff --git a/custom_components/versatile_thermostat/services.yaml b/custom_components/versatile_thermostat/services.yaml
@@ -43,6 +43,7 @@ set_preset_temperature:
                         - "eco"
                         - "comfort"
                         - "boost"
+                        - "frost"
                         - "eco_ac"
                         - "comfort_ac"
                         - "boost_ac"

diff --git a/custom_components/versatile_thermostat/strings.json b/custom_components/versatile_thermostat/strings.json
@@ -79,9 +79,19 @@
         "title": "Presets",
         "description": "For each preset set the target temperature (0 to ignore preset)",
         "data": {
+          "eco_temp": "Eco preset",
+          "comfort_temp": "Comfort preset",
+          "boost_temp": "Boost preset",
+          "frost_temp": "Frost protection preset",
+          "eco_ac_temp": "Eco preset for AC mode",
+          "comfort_ac_temp": "Comfort preset for AC mode",
+          "boost_ac_temp": "Boost preset for AC mode"
+        },
+        "data_description": {
           "eco_temp": "Temperature in Eco preset",
           "comfort_temp": "Temperature in Comfort preset",
           "boost_temp": "Temperature in Boost preset",
+          "frost_temp": "Temperature in Frost protection preset",
           "eco_ac_temp": "Temperature in Eco preset for AC mode",
           "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
           "boost_ac_temp": "Temperature in Boost preset for AC mode"
@@ -136,10 +146,21 @@
         "title": "Presence management",
         "description": "Presence management attributes.\nGives the a presence sensor of your home (true is someone is present).\nThen specify either the preset to use when presence sensor is false or the offset in temperature to apply.\nIf preset is given, the offset will not be used.\nLeave corresponding entity_id empty if not used.",
         "data": {
+          "presence_sensor_entity_id": "Presence sensor",
+          "eco_away_temp": "Eco preset",
+          "comfort_away_temp": "Comfort preset",
+          "boost_away_temp": "Boost preset",
+          "frost_away_temp": "Frost protection preset",
+          "eco_ac_away_temp": "Eco preset in AC mode",
+          "comfort_ac_away_temp": "Comfort preset in AC mode",
+          "boost_ac_away_temp": "Boost pres et in AC mode"
+        },
+        "data_description": {
           "presence_sensor_entity_id": "Presence sensor entity id",
           "eco_away_temp": "Temperature in Eco preset when no presence",
           "comfort_away_temp": "Temperature in Comfort preset when no presence",
           "boost_away_temp": "Temperature in Boost preset when no presence",
+          "frost_away_temp": "Temperature in Frost protection preset when no presence",
           "eco_ac_away_temp": "Temperature in Eco preset when no presence in AC mode",
           "comfort_ac_away_temp": "Temperature in Comfort preset when no presence in AC mode",
           "boost_ac_away_temp": "Temperature in Boost preset when no presence in AC mode"
@@ -250,9 +271,19 @@
         "title": "Presets",
         "description": "For each preset set the target temperature (0 to ignore preset)",
         "data": {
+          "eco_temp": "Eco preset",
+          "comfort_temp": "Comfort preset",
+          "boost_temp": "Boost preset",
+          "frost_temp": "Frost protection preset",
+          "eco_ac_temp": "Eco preset for AC mode",
+          "comfort_ac_temp": "Comfort preset for AC mode",
+          "boost_ac_temp": "Boost preset for AC mode"
+        },
+        "data_description": {
           "eco_temp": "Temperature in Eco preset",
           "comfort_temp": "Temperature in Comfort preset",
           "boost_temp": "Temperature in Boost preset",
+          "frost_temp": "Temperature in Frost protection preset",
           "eco_ac_temp": "Temperature in Eco preset for AC mode",
           "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
           "boost_ac_temp": "Temperature in Boost preset for AC mode"

diff --git a/custom_components/versatile_thermostat/translations/el.json b/custom_components/versatile_thermostat/translations/el.json
@@ -82,6 +82,7 @@
           "eco_temp": "Θερμοκρασία στο προκαθορισμένο Eco",
           "comfort_temp": "Θερμοκρασία στο προκαθορισμένο Comfort",
           "boost_temp": "Θερμοκρασία στο προκαθορισμένο Boost",
+          "frost_temp": "Θερμοκρασία στο προκαθορισμένο Frost protection",
           "eco_ac_temp": "Θερμοκρασία στο προκαθορισμένο Eco για λειτουργία AC",
           "comfort_ac_temp": "Θερμοκρασία στο προκαθορισμένο Comfort για λειτουργία AC",
           "boost_ac_temp": "Θερμοκρασία στο προκαθορισμένο Boost για λειτουργία AC"
@@ -140,6 +141,7 @@
           "eco_away_temp": "Θερμοκρασία στο προκαθορισμένο Eco όταν δεν υπάρχει παρουσία",
           "comfort_away_temp": "Θερμοκρασία στο προκαθορισμένο Comfort όταν δεν υπάρχει παρουσία",
           "boost_away_temp": "Θερμοκρασία στο προκαθορισμένο Boost όταν δεν υπάρχει παρουσία",
+          "frost_away_temp": "Θερμοκρασία στο προκαθορισμένο Frost protection όταν δεν υπάρχει παρουσία",
           "eco_ac_away_temp": "Θερμοκρασία στο προκαθορισμένο Eco όταν δεν υπάρχει παρουσία σε λειτουργία AC",
           "comfort_ac_away_temp": "Θερμοκρασία στο προκαθορισμένο Comfort όταν δεν υπάρχει παρουσία σε λειτουργία AC",
           "boost_ac_away_temp": "Θερμοκρασία στο προκαθορισμένο Boost όταν δεν υπάρχει παρουσία σε λειτουργία AC"
@@ -253,6 +255,7 @@
           "eco_temp": "Θερμοκρασία στην οικονομική προεπιλογή",
           "comfort_temp": "Θερμοκρασία στην άνετη προεπιλογή",
           "boost_temp": "Θερμοκρασία στην ενισχυμένη προεπιλογή",
+          "frost_temp": "Θερμοκρασία στο προκαθορισμένο Frost protection",
           "eco_ac_temp": "Θερμοκρασία στην οικονομική προεπιλογή για τη λειτουργία AC",
           "comfort_ac_temp": "Θερμοκρασία στην άνετη προεπιλογή για τη λειτουργία AC",
           "boost_ac_temp": "Θερμοκρασία στην ενισχυμένη προεπιλογή για τη λειτουργία AC"
@@ -311,6 +314,7 @@
           "eco_away_temp": "Θερμοκρασία στο πρόγραμμα Eco όταν δεν υπάρχει παρουσία",
           "comfort_away_temp": "Θερμοκρασία στο πρόγραμμα Comfort όταν δεν υπάρχει παρουσία",
           "boost_away_temp": "Θερμοκρασία στο πρόγραμμα Boost όταν δεν υπάρχει παρουσία",
+          "frost_away_temp": "Θερμοκρασία στο προκαθορισμένο Frost protection όταν δεν υπάρχει παρουσία",
           "eco_ac_away_temp": "Θερμοκρασία στο πρόγραμμα Eco όταν δεν υπάρχει παρουσία σε λειτουργία AC",
           "comfort_ac_away_temp": "Θερμοκρασία στο πρόγραμμα Comfort όταν δεν υπάρχει παρουσία σε λειτουργία AC",
           "boost_ac_away_temp": "Θερμοκρασία στο πρόγραμμα Boost όταν δεν υπάρχει παρουσία σε λειτουργία AC"

diff --git a/custom_components/versatile_thermostat/translations/en.json b/custom_components/versatile_thermostat/translations/en.json
@@ -79,9 +79,19 @@
         "title": "Presets",
         "description": "For each preset set the target temperature (0 to ignore preset)",
         "data": {
+          "eco_temp": "Eco preset",
+          "comfort_temp": "Comfort preset",
+          "boost_temp": "Boost preset",
+          "frost_temp": "Frost protection preset",
+          "eco_ac_temp": "Eco preset for AC mode",
+          "comfort_ac_temp": "Comfort preset for AC mode",
+          "boost_ac_temp": "Boost preset for AC mode"
+        },
+        "data_description": {
           "eco_temp": "Temperature in Eco preset",
           "comfort_temp": "Temperature in Comfort preset",
           "boost_temp": "Temperature in Boost preset",
+          "frost_temp": "Temperature in Frost protection preset",
           "eco_ac_temp": "Temperature in Eco preset for AC mode",
           "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
           "boost_ac_temp": "Temperature in Boost preset for AC mode"
@@ -136,10 +146,21 @@
         "title": "Presence management",
         "description": "Presence management attributes.\nGives the a presence sensor of your home (true is someone is present).\nThen specify either the preset to use when presence sensor is false or the offset in temperature to apply.\nIf preset is given, the offset will not be used.\nLeave corresponding entity_id empty if not used.",
         "data": {
+          "presence_sensor_entity_id": "Presence sensor",
+          "eco_away_temp": "Eco preset",
+          "comfort_away_temp": "Comfort preset",
+          "boost_away_temp": "Boost preset",
+          "frost_away_temp": "Frost protection preset",
+          "eco_ac_away_temp": "Eco preset in AC mode",
+          "comfort_ac_away_temp": "Comfort preset in AC mode",
+          "boost_ac_away_temp": "Boost pres et in AC mode"
+        },
+        "data_description": {
           "presence_sensor_entity_id": "Presence sensor entity id",
           "eco_away_temp": "Temperature in Eco preset when no presence",
           "comfort_away_temp": "Temperature in Comfort preset when no presence",
           "boost_away_temp": "Temperature in Boost preset when no presence",
+          "frost_away_temp": "Temperature in Frost protection preset when no presence",
           "eco_ac_away_temp": "Temperature in Eco preset when no presence in AC mode",
           "comfort_ac_away_temp": "Temperature in Comfort preset when no presence in AC mode",
           "boost_ac_away_temp": "Temperature in Boost preset when no presence in AC mode"
@@ -250,9 +271,19 @@
         "title": "Presets",
         "description": "For each preset set the target temperature (0 to ignore preset)",
         "data": {
+          "eco_temp": "Eco preset",
+          "comfort_temp": "Comfort preset",
+          "boost_temp": "Boost preset",
+          "frost_temp": "Frost protection preset",
+          "eco_ac_temp": "Eco preset for AC mode",
+          "comfort_ac_temp": "Comfort preset for AC mode",
+          "boost_ac_temp": "Boost preset for AC mode"
+        },
+        "data_description": {
           "eco_temp": "Temperature in Eco preset",
           "comfort_temp": "Temperature in Comfort preset",
           "boost_temp": "Temperature in Boost preset",
+          "frost_temp": "Temperature in Frost protection preset",
           "eco_ac_temp": "Temperature in Eco preset for AC mode",
           "comfort_ac_temp": "Temperature in Comfort preset for AC mode",
           "boost_ac_temp": "Temperature in Boost preset for AC mode"