Simplify property-names, improve

Author: bouwew

plugwise_usb/__init__.py

@@ -118,12 +118,12 @@ def joined_nodes(self) -> int | None:
         return len(self._network.registry) + 1
 
     @property
-    def firmware_stick(self) -> str:
+    def firmware(self) -> str:
         """Firmware of USB-Stick."""
         return self._controller.firmware_stick
 
     @property
-    def hardware_stick(self) -> str:
+    def hardware(self) -> str:
         """Hardware of USB-Stick."""
         return self._controller.hardware_stick
 

plugwise_usb/connection/__init__.py

@@ -44,6 +44,7 @@ def __init__(self) -> None:
         self._mac_nc: str | None = None
         self._network_id: int | None = None
         self._network_online = False
+        self._stick_name: str | None = None
 
     @property
     def is_initialized(self) -> bool:

tests/test_usb.py

@@ -461,8 +461,8 @@ async def test_stick_connect(self, monkeypatch: pytest.MonkeyPatch) -> None:
         assert stick.mac_stick == "0123456789012345"
         assert stick.name == "Stick 12345"
         assert stick.mac_coordinator == "0098765432101234"
-        assert stick.firmware_stick == dt(2011, 6, 27, 8, 47, 37, tzinfo=UTC)
-        assert stick.hardware_stick == "070085"
+        assert stick.firmware == dt(2011, 6, 27, 8, 47, 37, tzinfo=UTC)
+        assert stick.hardware == "070085"
         assert not stick.network_discovered
         assert stick.network_state
         assert stick.network_id == 17185