Try

Author: bouwew

plugwise_usb/__init__.py

@@ -120,12 +120,12 @@ def joined_nodes(self) -> int | None:
     @property
     def firmware_stick(self) -> str:
         """Firmware of USB-Stick."""
-        return self._controller.firmware_stick
+        return self._controller._fw_stick
 
     @property
     def hardware_stick(self) -> str:
         """Hardware of USB-Stick."""
-        return self._controller.hardware_stick
+        return self._controller._hw_stick
 
     @property
     def mac_stick(self) -> str:

plugwise_usb/connection/__init__.py

@@ -56,15 +56,15 @@ def is_connected(self) -> bool:
         """Return connection state from connection manager."""
         return self._manager.is_connected
 
-    @property
-    def firmware_stick(self) -> str | None:
-        """Firmware version of the Stick."""
-        return self._fw_stick
-
-    @property
-    def hardware_stick(self) -> str | None:
-        """Hardware version of the Stick."""
-        return self._hw_stick
+    # @property
+    # def firmware_stick(self) -> str | None:
+    #     """Firmware version of the Stick."""
+    #     return self._fw_stick
+
+    # @property
+    # def hardware_stick(self) -> str | None:
+    #     """Hardware version of the Stick."""
+    #     return self._hw_stick
 
     @property
     def mac_stick(self) -> str:

tests/test_usb.py

@@ -461,7 +461,7 @@ async def test_stick_connect(self, monkeypatch: pytest.MonkeyPatch) -> None:
         assert stick.mac_stick == "0123456789012345"
         assert stick.mac_coordinator == "0098765432101234"
         assert stick.firmware_stick == None
-        assert stick.hardware_stick == None  # "653907008512"
+        assert stick.hardware_stick == None
         assert not stick.network_discovered
         assert stick.network_state
         assert stick.network_id == 17185
@@ -578,6 +578,9 @@ async def test_stick_node_discovered_subscription(
             events=(pw_api.NodeEvent.AWAKE,),
         )
 
+        #assert stick.firmware_stick == None
+        assert stick.hardware_stick == "653907008512"
+
         # Inject NodeAwakeResponse message to trigger a 'node discovered' event
         mock_serial.inject_message(b"004F555555555555555500", b"FFFE")
         mac_awake_node = await self.test_node_awake