Add water_heater platform to cover domestic_hot_water heating

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 Versions from 0.40 and up
 
-## Ongoing
+## v0.65.0
 
+- Replace DHW_comfort_mode switch by a select or a water_heater, bump plugwise to [v1.12.0](https://github.com/plugwise/python-plugwise/releases/tag/v1.12.0) via PR [#1085](https://github.com/plugwise/plugwise-beta/pull/1085)
 - Downstream Core updates via PR [#1084](https://github.com/plugwise/plugwise-beta/pull/1084)
 
 ## v0.64.4

custom_components/plugwise/const.py

@@ -131,6 +131,7 @@
 
 # Select constants
 AVAILABLE_SCHEDULES: Final = "available_schedules"
+DHW_MODE: Final = "dhw_mode"
 DHW_MODES: Final = "dhw_modes"
 GATEWAY_MODES: Final = "gateway_modes"
 REGULATION_MODES: Final = "regulation_modes"
@@ -165,6 +166,7 @@
     Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
+    Platform.WATER_HEATER,
 ]
 SERVICE_DELETE: Final = "delete_notification"
 SEVERITIES: Final[list[str]] = ["other", "info", "message", "warning", "error"]

custom_components/plugwise/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==1.11.4"],
-  "version": "0.64.4",
+  "requirements": ["plugwise==1.12.0"],
+  "version": "0.65.0",
   "zeroconf": ["_plugwise._tcp.local."]
 }

custom_components/plugwise/number.py

@@ -16,7 +16,6 @@
     LOGGER,
     LOWER_BOUND,
     MAX_BOILER_TEMP,
-    MAX_DHW_TEMP,
     RESOLUTION,
     TEMPERATURE_OFFSET,
     UPPER_BOUND,
@@ -47,13 +46,6 @@ class PlugwiseNumberEntityDescription(NumberEntityDescription):
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
-    PlugwiseNumberEntityDescription(
-        key=MAX_DHW_TEMP,
-        translation_key=MAX_DHW_TEMP,
-        device_class=NumberDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.CONFIG,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-    ),
     PlugwiseNumberEntityDescription(
         key=TEMPERATURE_OFFSET,
         translation_key=TEMPERATURE_OFFSET,

custom_components/plugwise/select.py

@@ -130,9 +130,12 @@ def __init__(
         self._attr_unique_id = f"{device_id}-{entity_description.key}"
         self.entity_description = entity_description
 
-        self._location = device_id
-        if (location := self.device.get(LOCATION)) is not None:
-            self._location = location
+        self._device_or_location = device_id
+        if (
+            self.entity_description.key in (SELECT_SCHEDULE, SELECT_ZONE_PROFILE)
+            and (location := self.device.get(LOCATION)) is not None
+        ):
+            self._device_or_location = location
 
     @property
     def current_option(self) -> str | None:
@@ -148,10 +151,12 @@ def options(self) -> list[str]:
     async def async_select_option(self, option: str) -> None:
         """Change to the selected entity option.
 
-        Location ID and STATE_ON are required for the thermostat-schedule select.
+        Appliance ID (= device_id) is required for the dhw_mode select
+        Locattion ID is required for the thermostat-schedule and zone_profile selects.
+        STATE_ON is required for the thermostat-schedule select.
         """
         await self.coordinator.api.set_select(
-            self.entity_description.key, self._location, option, STATE_ON
+            self.entity_description.key, self._device_or_location, option, STATE_ON
         )
         LOGGER.debug(
             "Set %s to %s was successful",