Move _device_data_switching_group() to common.py

Author: bouwew

plugwise/common.py

@@ -224,3 +224,18 @@ def power_data_energy_diff(
             direct_data["sensors"][net_string] = tmp_val
 
         return direct_data
+
+    def _device_data_switching_group(
+        self, device: DeviceData, data: DeviceData
+    ) -> None:
+        """Helper-function for _get_device_data().
+
+        Determine switching group device data.
+        """
+        if device["dev_class"] in SWITCH_GROUP_TYPES:
+            counter = 0
+            for member in device["members"]:
+                if self.gw_devices[member]["switches"].get("relay"):
+                    counter += 1
+            data["switches"]["relay"] = counter != 0
+            self._count += 1

plugwise/data.py

@@ -103,21 +103,6 @@ def _all_device_data(self) -> None:
                 {"heater_id": self._heater_id, "cooling_present": self._cooling_present}
             )
 
-    def _device_data_switching_group(
-        self, device: DeviceData, data: DeviceData
-    ) -> None:
-        """Helper-function for _get_device_data().
-
-        Determine switching group device data.
-        """
-        if device["dev_class"] in SWITCH_GROUP_TYPES:
-            counter = 0
-            for member in device["members"]:
-                if self.gw_devices[member]["switches"].get("relay"):
-                    counter += 1
-            data["switches"]["relay"] = counter != 0
-            self._count += 1
-
     def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None:
         """Helper-function for _get_device_data().
 

plugwise/legacy/data.py

@@ -46,21 +46,6 @@ def _all_device_data(self) -> None:
                 {"heater_id": self._heater_id, "cooling_present": False}
             )
 
-    def _device_data_switching_group(
-        self, device: DeviceData, data: DeviceData
-    ) -> None:
-        """Helper-function for _get_device_data().
-
-        Determine switching group device data.
-        """
-        if device["dev_class"] in SWITCH_GROUP_TYPES:
-            counter = 0
-            for member in device["members"]:
-                if self.gw_devices[member]["switches"].get("relay"):
-                    counter += 1
-            data["switches"]["relay"] = counter != 0
-            self._count += 1
-
     def _device_data_climate(self, device: DeviceData, data: DeviceData) -> None:
         """Helper-function for _get_device_data().