Fixes for away preset

Author: rikroe

custom_components/cometblue/climate.py

@@ -74,11 +74,7 @@ def current_temperature(self) -> float | None:
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature currently set to be reached."""
-        # if holiday mode is active (i.e. temperature is available), return holiday temperature
-        return (
-            self.coordinator.data["holiday"].get("temperature")
-            or self.coordinator.data["manualTemp"]
-        )
+        return self.coordinator.data["manualTemp"]
 
     @property
     def target_temperature_high(self) -> float | None:
@@ -105,21 +101,20 @@ def hvac_action(self) -> HVACAction | None:
 
         if self.coordinator.data["manualTemp"] == 7.5:
             return HVACAction.OFF
-        if (
-            self.coordinator.data["currentTemp"] + 0.5
-            < self.coordinator.data["manualTemp"]
-        ):
+        if (self.target_temperature or 0.0) > (self.target_temperature_low or 0.0):
             return HVACAction.HEATING
         return HVACAction.IDLE
 
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode, e.g., home, away, temp."""
         # presets have an order in which they are displayed on TRV:
-        # away, comfort, eco, none (or manual)
+        # away, comfort, eco, none (manual)
         if (
             self.coordinator.data["holiday"].get("start") is None
             and self.coordinator.data["holiday"].get("end") is not None
+            and self.coordinator.data["manualTemp"]
+            == self.coordinator.data["holiday"].get("temperature")
         ):
             return PRESET_AWAY
         if self.target_temperature == self.target_temperature_high:
@@ -131,11 +126,9 @@ def preset_mode(self) -> str | None:
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperatures."""
 
-        # Not sure if actually the case. Maybe set vacation mode to really hot and check
-        # what happens when changing it manually
         if self.preset_mode == PRESET_AWAY:
             raise ValueError(
-                "Cannot adjust TRV remotely, manually disable 'away' mode on TRV first"
+                "Cannot adjust TRV remotely, manually disable 'holiday' mode on TRV first"
             )
 
         await self.coordinator.send_command(
@@ -159,7 +152,7 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
         if self.preset_modes and preset_mode not in self.preset_modes:
             raise ValueError(f"Unsupported preset_mode '{preset_mode}'")
         if preset_mode in [PRESET_NONE, PRESET_AWAY]:
-            raise ValueError(f"Setting preset '{preset_mode}' is not supported.")
+            raise ValueError(f"Unable to set preset '{preset_mode}', display only.")
         if preset_mode == PRESET_ECO:
             return await self.async_set_temperature(
                 temperature=self.target_temperature_low
@@ -180,3 +173,4 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
             return await self.async_set_temperature(
                 temperature=self.target_temperature_low
             )
+        raise ValueError(f"Unknown HVAC mode '{hvac_mode}'")

custom_components/cometblue/manifest.json

@@ -17,5 +17,5 @@
   "requirements": [
     "git+https://github.com/rikroe/eurotronic-cometblue.git@ha-component#eurotronic-cometblue==1.0"
   ],
-  "version": "20231028.1"
+  "version": "20231030.1"
 }