Merge pull request #457 from plugwise/cooling_ena_fail

Add detection&removal of orphaned heater_central

Author: bouwew

CHANGELOG.md

@@ -1,13 +1,15 @@
 # Changelog
 
-## Ongoing
+## v0.35.2
 
-- Typing-constants clean-up
-- Improve/optimize/reorder
+- Add detection & removal of orphaned heater_central.
+- Bugfix for [Core Issue #104433](https://github.com/home-assistant/core/issues/104433)
+- Improve/optimize/reorder.
+- Typing-constants clean-up.
 
 ## v0.35.1
 
-- Update OFF-constant, removal capital begin-letter
+- Update OFF-constant, removal capital begin-letter.
 
 ## v0.35.0
 

plugwise/constants.py

@@ -488,6 +488,7 @@ 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

@@ -570,15 +570,21 @@ 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)
+            # Count amount of heater_central's
+            if appl.pwclass == "heater_central":
+                hc_count += 1
+            # Mark heater_central and thermostat that don't have actuator_functionalities,
+            # could be an orphaned device (Core #81712, #104433)
+            appl.has_actuators = True
             if (
-                appl.pwclass == "thermostat"
+                appl.pwclass in ["heater_central", "thermostat"]
                 and appliance.find("actuator_functionalities/") is None
             ):
-                continue
+                appl.has_actuators = False
 
             appl.location = None
             if (appl_loc := appliance.find("location")) is not None:
@@ -622,6 +628,7 @@ 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,
@@ -634,6 +641,22 @@ 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)
@@ -1521,15 +1544,12 @@ def _get_toggle_state(
         Obtain the toggle state of a 'toggle' = switch.
         """
         if xml.find("type").text == "heater_central":
-            locator = "./actuator_functionalities/toggle_functionality"
-            if found := xml.findall(locator):
-                for item in found:
-                    if (toggle_type := item.find("type")) is not None:
-                        if toggle_type.text == toggle:
-                            data["switches"][name] = item.find("state").text == "on"
-                            self._count += 1
-                            # Remove the cooling_enabled binary_sensor when the corresponding switch is present
-                            # Except for Elga
-                            if toggle == "cooling_enabled" and not self._elga:
-                                data["binary_sensors"].pop("cooling_enabled")
-                                self._count -= 1
+            locator = f"./actuator_functionalities/toggle_functionality[type='{toggle}']/state"
+            if (state := xml.find(locator)) is not None:
+                data["switches"][name] = state.text == "on"
+                self._count += 1
+                # Remove the cooling_enabled binary_sensor when the corresponding switch is present
+                # Except for Elga
+                if toggle == "cooling_enabled" and not self._elga:
+                    data["binary_sensors"].pop("cooling_enabled")
+                    self._count -= 1

userdata/anna_loria_cooling_active/core.appliances.xml

@@ -245,6 +245,71 @@
 			</offset_functionality>
 		</actuator_functionalities>
 	</appliance>
+	<appliance id='7eedf0882c76441894f0c6e6d4e2e0b1'>
+		<name>Central heating boiler</name>
+		<description></description>
+		<type>heater_central</type>
+		<created_date>2020-09-04T16:00:31.445+02:00</created_date>
+		<modified_date>2023-04-24T22:10:45.198+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<groups/>
+		<logs>
+			<point_log id='06d5ac3dab7a496994b9e86aaed5f327'>
+				<type>burner_efficiency</type>
+				<unit>s</unit>
+				<updated_date></updated_date>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval/>
+			</point_log>
+			<point_log id='5af30fdb36644525a54a09e11a37c93c'>
+				<type>central_heating_state</type>
+				<unit></unit>
+				<updated_date>2020-10-14T12:01:24.963+02:00</updated_date>
+				<last_consecutive_log_date>2020-10-14T12:01:24.963+02:00</last_consecutive_log_date>
+				<interval/>
+				<period start_date="2020-10-14T12:01:24.963+02:00" end_date="2020-10-14T12:01:24.963+02:00">
+					<measurement log_date="2020-10-14T12:01:24.963+02:00">off</measurement>
+				</period>
+			</point_log>
+			<point_log id='6bb8ca7751c24ec781b3d5e2d81a685a'>
+				<type>boiler_temperature</type>
+				<unit>C</unit>
+				<updated_date></updated_date>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<thermo_meter id='731ea93df60a40fba8fb01e2a240a98a'/>
+			</point_log>
+			<interval_log id='728a0285b9574514aa0d37e9d4e29b5a'>
+				<type>burner_operation_time</type>
+				<unit>s</unit>
+				<updated_date>2023-04-24T22:00:00+02:00</updated_date>
+				<last_consecutive_log_date>2023-04-24T21:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<interval_chrono_meter id='e243d6ab066749669f1c60560dc761a9'/>
+				<period start_date="2023-04-24T22:00:00+02:00" end_date="2023-04-24T22:00:00+02:00" interval="PT1H">
+					<measurement log_date="2023-04-24T22:00:00+02:00">0</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='c3dab94782644d2e82827b2a85c01dd0'>
+				<type>burner_efficiency</type>
+				<unit>s</unit>
+				<updated_date></updated_date>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+			<point_log id='cf65631d2523484b94037b2bb578ab0e'>
+				<type>intended_central_heating_state</type>
+				<unit></unit>
+				<updated_date>2020-10-14T11:57:27.823+02:00</updated_date>
+				<last_consecutive_log_date>2020-10-14T11:57:27.823+02:00</last_consecutive_log_date>
+				<interval/>
+				<period start_date="2020-10-14T11:57:27.823+02:00" end_date="2020-10-14T11:57:27.823+02:00">
+					<measurement log_date="2020-10-14T11:57:27.823+02:00">off</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities/>
+	</appliance>
 	<appliance id='bfb5ee0a88e14e5f97bfa725a760cc49'>
 		<name>Central heating boiler</name>
 		<description></description>