PySwitchbot 0.52.0__tar.gz → 0.53.0__tar.gz

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySwitchbot
-Version: 0.52.0
+Version: 0.53.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/Danielhiversen/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySwitchbot
-Version: 0.52.0
+Version: 0.53.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/Danielhiversen/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/PySwitchbot.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ switchbot/adv_parsers/contact.py
 switchbot/adv_parsers/curtain.py
 switchbot/adv_parsers/hub2.py
 switchbot/adv_parsers/humidifier.py
+switchbot/adv_parsers/keypad.py
 switchbot/adv_parsers/light_strip.py
 switchbot/adv_parsers/lock.py
 switchbot/adv_parsers/meter.py
@@ -40,6 +41,7 @@ switchbot/devices/contact.py
 switchbot/devices/curtain.py
 switchbot/devices/device.py
 switchbot/devices/humidifier.py
+switchbot/devices/keypad.py
 switchbot/devices/light_strip.py
 switchbot/devices/lock.py
 switchbot/devices/meter.py

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/setup.py

@@ -10,7 +10,7 @@ setup(
         "cryptography>=39.0.0",
         "pyOpenSSL>=23.0.0",
     ],
-    version="0.52.0",
+    version="0.53.0",
     description="A library to communicate with Switchbot",
     author="Daniel Hjelseth Hoyer",
     url="https://github.com/Danielhiversen/pySwitchbot/",

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/switchbot/adv_parser.py

@@ -18,6 +18,7 @@ from .adv_parsers.contact import process_wocontact
 from .adv_parsers.curtain import process_wocurtain
 from .adv_parsers.hub2 import process_wohub2
 from .adv_parsers.humidifier import process_wohumidifier
+from .adv_parsers.keypad import process_wokeypad
 from .adv_parsers.light_strip import process_wostrip
 from .adv_parsers.lock import process_wolock, process_wolock_pro
 from .adv_parsers.meter import process_wosensorth, process_wosensorth_c
@@ -177,14 +178,20 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "func": process_woblindtilt,
         "manufacturer_id": 2409,
     },
+    "y": {
+        "modelName": SwitchbotModel.KEYPAD,
+        "modelFriendlyName": "Keypad",
+        "func": process_wokeypad,
+        "manufacturer_id": 2409,
+    },
     "<": {
-        "modelName": SwitchbotModel.RelaySwitch1PM,
+        "modelName": SwitchbotModel.RELAY_SWITCH_1PM,
         "modelFriendlyName": "Relay Switch 1PM",
         "func": process_worelay_switch_1pm,
         "manufacturer_id": 2409,
     },
     ";": {
-        "modelName": SwitchbotModel.RelaySwitch1Plus,
+        "modelName": SwitchbotModel.RELAY_SWITCH_1_PLUS,
         "modelFriendlyName": "Relay Switch 1",
         "func": process_worelay_switch_1plus,
         "manufacturer_id": 2409,

pyswitchbot-0.53.0/switchbot/adv_parsers/keypad.py

@@ -0,0 +1,22 @@
+"""Keypad parser."""
+
+from __future__ import annotations
+
+import logging
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def process_wokeypad(
+    data: bytes | None,
+    mfr_data: bytes | None,
+) -> dict[str, bool | int | None]:
+    """Process woKeypad services data."""
+    if data is None or mfr_data is None:
+        return {"battery": None, "attempt_state": None}
+
+    _LOGGER.debug("mfr_data: %s", mfr_data.hex())
+    if data:
+        _LOGGER.debug("data: %s", data.hex())
+
+    return {"battery": data[2] & 0b01111111, "attempt_state": mfr_data[6]}

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/switchbot/const.py

@@ -1,4 +1,5 @@
 """Library to handle connection with Switchbot."""
+
 from __future__ import annotations
 
 from enum import Enum
@@ -52,8 +53,9 @@ class SwitchbotModel(StrEnum):
     LOCK_PRO = "WoLockPro"
     BLIND_TILT = "WoBlindTilt"
     HUB2 = "WoHub2"
-    RelaySwitch1PM = "Relay Switch 1PM"
-    RelaySwitch1Plus = "Relay Switch 1"
+    KEYPAD = "WoKeypad"
+    RELAY_SWITCH_1PM = "Relay Switch 1PM"
+    RELAY_SWITCH_1_PLUS = "Relay Switch 1"
 
 
 class LockStatus(Enum):

pyswitchbot-0.53.0/switchbot/devices/motion.py

@@ -0,0 +1 @@
+from __future__ import annotations

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/switchbot/devices/relay_switch.py

@@ -25,7 +25,7 @@ class SwitchbotRelaySwitch(SwitchbotSequenceDevice):
         key_id: str,
         encryption_key: str,
         interface: int = 0,
-        model: SwitchbotModel = SwitchbotModel.RelaySwitch1PM,
+        model: SwitchbotModel = SwitchbotModel.RELAY_SWITCH_1PM,
         **kwargs: Any,
     ) -> None:
         if len(key_id) == 0:

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/switchbot/discovery.py

@@ -124,6 +124,10 @@ class GetSwitchbotDevices:
         lock_pros = await self._get_devices_by_model("$")
         return {**locks, **lock_pros}
 
+    async def get_keypads(self) -> dict[str, SwitchBotAdvertisement]:
+        """Return all WoKeypad/Keypad devices with services data."""
+        return await self._get_devices_by_model("y")
+
     async def get_device_data(
         self, address: str
     ) -> dict[str, SwitchBotAdvertisement] | None:

{pyswitchbot-0.52.0 → pyswitchbot-0.53.0}/tests/test_adv_parser.py

@@ -1647,3 +1647,28 @@ def test_meter_pro_c_passive() -> None:
         rssi=-67,
         active=False,
     )
+
+
+def test_parse_advertisement_data_keypad():
+    """Test parse_advertisement_data for the keypad."""
+    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
+    adv_data = generate_advertisement_data(
+        manufacturer_data={2409: b"\xeb\x13\x02\xe6#\x0f\x8fd\x00\x00\x00\x00"},
+        service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": b"y\x00d"},
+        rssi=-67,
+    )
+    result = parse_advertisement_data(ble_device, adv_data, SwitchbotModel.KEYPAD)
+    assert result == SwitchBotAdvertisement(
+        address="aa:bb:cc:dd:ee:ff",
+        data={
+            "data": {"attempt_state": 143, "battery": 100},
+            "isEncrypted": False,
+            "model": "y",
+            "modelFriendlyName": "Keypad",
+            "modelName": SwitchbotModel.KEYPAD,
+            "rawAdvData": b"y\x00d",
+        },
+        device=ble_device,
+        rssi=-67,
+        active=True,
+    )