Fix legacy

Author: bouwew

plugwise/legacy/data.py

@@ -21,7 +21,7 @@ def __init__(self) -> None:
     def _all_device_data(self) -> None:
         """Helper-function for get_all_devices().
 
-        Collect data for each device and add to self.gw_data and self.gw_devices.
+        Collect data for each device and add to self.gw_data and self.gw_device_zones.
         """
         self._update_gw_devices()
         self.gw_data.update(
@@ -39,9 +39,9 @@ def _all_device_data(self) -> None:
     def _update_gw_devices(self) -> None:
         """Helper-function for _all_device_data() and async_update().
 
-        Collect data for each device and add to self.gw_devices.
+        Collect data for each device and add to self.gw_device_zones.
         """
-        for device_id, device in self.gw_devices.items():
+        for device_id, device in self.gw_device_zones.items():
             data = self._get_device_data(device_id)
             device.update(data)
             remove_empty_platform_dicts(device)
@@ -51,7 +51,7 @@ def _get_device_data(self, dev_id: str) -> DeviceZoneData:
 
         Provide device-data, based on Location ID (= dev_id), from APPLIANCES.
         """
-        device = self.gw_devices[dev_id]
+        device = self.gw_device_zones[dev_id]
         data = self._get_measurement_data(dev_id)
 
         # Switching groups data

plugwise/legacy/helper.py

@@ -80,7 +80,7 @@ def __init__(self) -> None:
 
         self.gateway_id: str
         self.gw_data: GatewayData = {}
-        self.gw_devices: dict[str, DeviceZoneData] = {}
+        self.gw_device_zones: dict[str, DeviceZoneData] = {}
         self.loc_data: dict[str, ThermoLoc]
         self.smile_fw_version: Version | None
         self.smile_hw_version: str | None
@@ -143,17 +143,17 @@ def _all_appliances(self) -> None:
             if appl.pwclass == "heater_central" and appl.dev_id != self._heater_id:
                 continue  # pragma: no cover
 
-            self._create_gw_devices(appl)
+            self._create_gw_device_zones(appl)
 
         # Place the gateway and optional heater_central devices as 1st and 2nd
         for dev_class in ("heater_central", "gateway"):
-            for dev_id, device in dict(self.gw_devices).items():
+            for dev_id, device in dict(self.gw_device_zones).items():
                 if device["dev_class"] == dev_class:
                     tmp_device = device
-                    self.gw_devices.pop(dev_id)
-                    cleared_dict = self.gw_devices
+                    self.gw_device_zones.pop(dev_id)
+                    cleared_dict = self.gw_device_zones
                     add_to_front = {dev_id: tmp_device}
-                    self.gw_devices = {**add_to_front, **cleared_dict}
+                    self.gw_device_zones = {**add_to_front, **cleared_dict}
 
     def _all_locations(self) -> None:
         """Collect all locations."""
@@ -194,7 +194,7 @@ def _create_legacy_gateway(self) -> None:
         if self.smile_type == "power":
             self.gateway_id = FAKE_APPL
 
-        self.gw_devices[self.gateway_id] = {"dev_class": "gateway"}
+        self.gw_device_zones[self.gateway_id] = {"dev_class": "gateway"}
         self._count += 1
         for key, value in {
             "firmware": str(self.smile_fw_version),
@@ -207,7 +207,7 @@ def _create_legacy_gateway(self) -> None:
         }.items():
             if value is not None:
                 gw_key = cast(ApplianceType, key)
-                self.gw_devices[self.gateway_id][gw_key] = value
+                self.gw_device_zones[self.gateway_id][gw_key] = value
                 self._count += 1
 
     def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
@@ -265,7 +265,7 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         location = self._locations.find(f'./location[@id="{loc_id}"]')
         appl = self._energy_device_info_finder(location, appl)
 
-        self._create_gw_devices(appl)
+        self._create_gw_device_zones(appl)
 
     def _get_measurement_data(self, dev_id: str) -> DeviceZoneData:
         """Helper-function for smile.py: _get_device_data().
@@ -274,7 +274,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceZoneData:
         """
         data: DeviceZoneData = {"binary_sensors": {}, "sensors": {}, "switches": {}}
         # Get P1 smartmeter data from LOCATIONS or MODULES
-        device = self.gw_devices[dev_id]
+        device = self.gw_device_zones[dev_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
         if self.smile_type == "power":
             if device["dev_class"] == "smartmeter":

plugwise/legacy/smile.py

@@ -102,7 +102,7 @@ def get_all_devices(self) -> None:
 
         # Collect and add switching- and/or pump-group devices
         if group_data := self._get_group_switches():
-            self.gw_devices.update(group_data)
+            self.gw_device_zones.update(group_data)
 
         # Collect the remaining data for all devices
         self._all_device_data()
@@ -119,8 +119,7 @@ async def async_update(self) -> PlugwiseData:
                 "Performing daily full-update, reload the Plugwise integration when a single entity becomes unavailable."
             )
             self.gw_data: GatewayData = {}
-            self.gw_devices: dict[str, DeviceZoneData] = {}
-            self.zone_data: dict[str, DeviceZoneData] = {}
+            self.gw_device_zones: dict[str, DeviceZoneData] = {}
             await self.full_update_device()
             self.get_all_devices()
         # Otherwise perform an incremental update
@@ -136,9 +135,8 @@ async def async_update(self) -> PlugwiseData:
 
         self._previous_day_number = day_number
         return PlugwiseData(
-            devices=self.gw_devices,
+            device_zones=self.gw_device_zones,
             gateway=self.gw_data,
-            zones=self.zone_data,
         )
 
 ########################################################################################################