Less complex

Author: bouwew

plugwise/helper.py

@@ -327,13 +327,13 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
         data: GwEntityData = {"binary_sensors": {}, "sensors": {}, "switches": {}}
         # Get P1 smartmeter data from LOCATIONS
         entity = self.gw_entities[entity_id]
-        # !! DON'T CHANGE below two if-lines, will break stuff !!
-        if self.smile.type == "power" or self.smile.anna_p1:
-            if entity["dev_class"] == "smartmeter":
-                data.update(self._power_data_from_location())
+        dev_class = entity.get("dev_class")
+        smile_is_power = self.smile.type == "power"
+        if (smile_is_power or self.smile.anna_p1) and dev_class == "smartmeter":
+            data.update(self._power_data_from_location())
 
-            if not self.smile.anna_p1:
-                return data
+        if smile_is_power and not self.smile.anna_p1:
+            return data
 
         # Get non-P1 data from APPLIANCES
         measurements = DEVICE_MEASUREMENTS