PySwitchbot 0.48.0__tar.gz → 0.48.2__tar.gz

{pyswitchbot-0.48.0 → pyswitchbot-0.48.2}/PKG-INFO

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

{pyswitchbot-0.48.0 → pyswitchbot-0.48.2}/PySwitchbot.egg-info/PKG-INFO

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

{pyswitchbot-0.48.0 → pyswitchbot-0.48.2}/setup.py

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

{pyswitchbot-0.48.0 → pyswitchbot-0.48.2}/switchbot/adv_parser.py

@@ -19,7 +19,7 @@ from .adv_parsers.curtain import process_wocurtain
 from .adv_parsers.hub2 import process_wohub2
 from .adv_parsers.humidifier import process_wohumidifier
 from .adv_parsers.light_strip import process_wostrip
-from .adv_parsers.lock import process_wolock
+from .adv_parsers.lock import process_wolock, process_wolock_pro
 from .adv_parsers.meter import process_wosensorth
 from .adv_parsers.motion import process_wopresence
 from .adv_parsers.plug import process_woplugmini
@@ -153,7 +153,7 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
     "$": {
         "modelName": SwitchbotModel.LOCK_PRO,
         "modelFriendlyName": "Lock Pro",
-        "func": process_wolock,
+        "func": process_wolock_pro,
         "manufacturer_id": 2409,
     },
     "x": {

{pyswitchbot-0.48.0 → pyswitchbot-0.48.2}/switchbot/adv_parsers/lock.py

@@ -29,3 +29,28 @@ def process_wolock(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool
         "auto_lock_paused": bool(mfr_data[8] & 0b00000010),
         "night_latch": bool(mfr_data[9] & 0b00000001) if len(mfr_data) > 9 else False,
     }
+
+
+def process_wolock_pro(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    _LOGGER.debug("mfr_data: %s", mfr_data.hex())
+    if data:
+        _LOGGER.debug("data: %s", data.hex())
+
+    res = {
+        "battery": data[2] & 0b01111111 if data else None,
+        "calibration": bool(mfr_data[7] & 0b10000000),
+        "status": LockStatus((mfr_data[7] & 0b00111000) >> 3),
+        "door_open": bool(mfr_data[8] & 0b01100000),
+        # Double lock mode is not supported on Lock Pro
+        "update_from_secondary_lock": False,
+        "double_lock_mode": False,
+        "unclosed_alarm": bool(mfr_data[11] & 0b10000000),
+        "unlocked_alarm": bool(mfr_data[11] & 0b01000000),
+        "auto_lock_paused": bool(mfr_data[8] & 0b100000),
+        # Looks like night latch bit is not anymore in ADV
+        "night_latch": False,
+    }
+    _LOGGER.debug(res)
+    return res

{pyswitchbot-0.48.0 → pyswitchbot-0.48.2}/tests/test_adv_parser.py

@@ -1459,6 +1459,39 @@ def test_parsing_lock_pro_passive():
     )
 
 
+def test_parsing_lock_pro_passive_nightlatch_disabled():
+    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
+    adv_data = generate_advertisement_data(
+        manufacturer_data={2409: bytes.fromhex("aabbccddeeff0a8200630000")}, rssi=-67
+    )
+    result = parse_advertisement_data(ble_device, adv_data, SwitchbotModel.LOCK_PRO)
+    assert result == SwitchBotAdvertisement(
+        address="aa:bb:cc:dd:ee:ff",
+        data={
+            "data": {
+                "battery": None,
+                "calibration": True,
+                "status": LockStatus.LOCKED,
+                "update_from_secondary_lock": False,
+                "door_open": False,
+                "double_lock_mode": False,
+                "unclosed_alarm": False,
+                "unlocked_alarm": False,
+                "auto_lock_paused": False,
+                "night_latch": False,
+            },
+            "model": "$",
+            "isEncrypted": False,
+            "modelFriendlyName": "Lock Pro",
+            "modelName": SwitchbotModel.LOCK_PRO,
+            "rawAdvData": None,
+        },
+        device=ble_device,
+        rssi=-67,
+        active=False,
+    )
+
+
 def test_parsing_lock_active_old_firmware():
     """Test parsing lock with active data. Old firmware."""
     ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")