Rework legacy

Author: bouwew

plugwise/legacy/data.py

@@ -28,67 +28,63 @@ def _update_gw_entities(self) -> None:
         Collect data for each entity and add to self.gw_entities.
         """
         for entity_id, entity in self.gw_entities.items():
-            data = self._get_entity_data(entity_id)
-            entity.update(data)
+            self._get_entity_data(entity_id, entity)
             remove_empty_platform_dicts(entity)
 
-    def _get_entity_data(self, entity_id: str) -> GwEntityData:
+    def _get_entity_data(self, entity_id: str, entity: GwEntityData) -> None:
         """Helper-function for _all_entity_data() and async_update().
 
         Provide entity-data, based on Location ID (= entity_id), from APPLIANCES.
         """
-        entity = self.gw_entities[entity_id]
-        data = self._get_measurement_data(entity_id)
+        self._get_measurement_data(entity_id, entity)
 
         # Switching groups data
-        self._entity_switching_group(entity, data)
+        self._entity_switching_group(entity)
 
         # Skip obtaining data when not a thermostat
         if entity["dev_class"] != "thermostat":
-            return data
+            return
 
         # Thermostat data (presets, temperatures etc)
-        self._climate_data(entity, data)
-        self._get_anna_control_state(data)
+        self._climate_data(entity)
+        self._get_anna_control_state(entity)
 
-        return data
-
-    def _climate_data(self, entity: GwEntityData, data: GwEntityData) -> None:
+    def _climate_data(self, entity: GwEntityData) -> None:
         """Helper-function for _get_entity_data().
 
         Determine climate-control entity data.
         """
         # Presets
-        data["preset_modes"] = None
-        data["active_preset"] = None
+        entity["preset_modes"] = None
+        entity["active_preset"] = None
         self._count += 2
         if presets := self._presets():
-            data["preset_modes"] = list(presets)
-            data["active_preset"] = self._preset()
+            entity["preset_modes"] = list(presets)
+            entity["active_preset"] = self._preset()
 
         # Schedule
-        data["available_schedules"] = []
-        data["select_schedule"] = None
+        entity["available_schedules"] = []
+        entity["select_schedule"] = None
         self._count += 2
         avail_schedules, sel_schedule = self._schedules()
         if avail_schedules != [NONE]:
-            data["available_schedules"] = avail_schedules
-            data["select_schedule"] = sel_schedule
+            entity["available_schedules"] = avail_schedules
+            entity["select_schedule"] = sel_schedule
 
         # Set HA climate HVACMode: auto, heat
-        data["climate_mode"] = "auto"
+        entity["climate_mode"] = "auto"
         self._count += 1
         if sel_schedule in (NONE, OFF):
-            data["climate_mode"] = "heat"
+            entity["climate_mode"] = "heat"
 
-    def _get_anna_control_state(self, data: GwEntityData) -> None:
+    def _get_anna_control_state(self, entity: GwEntityData) -> None:
         """Set the thermostat control_state based on the opentherm/onoff device state."""
-        data["control_state"] = "idle"
+        entity["control_state"] = "idle"
         self._count += 1
-        for entity in self.gw_entities.values():
-            if entity["dev_class"] != "heater_central":
+        for device in self.gw_entities.values():
+            if device["dev_class"] != "heater_central":
                 continue
 
-            binary_sensors = entity["binary_sensors"]
+            binary_sensors = device["binary_sensors"]
             if binary_sensors["heating_state"]:
-                data["control_state"] = "heating"
+                entity["control_state"] = "heating"

plugwise/legacy/helper.py

@@ -249,20 +249,20 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
 
         self._create_gw_entities(appl)
 
-    def _get_measurement_data(self, entity_id: str) -> GwEntityData:
+    def _get_measurement_data(self, entity_id: str, entity: GwEntityData) -> None:
         """Helper-function for smile.py: _get_entity_data().
 
         Collect the appliance-data based on entity_id.
         """
         data: GwEntityData = {"binary_sensors": {}, "sensors": {}, "switches": {}}
         # Get P1 smartmeter data from MODULES
-        entity = self.gw_entities[entity_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
         if self.smile.type == "power":
             if entity["dev_class"] == "smartmeter":
                 data.update(self._power_data_from_modules())
 
-            return data
+            entity.update(data)
+            return
 
         measurements = DEVICE_MEASUREMENTS
         if self._is_thermostat and entity_id == self.heater_id:
@@ -290,7 +290,8 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
             data.pop("c_heating_state")
             self._count -= 1
 
-        return data
+        entity.update(data)
+        return
 
     def _power_data_from_modules(self) -> GwEntityData:
         """Helper-function for smile.py: _get_entity_data().