Various updates

Author: bouwew

fixtures/anna_v4_no_modules/data.json

@@ -0,0 +1,20 @@
+{
+  "0466eae8520144c78afb29628384edeb": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "4.0.15",
+    "hardware": "AME Smile 2.0 board",
+    "location": "94c107dc6ac84ed98e9f68c0dd06bf71",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile_thermo",
+    "name": "Smile Anna",
+    "notifications": {},
+    "sensors": {
+      "outdoor_temperature": 7.44
+    },
+    "vendor": "Plugwise"
+  }
+}

plugwise/common.py

@@ -102,6 +102,7 @@ def _appl_heater_central_info(
         if not module_data["contents"]:
             module_data = self._get_module_data(xml_1, locator_2, xml_3)
             if not module_data["contents"]:
+                self._heater_id = NONE
                 return (
                     Munch()
                 )  # no module-data present means the device has been removed

plugwise/helper.py

@@ -172,7 +172,7 @@ def _get_p1_smartmeter_info(self) -> None:
         module_data = self._get_module_data(self._home_location, locator)
         # No module-data present means the device has been removed
         if not module_data["contents"]:  # pragma: no cover
-            return Munch()  # pragma: no cover
+            return
 
         appl.available = None
         appl.entity_id = self._gateway_id
@@ -220,15 +220,14 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch
                 return self._appl_thermostat_info(appl, appliance)
             case "heater_central":
                 # Collect heater_central entity info
-                self._appl_heater_central_info(
+                # 251016: the added guarding below also solves Core Issue #104433
+                if not self._appl_heater_central_info(
                     appl, appliance, False
-                )  # False means non-legacy entity
+                ):  # False means non-legacy entity
+                    return Munch()
                 self._dhw_allowed_modes = self._get_appl_actuator_modes(
                     appliance, "domestic_hot_water_mode_control_functionality"
                 )
-                # Skip orphaned heater_central (Core Issue #104433)
-                if appl.entity_id != self.heater_id:
-                    return Munch()
                 return appl
             case _ as s if s.endswith("_plug"):
                 # Collect info from plug-types (Plug, Aqara Smart Plug)

plugwise/legacy/helper.py

@@ -219,18 +219,14 @@ def _energy_entity_info_finder(self, appliance: etree, appl: Munch) -> Munch:
                     Munch()
                 )  # no module-data present means the device has been removed
 
-            appl.zigbee_mac = module_data["zigbee_mac_address"]
-            # Filter appliance without zigbee_mac, it's an orphaned device
-            if appl.zigbee_mac is None and self.smile.type != "power":
-                return None
-
+            appl.firmware = module_data["firmware_version"]
             appl.hardware = module_data["hardware_version"]
             appl.model = module_data["vendor_model"]
-            appl.vendor_name = module_data["vendor_name"]
             if appl.hardware is not None:
                 hw_version = appl.hardware.replace("-", "")
                 appl.model = version_to_model(hw_version)
-            appl.firmware = module_data["firmware_version"]
+            appl.vendor_name = module_data["vendor_name"]
+            appl.zigbee_mac = module_data["zigbee_mac_address"]
 
             return appl