Collect Stick data during initialization

Author: bouwew

plugwise_usb/connection/__init__.py

@@ -190,11 +190,11 @@ async def initialize_stick(self) -> None:
         self._network_id = init_response.network_id
         self._is_initialized = True
 
-        # # add Stick NodeInfoRequest
-        # node_info, _ = await self.get_node_details(self._mac_stick, False)
-        # if node_info is not None:
-        #     self._fw_stick = node_info.firmware
-        #     self._hw_stick = node_info.hardware
+        # Add Stick NodeInfoRequest
+        node_info, _ = await self.get_node_details(self._mac_stick, ping_first=False)
+        if node_info is not None:
+            self._fw_stick = node_info.firmware
+            self._hw_stick = node_info.hardware
 
         if not self._network_online:
             raise StickError("Zigbee network connection to Circle+ is down.")

plugwise_usb/network/__init__.py

@@ -285,17 +285,6 @@ def _unsubscribe_to_protocol_events(self) -> None:
             self._unsubscribe_stick_event = None
 
     # endregion
-
-    async def discover_stick(self) -> bool:
-        """Fetch data from the Stick."""
-        if self._controller.mac_stick is None:
-            raise NodeError("Unknown mac address for the Stick.")
-
-        _LOGGER.debug("Obtaining Stick info")
-        node_info, _ = await self._controller.get_node_details(self._controller.mac_stick, ping_first=False)
-        if node_info is not None:
-            self._controller._fw_stick = node_info.firmware
-            self._controller._hw_stick = node_info.hardware
 
     # region - Coordinator
     async def discover_network_coordinator(self, load: bool = False) -> bool:
@@ -493,7 +482,6 @@ async def start(self) -> None:
 
     async def discover_nodes(self, load: bool = True) -> bool:
         """Discover nodes."""
-        await self.discover_stick()
         await self.discover_network_coordinator(load=load)
         if not self._is_running:
             await self.start()