Clean-up after rebase

Author: bouwew

plugwise/constants.py

@@ -488,7 +488,6 @@ class DeviceData(TypedDict, total=False):
     """The Device Data class, covering the collected and ordered output-data per device."""
 
     # Appliance base data
-    has_actuators: bool
     dev_class: str
     firmware: str | None
     hardware: str

plugwise/helper.py

@@ -600,13 +600,12 @@ def _all_appliances(self) -> None:
                 # Legacy P1 has no more devices
                 return
 
-        hc_count = 0
         for appliance in self._appliances.findall("./appliance"):
             appl = Munch()
             appl.pwclass = appliance.find("type").text
             # Skip thermostats that have this key, should be an orphaned device (Core #81712)
             if (
-                appl.pwclass in ["heater_central", "thermostat"]
+                appl.pwclass == "thermostat"
                 and appliance.find("actuator_functionalities/") is None
             ):
                 continue
@@ -657,7 +656,6 @@ def _all_appliances(self) -> None:
             for key, value in {
                 "firmware": appl.firmware,
                 "hardware": appl.hardware,
-                "has_actuators": appl.has_actuators,
                 "location": appl.location,
                 "mac_address": appl.mac,
                 "model": appl.model,
@@ -670,22 +668,6 @@ def _all_appliances(self) -> None:
                     self.gw_devices[appl.dev_id][appl_key] = value
                     self._count += 1
 
-        # Remove thermostat with empty actuator_functionalities (Core #81712), remove heater_central
-        # with empty actuator_functionalities but only when there are more than one (Core #104433).
-        for dev_id, device in dict(self.gw_devices).items():
-            if device["dev_class"] == "thermostat" or (
-                device["dev_class"] == "heater_central" and hc_count > 1
-            ):
-                if not self.gw_devices[dev_id]["has_actuators"]:
-                    self._count -= len(self.gw_devices[dev_id])
-                    self.gw_devices.pop(dev_id)
-                else:
-                    self.gw_devices[dev_id].pop("has_actuators")
-                    self._count -= 1
-            elif "has_actuators" in self.gw_devices[dev_id]:
-                self.gw_devices[dev_id].pop("has_actuators")
-                self._count -= 1
-
         # For non-legacy P1 collect the connected SmartMeter info
         if self.smile_type == "power":
             self._p1_smartmeter_info_finder(appl)