Updates

Author: rikroe

custom_components/cometblue/__init__.py

@@ -151,6 +151,17 @@ async def set_holiday(service_call: ServiceCall) -> None:
 
         data = service_call.data.copy()
 
+        if (
+            datetime(
+                data["start"].year,
+                data["start"].month,
+                data["start"].day,
+                data["start"].hour,
+            )
+            < datetime.now()
+        ):
+            raise ValueError("Start date (truncated to hour) must be in the future")
+
         for entity_id in data.pop("entity_id", []):
             entity_coordinator = await get_coordinator_for_service(hass, entity_id)
             LOGGER.info(
@@ -166,7 +177,7 @@ async def set_holiday(service_call: ServiceCall) -> None:
                         "start": data["start"],
                         "end": data["end"],
                         "temperature": data["temperature"],
-                    }
+                    },
                 },
                 service_call.service,
             )

custom_components/cometblue/climate.py

@@ -13,6 +13,7 @@
     PRESET_NONE,
     ClimateEntity,
     ClimateEntityFeature,
+    HVACAction,
     HVACMode,
 )
 from homeassistant.config_entries import ConfigEntry
@@ -25,8 +26,8 @@
 
 LOGGER = logging.getLogger(__name__)
 
-MIN_TEMP = 8
-MAX_TEMP = 28
+MIN_TEMP = 7.5
+MAX_TEMP = 28.5
 
 
 async def async_setup_entry(
@@ -43,28 +44,27 @@ class CometBlueClimateEntity(CometBlueBluetoothEntity, ClimateEntity):
 
     _attr_min_temp = MIN_TEMP
     _attr_max_temp = MAX_TEMP
-    _attr_target_temperature_step = PRECISION_HALVES
     _attr_name = None
+    _attr_hvac_modes = [HVACMode.AUTO, HVACMode.HEAT, HVACMode.OFF]
+    _attr_preset_modes = [
+        PRESET_NONE,
+        PRESET_ECO,
+        PRESET_AWAY,
+        PRESET_COMFORT,
+    ]
+    _attr_supported_features: ClimateEntityFeature = (
+        ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+        | ClimateEntityFeature.PRESET_MODE
+    )
+    _attr_target_temperature_step = PRECISION_HALVES
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     def __init__(self, coordinator: CometBlueDataUpdateCoordinator) -> None:
         """Initialize CometBlueClimateEntity."""
 
         super().__init__(coordinator)
         self._attr_unique_id = f"{coordinator.address}-climate"
-        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
-        self._attr_hvac_modes = [HVACMode.AUTO]
-        self._attr_hvac_mode = HVACMode.AUTO
-        self._attr_supported_features: ClimateEntityFeature = (
-            ClimateEntityFeature.TARGET_TEMPERATURE
-            | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-            | ClimateEntityFeature.PRESET_MODE
-        )
-        self._attr_preset_modes = [
-            PRESET_NONE,
-            PRESET_ECO,
-            PRESET_AWAY,
-            PRESET_COMFORT,
-        ]
 
     @property
     def current_temperature(self) -> float | None:
@@ -74,7 +74,11 @@ def current_temperature(self) -> float | None:
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature currently set to be reached."""
-        return self.coordinator.data["manualTemp"]
+        # 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"]
+        )
 
     @property
     def target_temperature_high(self) -> float | None:
@@ -87,21 +91,53 @@ def target_temperature_low(self) -> float | None:
         return self.coordinator.data["targetTempLow"]
 
     @property
-    def preset_mode(self) -> str | None:
-        """Return the current preset mode, e.g., home, away, temp.
+    def hvac_mode(self) -> HVACMode | None:
+        """Return hvac operation mode."""
+        if self.coordinator.data["manualTemp"] == 7.5:
+            return HVACMode.OFF
+        if self.coordinator.data["manualTemp"] == 28.5:
+            return HVACMode.HEAT
+        return HVACMode.AUTO
 
-        Requires ClimateEntityFeature.PRESET_MODE.
-        """
-        if self.target_temperature == self.target_temperature_low:
-            return PRESET_ECO
+    @property
+    def hvac_action(self) -> HVACAction | None:
+        """Return the current running hvac action if supported."""
+
+        if self.coordinator.data["manualTemp"] == 7.5:
+            return HVACAction.OFF
+        if (
+            self.coordinator.data["currentTemp"] + 0.5
+            < self.coordinator.data["manualTemp"]
+        ):
+            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)
+        if (
+            self.coordinator.data["holiday"].get("start") is None
+            and self.coordinator.data["holiday"].get("end") is not None
+        ):
+            return PRESET_AWAY
         if self.target_temperature == self.target_temperature_high:
             return PRESET_COMFORT
-        # AWAY MODE NOT SUPPORTED YET
+        if self.target_temperature == self.target_temperature_low:
+            return PRESET_ECO
         return PRESET_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"
+            )
+
         await self.coordinator.send_command(
             "set_temperature_async",
             {
@@ -125,6 +161,22 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
         if preset_mode in [PRESET_NONE, PRESET_AWAY]:
             raise ValueError(f"Setting preset '{preset_mode}' is not supported.")
         if preset_mode == PRESET_ECO:
-            await self.async_set_temperature(temperature=self.target_temperature_low)
-        elif preset_mode == PRESET_COMFORT:
-            await self.async_set_temperature(temperature=self.target_temperature_high)
+            return await self.async_set_temperature(
+                temperature=self.target_temperature_low
+            )
+        if preset_mode == PRESET_COMFORT:
+            return await self.async_set_temperature(
+                temperature=self.target_temperature_high
+            )
+
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set new target hvac mode."""
+
+        if hvac_mode == HVACMode.OFF:
+            return await self.async_set_temperature(temperature=7.5)
+        if hvac_mode == HVACMode.HEAT:
+            return await self.async_set_temperature(temperature=28.5)
+        if hvac_mode == HVACMode.AUTO:
+            return await self.async_set_temperature(
+                temperature=self.target_temperature_low
+            )

custom_components/cometblue/config_flow.py

@@ -10,8 +10,9 @@
 from homeassistant import config_entries
 from homeassistant.components.bluetooth import async_discovered_service_info
 from homeassistant.components.bluetooth.models import BluetoothServiceInfoBleak
-from homeassistant.const import CONF_ADDRESS, CONF_PIN
+from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_PIN
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.device_registry import format_mac
 
 from .const import CONF_DEVICE_NAME, DOMAIN
 
@@ -20,6 +21,8 @@ def name_from_discovery(discovery: BluetoothServiceInfoBleak | None) -> str:
     """Get the name from a discovery."""
     if discovery is None:
         raise ValueError("Discovery info not set")
+    if discovery.name == str(discovery.address):
+        return discovery.address
     return f"{discovery.name} {discovery.address}"
 
 
@@ -62,15 +65,19 @@ async def async_step_bluetooth_confirm(
         return self.async_show_form(
             step_id="bluetooth_confirm",
             description_placeholders={
-                "name": name_from_discovery(self._discovery_info),
-                "pin": "0",
+                CONF_NAME: name_from_discovery(self._discovery_info),
             },
             data_schema=vol.Schema(
                 {
-                    vol.Required(CONF_PIN): vol.All(
-                        vol.Coerce(int), vol.Range(min=0, max=99999999)
-                    ),
-                    vol.Optional(CONF_DEVICE_NAME): str,
+                    vol.Required(
+                        CONF_PIN, description={"suggested_value": "0"}
+                    ): vol.All(vol.Coerce(int), vol.Range(min=0, max=99999999)),
+                    vol.Optional(
+                        CONF_DEVICE_NAME,
+                        description={
+                            "suggested_value": name_from_discovery(self._discovery_info)
+                        },
+                    ): str,
                 },
             ),
         )
@@ -82,7 +89,7 @@ async def async_step_bluetooth(
         self._discovery_info = discovery_info
         self._discovery_info.address = discovery_info.address
 
-        await self.async_set_unique_id(discovery_info.address)
+        await self.async_set_unique_id(format_mac(discovery_info.address))
         self._abort_if_unique_id_configured(
             updates={CONF_ADDRESS: discovery_info.address}
         )

custom_components/cometblue/coordinator.py

@@ -97,7 +97,7 @@ async def _async_update_data(self) -> dict[str, bytes]:
 
 
 class CometBlueBluetoothEntity(CoordinatorEntity[CometBlueDataUpdateCoordinator]):
-    """Coordinator entity for Gardena Bluetooth."""
+    """Coordinator entity for CometBlue."""
 
     coordinator: CometBlueDataUpdateCoordinator
     _attr_has_entity_name = True

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": "20231025.1"
+  "version": "20231028.1"
 }

custom_components/cometblue/utils.py

@@ -34,9 +34,8 @@ def validate_half_precision(value: float) -> float:
             )
         return value
     except TypeError as err:
-        raise vol.Invalid(
-            f"value {value} is not a float"
-        ) from err
+        raise vol.Invalid(f"value {value} is not a float") from err
+
 
 def validate_cometblue_schedule(schedule: dict[str, time]) -> dict[str, time] | None:
     """Validate the schedule of time ranges.
@@ -111,7 +110,11 @@ def valid_cometblue_schedule_keys() -> list[str]:
 SERVICE_HOLIDAY_SCHEMA = {
     vol.Required(CONF_START): cv.datetime,
     vol.Required(CONF_END): cv.datetime,
-    vol.Required(CONF_TEMPERATURE): vol.All(vol.Coerce(float), vol.Range(min=MIN_TEMP, max=MAX_TEMP), validate_half_precision)
+    vol.Required(CONF_TEMPERATURE): vol.All(
+        vol.Coerce(float),
+        vol.Range(min=MIN_TEMP, max=MAX_TEMP),
+        validate_half_precision,
+    ),
 }