Implement water_heater platform - part 2

custom_components/plugwise/climate.py

@@ -89,9 +89,9 @@ def _add_entities() -> None:
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
 
-def _check_for_schedule(active: bool, last_active: str | None) -> None:
+def _check_for_schedule(active: bool, last_active: str) -> None:
     """Raise a HAError when no thermostat schedule has been set."""
-    if not active and last_active is None:
+    if not active and last_active == STATE_OFF:
         raise HomeAssistantError(
             translation_domain=DOMAIN,
             translation_key=ERROR_NO_SCHEDULE,
@@ -131,7 +131,7 @@ def __init__(
         self._api = coordinator.api
         gateway_id: str = self._api.gateway_id
         self._gateway_data = coordinator.data[gateway_id]
-        self._last_active_schedule: str | None = None
+        self._last_active_schedule = STATE_OFF
         self._location = device_id
         if (location := self.device.get(LOCATION)) is not None:
             self._location = location
@@ -170,7 +170,7 @@ async def async_added_to_hass(self) -> None:
         extra_data = await self.async_get_last_extra_data()
         if extra_data is not None:
             data = extra_data.as_dict()
-            self._last_active_schedule = data.get("last_active_schedule")
+            self._last_active_schedule = data.get("last_active_schedule") or STATE_OFF
             self._previous_action_mode = (
                 data.get("previous_action_mode") or HVACAction.HEATING.value
             )
@@ -244,7 +244,7 @@ def hvac_modes(self) -> list[HVACMode]:
         if REGULATION_MODES in self._gateway_data:
             hvac_modes.append(HVACMode.OFF)
 
-        if self.device.get(AVAILABLE_SCHEDULES, []):
+        if self.device[AVAILABLE_SCHEDULES] != [STATE_OFF]:
             hvac_modes.append(HVACMode.AUTO)
 
         if self._api.cooling_present:
@@ -329,8 +329,8 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
             await self._api.set_regulation_mode(hvac_mode.value)
             return
 
-        current_schedule = self.device.get("select_schedule")
-        schedule_is_active = current_schedule not in (None, "off")
+        current_schedule = self.device["select_schedule"]
+        schedule_is_active = current_schedule != STATE_OFF
         desired_schedule = (
             current_schedule if schedule_is_active else self._last_active_schedule
         )
@@ -339,15 +339,15 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
             if hvac_mode == HVACMode.AUTO:
                 _check_for_schedule(schedule_is_active, self._last_active_schedule)
                 await self._api.set_schedule_state(
-                    self._location, STATE_ON, desired_schedule
+                    self._location, desired_schedule, STATE_ON
                 )
                 await self._api.set_regulation_mode(self._previous_action_mode)
                 return
 
             # Transition to manual mode
             if schedule_is_active:
                 await self._api.set_schedule_state(
-                    self._location, STATE_OFF, current_schedule
+                    self._location, current_schedule, STATE_OFF,
                 )
                 self._last_active_schedule = current_schedule
             regulation = self._regulation_mode_for_hvac(hvac_mode)
@@ -357,14 +357,14 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         # Common - transition from auto = schedule off
         if self.hvac_mode == HVACMode.AUTO:
             await self._api.set_schedule_state(
-                self._location, STATE_OFF, current_schedule
+                self._location, current_schedule, STATE_OFF,
             )
             self._last_active_schedule = current_schedule
             return
 
         # Common - transition to auto = schedule on
         _check_for_schedule(schedule_is_active, self._last_active_schedule)
-        await self._api.set_schedule_state(self._location, STATE_ON, desired_schedule)
+        await self._api.set_schedule_state(self._location, desired_schedule, STATE_ON)
 
     @plugwise_command
     @override

custom_components/plugwise/const.py

@@ -77,15 +77,12 @@
 VENDOR: Final = "vendor"
 
 # Number constants
-MAX_BOILER_TEMP: Final = "maximum_boiler_temperature"
-MAX_DHW_TEMP: Final = "max_dhw_temperature"
 LOWER_BOUND: Final = "lower_bound"
 RESOLUTION: Final = "resolution"
 TEMPERATURE_OFFSET: Final = "temperature_offset"
 UPPER_BOUND: Final = "upper_bound"
 
 # Sensor constants
-DHW_TEMP: Final = "dhw_temperature"
 DHW_SETPOINT: Final = "domestic_hot_water_setpoint"
 EL_CONSUMED: Final = "electricity_consumed"
 EL_CONS_INTERVAL: Final = "electricity_consumed_interval"
@@ -150,6 +147,10 @@
 COOLING_ENA_SWITCH: Final ="cooling_ena_switch"
 SWITCHES: Final = "switches"
 
+# Water_heater constants
+BOILER_TEMP: Final = "boiler_temperature"
+DHW_TEMP: Final = "dhw_temperature"
+
 # Default directives
 DEFAULT_PORT: Final[int] = 80
 DEFAULT_TIMEOUT: Final[int] = 30
@@ -188,11 +189,8 @@
 }
 
 type NumberType = Literal[
-    "maximum_boiler_temperature",
-    "max_dhw_temperature",
     "temperature_offset",
 ]
-
 type SelectType = Literal[
     "select_dhw_mode",
     "select_gateway_mode",
@@ -207,3 +205,8 @@
     "regulation_modes",
     "zone_profiles",
 ]
+type WaterHeaterType = Literal[
+    "boiler_temperature",
+    "dhw_temperature",
+]
+type WaterHeaterOptionsType = Literal["dhw_modes"]

custom_components/plugwise/manifest.json

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

custom_components/plugwise/number.py

@@ -16,7 +16,6 @@
 from .const import (
     LOGGER,
     LOWER_BOUND,
-    MAX_BOILER_TEMP,
     RESOLUTION,
     TEMPERATURE_OFFSET,
     UPPER_BOUND,
@@ -40,13 +39,6 @@ class PlugwiseNumberEntityDescription(NumberEntityDescription):
 
 # Upstream + is there a reason we didn't rename this one prefixed?
 NUMBER_TYPES = (
-    PlugwiseNumberEntityDescription(
-        key=MAX_BOILER_TEMP,
-        translation_key=MAX_BOILER_TEMP,
-        device_class=NumberDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.CONFIG,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-    ),
     PlugwiseNumberEntityDescription(
         key=TEMPERATURE_OFFSET,
         translation_key=TEMPERATURE_OFFSET,
@@ -121,8 +113,6 @@ def __init__(
         self._attr_native_min_value = ctrl.get(LOWER_BOUND, 0.0)  # Upstream const
 
         native_step = ctrl.get(RESOLUTION, 0.5)  # Upstream const
-        if description.key != TEMPERATURE_OFFSET:  # Upstream const
-            native_step = max(native_step, 0.5)
         self._attr_native_step = native_step
 
     @property

custom_components/plugwise/select.py

@@ -101,7 +101,7 @@ def _add_entities() -> None:
         for device_id in coordinator.new_devices:
             device = coordinator.data[device_id]
             for description in SELECT_TYPES:
-                if device.get(description.options_key):
+                if device.get(description.key) is not None:
                     entities.append(
                         PlugwiseSelectEntity(coordinator, device_id, description)
                     )

custom_components/plugwise/translations/en.json

@@ -93,12 +93,6 @@
       }
     },
     "number": {
-      "max_dhw_temperature": {
-        "name": "Domestic hot water setpoint"
-      },
-      "maximum_boiler_temperature": {
-        "name": "Maximum boiler temperature setpoint"
-      },
       "temperature_offset": {
         "name": "Temperature offset"
       }
@@ -108,7 +102,7 @@
         "name": "DHW mode",
         "state": {
           "comfort": "Comfort",
-          "off": "Off"
+          "eco": "Eco"
         }
       },
       "select_gateway_mode": {
@@ -299,13 +293,21 @@
       }
     },
     "water_heater": {
-      "plugwise": {
-        "state": {
-          "auto": "Auto",
-          "boost": "Boost",
-          "comfort": "Comfort",
-          "eco": "Eco",
-          "off": "Off"
+      "boiler_temperature": {
+        "name": "Boiler"
+      },
+      "dhw_temperature": {
+        "name": "Domestic hot water",
+        "state_attributes": {
+          "dhw_modes": {
+            "state": {
+              "auto": "Auto",
+              "boost": "Boost",
+              "comfort": "Comfort",
+              "eco": "Eco",
+              "off": "Off"
+            }
+          }
         }
       }
     }

custom_components/plugwise/translations/nl.json

@@ -93,12 +93,6 @@
       }
     },
     "number": {
-      "max_dhw_temperature": {
-        "name": "Instelpunt sanitair warm water"
-      },
-      "maximum_boiler_temperature": {
-        "name": "Instelpunt maximale boiler temperatuur"
-      },
       "temperature_offset": {
         "name": "Temperatuurcompensatie"
       }
@@ -108,7 +102,7 @@
         "name": "SWW modus",
         "state": {
           "comfort": "Comfort",
-          "off": "Uit"
+          "eco": "Eco"
         }
       },
       "select_gateway_mode": {
@@ -299,13 +293,21 @@
       }
     },
     "water_heater": {
-      "plugwise": {
-        "state": {
-          "auto": "Auto",
-          "boost": "Boost",
-          "comfort": "Comfort",
-          "eco": "Eco",
-          "off": "Off"
+      "boiler_temperature": {
+        "name": "Boiler"
+      },
+      "dhw_temperature": {
+        "name": "Sanitair warm water",
+        "state_attributes": {
+          "dhw_modes": {
+            "state": {
+              "auto": "Auto",
+              "boost": "Boost",
+              "comfort": "Comfort",
+              "eco": "Eco",
+              "off": "Uit"
+            }
+          }
         }
       }
     }