Use different approach for collection zone-data too

Author: bouwew

plugwise/data.py

@@ -45,8 +45,7 @@ def _update_zones(self) -> None:
         Collect data for each zone/location and add to self._zones.
         """
         for location_id, zone in self._zones.items():
-            data = self._get_location_data(location_id)
-            zone.update(data)
+            self._get_location_data(location_id, zone)
 
     def _update_gw_entities(self) -> None:
         """Helper-function for _all_entities_data() and async_update().
@@ -155,33 +154,30 @@ def _update_for_cooling(self, entity: GwEntityData) -> None:
                 3  # add 4 total, remove 1, count the conditional remove separately
             )
 
-    def _get_location_data(self, loc_id: str) -> GwEntityData:
+    def _get_location_data(self, loc_id: str, zone: GwEntityData) -> None:
         """Helper-function for _all_entity_data() and async_update().
 
         Provide entity-data, based on Location ID (= loc_id).
         """
-        zone = self._zones[loc_id]
-        data = self._get_zone_data(loc_id)
-        self._regulation_control(data)
+        self._get_zone_data(loc_id, zone)
+        self._regulation_control(zone)
 
-        data["control_state"] = "idle"
+        zone["control_state"] = "idle"
         self._count += 1
-        if (ctrl_state := self._control_state(data)) and ctrl_state in (
+        if (ctrl_state := self._control_state(zone)) and ctrl_state in (
             "cooling",
             "heating",
             "preheating",
         ):
-            data["control_state"] = str(ctrl_state)
+            zone["control_state"] = str(ctrl_state)
 
-        if "setpoint" in data["sensors"]:
-            data["sensors"].pop("setpoint")  # remove, only used in _control_state()
+        if "setpoint" in zone["sensors"]:
+            zone["sensors"].pop("setpoint")  # remove, only used in _control_state()
             self._count -= 1
 
         # Thermostat data (presets, temperatures etc)
         self._climate_data(loc_id, zone)
 
-        return data
-
     def _get_entity_data(self, entity_id: str, entity: GwEntityData) -> None:
         """Helper-function for _update_gw_entities() and async_update().
 

plugwise/helper.py

@@ -305,21 +305,20 @@ def _get_appliances_with_offset_functionality(self) -> list[str]:
 
         return therm_list
 
-    def _get_zone_data(self, loc_id: str) -> GwEntityData:
+    def _get_zone_data(self, loc_id: str, zone: GwEntityData) -> None:
         """Helper-function for smile.py: _get_entity_data().
 
-        Collect the location-data based on location id.
+        Collect the location/zone-data based on location id.
         """
         data: GwEntityData = {"sensors": {}}
-        zone = self._zones[loc_id]
         measurements = ZONE_MEASUREMENTS
         if (
             location := self._domain_objects.find(f'./location[@id="{loc_id}"]')
         ) is not None:
             self._appliance_measurements(location, data, measurements)
             self._get_actuator_functionalities(location, zone, data)
 
-        return data
+        zone.update(data)
 
     def _get_measurement_data(self, entity_id: str, entity: GwEntityData) -> None:
         """Helper-function for smile.py: _get_entity_data().