Move collection of dhw_allowed_modes

Author: bouwew

plugwise/__init__.py

@@ -340,11 +340,6 @@ def _get_device_data(self, dev_id: str) -> DeviceData:
                 device_data["sensors"]["outdoor_temperature"] = outdoor_temperature
                 self._count += 1
 
-        # Show the allowed dhw_modes (Loria only)
-        if device["dev_class"] == "heater_central" and self._dhw_allowed_modes:
-            device_data["dhw_modes"] = self._dhw_allowed_modes
-            self._count += 1
-
         # Check availability of non-legacy wired-connected devices
         if not self._smile_legacy:
             self._check_availability(device, device_data)

plugwise/helper.py

@@ -1016,6 +1016,10 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData:
         measurements = DEVICE_MEASUREMENTS
         if self._is_thermostat and dev_id == self._heater_id:
             measurements = HEATER_CENTRAL_MEASUREMENTS
+            # Show the allowed dhw_modes (Loria only)
+            if self._dhw_allowed_modes:
+                data["dhw_modes"] = self._dhw_allowed_modes
+                # Counting of this item is done in _appliance_measurements()
 
         if (
             appliance := self._appliances.find(f'./appliance[@id="{dev_id}"]')