Reworking

Author: bouwew

fixtures/adam_plus_anna_new/all_data.json

@@ -42,7 +42,7 @@
       "binary_sensors": {
         "low_battery": false
       },
-      "dev_class": "thermo_sensor",
+      "dev_class": "thermostatic_radiator_valve",
       "firmware": "2020-11-04T01:00:00+01:00",
       "hardware": "1",
       "location": "f871b8c4d63549319221e294e4f88074",
@@ -145,39 +145,15 @@
       "zigbee_mac_address": "000D6F000D13CB6F"
     },
     "ad4838d7d35c4d6ea796ee12ae5aedf8": {
-      "active_preset": "home",
-      "available_schedules": [
-        "Badkamer",
-        "Test",
-        "Vakantie",
-        "Weekschema",
-        "off"
-      ],
-      "climate_mode": "auto",
-      "control_state": "heating",
       "dev_class": "thermostat",
       "location": "f2bf9048bef64cc5b6d5110154e33c81",
       "model": "ThermoTouch",
       "model_id": "143.1",
       "name": "Anna",
-      "preset_modes": [
-        "no_frost",
-        "asleep",
-        "vacation",
-        "home",
-        "away"
-      ],
-      "select_schedule": "Weekschema",
       "sensors": {
         "setpoint": 18.5,
         "temperature": 18.4
       },
-      "thermostat": {
-        "lower_bound": 1.0,
-        "resolution": 0.01,
-        "setpoint": 18.5,
-        "upper_bound": 35.0
-      },
       "vendor": "Plugwise"
     },
     "da224107914542988a88561b4452b0f6": {
@@ -212,35 +188,17 @@
       "zigbee_mac_address": "000D6F000D5A168D"
     },
     "e2f4322d57924fa090fbbc48b3a140dc": {
-      "active_preset": "home",
       "available": true,
-      "available_schedules": [
-        "Badkamer",
-        "Test",
-        "Vakantie",
-        "Weekschema",
-        "off"
-      ],
       "binary_sensors": {
         "low_battery": true
       },
-      "climate_mode": "auto",
-      "control_state": "preheating",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-10T02:00:00+02:00",
       "hardware": "255",
       "location": "f871b8c4d63549319221e294e4f88074",
       "model": "Lisa",
       "model_id": "158-01",
       "name": "Lisa Badkamer",
-      "preset_modes": [
-        "no_frost",
-        "asleep",
-        "vacation",
-        "home",
-        "away"
-      ],
-      "select_schedule": "Badkamer",
       "sensors": {
         "battery": 14,
         "setpoint": 18.0,
@@ -252,12 +210,6 @@
         "setpoint": 0.0,
         "upper_bound": 2.0
       },
-      "thermostat": {
-        "lower_bound": 0.0,
-        "resolution": 0.01,
-        "setpoint": 18.0,
-        "upper_bound": 99.9
-      },
       "vendor": "Plugwise",
       "zigbee_mac_address": "000D6F000C869B61"
     },
@@ -278,7 +230,7 @@
     "cooling_present": false,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
-    "item_count": 165,
+    "item_count": 150,
     "notifications": {},
     "reboot": true,
     "smile_name": "Adam"

plugwise/__init__.py

@@ -308,7 +308,7 @@ def get_all_devices(self) -> None:
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
-        data = PlugwiseData({}, {})
+        data = PlugwiseData({}, {}, {})
         try:
             data = await self._smile_api.async_update()
             self.gateway_id = data.gateway["gateway_id"]

plugwise/constants.py

@@ -144,6 +144,11 @@
     "relay": UOM(NONE),
 }
 
+# Climate related measurements
+CLIMATE_MEASUREMENTS: Final[dict[str, DATA | UOM]] = {
+    "temperature": UOM(TEMP_CELSIUS),  # HA Core thermostat current_temperature
+}
+
 # Heater Central related measurements
 HEATER_CENTRAL_MEASUREMENTS: Final[dict[str, DATA | UOM]] = {
     "boiler_state": DATA(
@@ -492,7 +497,7 @@ class ThermoLoc(TypedDict, total=False):
     """Thermo Location class."""
 
     name: str
-    primary: str | None
+    primary: set[str]
     primary_prio: int
     secondary: set[str]
 
@@ -508,6 +513,25 @@ class ActuatorData(TypedDict, total=False):
     upper_bound: float
 
 
+class ClimateData(TypedDict, total=False):
+    """The Climate Data class, covering the collected and ordered output-data per location."""
+
+    dev_class: str
+    name: str
+    members: dict[str, str]  # TODO complete
+    climate_mode: str
+    # Extra for Adam Master Thermostats
+    control_state: str | bool
+    # Presets:
+    active_preset: str | None
+    preset_modes: list[str] | None
+    # Schedules:
+    available_schedules: list[str]
+    select_schedule: str
+
+    thermostat: ActuatorData
+
+
 class DeviceData(TypedDict, total=False):
     """The Device Data class, covering the collected and ordered output-data per device."""
 
@@ -544,32 +568,19 @@ class DeviceData(TypedDict, total=False):
     select_gateway_mode: str
     select_regulation_mode: str
 
-    # Master Thermostats
-    # Presets:
-    active_preset: str | None
-    preset_modes: list[str] | None
-    # Schedules:
-    available_schedules: list[str]
-    last_used: str | None
-    select_schedule: str
-
-    climate_mode: str
-    # Extra for Adam Master Thermostats
-    control_state: str | bool
-
     # Dict-types
     binary_sensors: SmileBinarySensors
     max_dhw_temperature: ActuatorData
     maximum_boiler_temperature: ActuatorData
     sensors: SmileSensors
     switches: SmileSwitches
     temperature_offset: ActuatorData
-    thermostat: ActuatorData
 
 
 @dataclass
 class PlugwiseData:
     """Plugwise data provided as output."""
 
     gateway: GatewayData
+    climates: dict[str, ClimateData]
     devices: dict[str, DeviceData]

plugwise/data.py

@@ -9,6 +9,7 @@
 from plugwise.constants import (
     ADAM,
     ANNA,
+    LOGGER,
     MAX_SETPOINT,
     MIN_SETPOINT,
     NONE,
@@ -35,6 +36,7 @@ def _all_device_data(self) -> None:
         Collect data for each device and add to self.gw_data and self.gw_devices.
         """
         self._update_gw_devices()
+        self._update_climates()
         self.gw_data.update(
             {
                 "gateway_id": self.gateway_id,
@@ -49,6 +51,15 @@ def _all_device_data(self) -> None:
                 {"heater_id": self._heater_id, "cooling_present": self._cooling_present}
             )
 
+    def _update_climates(self) -> None:
+        """Helper-function for _all_device_data() and async_update().
+
+        Collect data for each climate-location and add to self.climate_data.
+        """
+        for location_id, climate in self.climate_data.items():
+            data = self._get_location_data(location_id)
+            climate.update(data)
+
     def _update_gw_devices(self) -> None:
         """Helper-function for _all_device_data() and async_update().
 
@@ -140,10 +151,27 @@ def _update_for_cooling(self, device: DeviceData) -> None:
             sensors["setpoint_high"] = temp_dict["setpoint_high"]
             self._count += 2
 
-    def _get_device_data(self, dev_id: str) -> DeviceData:
+
+    def _get_location_data(self, loc_id: str) -> DeviceData:
         """Helper-function for _all_device_data() and async_update().
 
-        Provide device-data, based on Location ID (= dev_id), from APPLIANCES.
+        Provide device-data, based on Location ID (= loc_id).
+        """
+        climate = self.climate_data[loc_id]
+        data = self._get_climate_data(loc_id)
+        if ctrl_state := self._control_state(loc_id):
+            data["control_state"] = ctrl_state
+            self._count += 1
+
+        # Thermostat data (presets, temperatures etc)
+        self._device_data_climate(loc_id, climate, data)
+
+        return data
+
+    def _get_device_data(self, dev_id: str) -> DeviceData:
+        """Helper-function for _update_gw_devices() and async_update().
+
+        Provide device-data, based on appliance_id ()= dev_id).
         """
         device = self.gw_devices[dev_id]
         data = self._get_measurement_data(dev_id)
@@ -162,13 +190,7 @@ def _get_device_data(self, dev_id: str) -> DeviceData:
         # Switching groups data
         self._device_data_switching_group(device, data)
         # Adam data
-        self._device_data_adam(device, data)
-        # Skip obtaining data for (Adam) secondary thermostats
-        if device["dev_class"] not in ZONE_THERMOSTATS:
-            return data
-
-        # Thermostat data (presets, temperatures etc)
-        self._device_data_climate(device, data)
+        self._device_data_adam(dev_id, device, data)
 
         return data
 
@@ -187,7 +209,7 @@ def _check_availability(
                     if message in msg:
                         data["available"] = False
 
-    def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None:
+    def _device_data_adam(self, loc_id: str, device: DeviceData, data: DeviceData) -> None:
         """Helper-function for _get_device_data().
 
         Determine Adam heating-status for on-off heating via valves,
@@ -211,20 +233,12 @@ def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None:
                     data["gateway_modes"] = self._gw_allowed_modes
                     self._count += 1
 
-            # Control_state, only available for Adam primary thermostats
-            if device["dev_class"] in ZONE_THERMOSTATS:
-                loc_id = device["location"]
-                if ctrl_state := self._control_state(loc_id):
-                    data["control_state"] = ctrl_state
-                    self._count += 1
 
-    def _device_data_climate(self, device: DeviceData, data: DeviceData) -> None:
+    def _device_data_climate(self, loc_id: str, device: DeviceData, data: DeviceData) -> None:
         """Helper-function for _get_device_data().
 
         Determine climate-control device data.
         """
-        loc_id = device["location"]
-
         # Presets
         data["preset_modes"] = None
         data["active_preset"] = None