Reduce complexity 3

Author: bouwew

plugwise/helper.py

@@ -534,10 +534,8 @@ def _get_measurement_data(self, dev_id: str) -> DeviceZoneData:
             if appliance.find("type").text in ACTUATOR_CLASSES:
                 self._get_actuator_functionalities(appliance, device, data)
 
-        if dev_id == self.gateway_id and self.smile(ADAM):
-            self._get_regulation_mode(appliance, data)
-            self._get_gateway_mode(appliance, data)
-
+        self._get_regulation_mode(appliance, dev_id, data)
+        self._get_gateway_mode(appliance, dev_id, data)
         self._get_gateway_outdoor_temp(dev_id, data)
 
         if "c_heating_state" in data:
@@ -546,7 +544,8 @@ def _get_measurement_data(self, dev_id: str) -> DeviceZoneData:
             data.pop("c_heating_state")
             self._count -= 1
 
-        self._update_anna_cooling(dev_id, data)
+        if self._is_thermostat and self.smile(ANNA):
+            self._update_anna_cooling(dev_id, data)
 
     def _power_data_from_location(self, loc_id: str) -> DeviceZoneData:
         """Helper-function for smile.py: _get_device_zone_data().
@@ -692,22 +691,32 @@ def _get_actuator_functionalities(
                 act_item = cast(ActuatorType, item)
                 data[act_item] = temp_dict
 
-    def _get_regulation_mode(self, appliance: etree, data: DeviceZoneData) -> None:
+    def _get_regulation_mode(
+        self, appliance: etree, dev_id: str, data: DeviceZoneData
+    ) -> None:
         """Helper-function for _get_measurement_data().
 
-        Collect the gateway regulation_mode.
+        Adam: collect the gateway regulation_mode.
         """
+        if not (self.smile(ADAM) and dev_id == self.gateway_id):
+            return
+
         locator = "./actuator_functionalities/regulation_mode_control_functionality"
         if (search := appliance.find(locator)) is not None:
             data["select_regulation_mode"] = search.find("mode").text
             self._count += 1
             self._cooling_enabled = data["select_regulation_mode"] == "cooling"
 
-    def _get_gateway_mode(self, appliance: etree, data: DeviceZoneData) -> None:
+    def _get_gateway_mode(
+        self, appliance: etree, dev_id: str, data: DeviceZoneData
+    ) -> None:
         """Helper-function for _get_measurement_data().
 
-        Collect the gateway mode.
+        Adam: collect the gateway mode.
         """
+        if not (self.smile(ADAM) and dev_id == self.gateway_id):
+            return
+
         locator = "./actuator_functionalities/gateway_mode_control_functionality"
         if (search := appliance.find(locator)) is not None:
             data["select_gateway_mode"] = search.find("mode").text
@@ -746,7 +755,7 @@ def _process_c_heating_state(self, data: DeviceZoneData) -> None:
         """
         # Adam or Anna + OnOff device
         if self._on_off_device:
-            self._process_on_off_device_c_heating_state(self, data)
+            self._process_on_off_device_c_heating_state(data)
 
         # Anna + Elga: use central_heating_state to show heating_state
         if self._elga:
@@ -777,7 +786,7 @@ def _update_anna_cooling(self, dev_id: str, data: DeviceZoneData) -> None:
 
         Support added for Techneco Elga and Thercon Loria/Thermastage.
         """
-        if self._is_thermostat and self.smile(ANNA) and dev_id == self._heater_id:
+        if dev_id == self._heater_id:
             # Anna+Elga: base cooling_state on the elga-status-code
             if "elga_status_code" in data:
                 if data["thermostat_supports_cooling"]: