Fix the lock status broadcast parsing (#360)

zerzhang · pre-commit-ci[bot] · bdraco · web-flow · commit efc0cd4fd1fd · 2025-06-25T13:23:54.000+02:00
Co-authored-by: pre-commit-ci[bot] &lt;66853113+pre-commit-ci[bot]@users.noreply.github.com&gt;
Co-authored-by: J. Nick Koston &lt;nick@koston.org&gt;
diff --git a/switchbot/adv_parser.py b/switchbot/adv_parser.py
@@ -25,7 +25,12 @@
 from .adv_parsers.keypad import process_wokeypad
 from .adv_parsers.leak import process_leak
 from .adv_parsers.light_strip import process_light, process_wostrip
-from .adv_parsers.lock import process_lock2, process_wolock, process_wolock_pro
+from .adv_parsers.lock import (
+    process_lock2,
+    process_locklite,
+    process_wolock,
+    process_wolock_pro,
+)
 from .adv_parsers.meter import process_wosensorth, process_wosensorth_c
 from .adv_parsers.motion import process_wopresence
 from .adv_parsers.plug import process_woplugmini
@@ -304,7 +309,7 @@ class SwitchbotSupportedType(TypedDict):
     "-": {
         "modelName": SwitchbotModel.LOCK_LITE,
         "modelFriendlyName": "Lock Lite",
-        "func": process_wolock,
+        "func": process_locklite,
         "manufacturer_id": 2409,
     },
     b"\x00\x10\xa5\xb8": {
diff --git a/switchbot/adv_parsers/lock.py b/switchbot/adv_parsers/lock.py
@@ -11,6 +11,21 @@
 
 def process_wolock(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Support for lock and lock lite process data."""
+    common_data = process_locklite(data, mfr_data)
+    if not common_data:
+        return {}
+
+    common_data["door_open"] = bool(mfr_data[7] & 0b00000100)
+    common_data["unclosed_alarm"] = bool(mfr_data[8] & 0b00100000)
+    common_data["auto_lock_paused"] = bool(mfr_data[8] & 0b00000010)
+
+    return common_data
+
+
+def process_locklite(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    """Support for lock lite process data."""
     if mfr_data is None:
         return {}
 
@@ -24,11 +39,8 @@ def process_wolock(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool
         "calibration": bool(mfr_data[7] & 0b10000000),
         "status": LockStatus((mfr_data[7] & 0b01110000) >> 4),
         "update_from_secondary_lock": bool(mfr_data[7] & 0b00001000),
-        "door_open": bool(mfr_data[7] & 0b00000100),
         "double_lock_mode": bool(mfr_data[8] & 0b10000000),
-        "unclosed_alarm": bool(mfr_data[8] & 0b00100000),
         "unlocked_alarm": bool(mfr_data[8] & 0b00010000),
-        "auto_lock_paused": bool(mfr_data[8] & 0b00000010),
         "night_latch": bool(mfr_data[9] & 0b00000001) if len(mfr_data) > 9 else False,
     }
 
@@ -37,10 +49,11 @@ def parse_common_data(mfr_data: bytes | None) -> dict[str, bool | int]:
     if mfr_data is None:
         return {}
 
+    _LOGGER.debug("mfr_data: %s", mfr_data.hex())
     return {
         "sequence_number": mfr_data[6],
         "calibration": bool(mfr_data[7] & 0b10000000),
-        "status": LockStatus((mfr_data[7] & 0b01111000) >> 4),
+        "status": LockStatus((mfr_data[7] & 0b01111000) >> 3),
         "update_from_secondary_lock": bool(mfr_data[8] & 0b11000000),
         "door_open_from_secondary_lock": bool(mfr_data[8] & 0b00100000),
         "door_open": bool(mfr_data[8] & 0b00010000),
diff --git a/switchbot/devices/lock.py b/switchbot/devices/lock.py
@@ -16,8 +16,8 @@
 COMMAND_LOCK_INFO = {
     SwitchbotModel.LOCK: f"{COMMAND_HEADER}0f4f8101",
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0f4f8101",
-    SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4f8102",
-    SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4f8102",
+    SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4f8104",
+    SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4f8107",
 }
 COMMAND_UNLOCK = {
     SwitchbotModel.LOCK: f"{COMMAND_HEADER}0f4e01011080",
@@ -143,14 +143,18 @@ async def get_basic_info(self) -> dict[str, Any] | None:
         lock_raw_data = await self._get_lock_info()
         if not lock_raw_data:
             return None
-
+        _LOGGER.debug(
+            "lock_raw_data: %s, address: %s", lock_raw_data.hex(), self._device.address
+        )
         basic_data = await self._get_basic_info()
         if not basic_data:
             return None
-
-        return self._parse_lock_data(lock_raw_data[1:]) | self._parse_basic_data(
-            basic_data
+        _LOGGER.debug(
+            "basic_data: %s, address: %s", basic_data.hex(), self._device.address
         )
+        return self._parse_lock_data(
+            lock_raw_data[1:], self._model
+        ) | self._parse_basic_data(basic_data)
 
     def is_calibrated(self) -> Any:
         """Return True if lock is calibrated."""
@@ -215,7 +219,7 @@ def _notification_handler(self, _sender: int, data: bytearray) -> None:
             super()._notification_handler(_sender, data)
 
     def _update_lock_status(self, data: bytearray) -> None:
-        lock_data = self._parse_lock_data(self._decrypt(data[4:]))
+        lock_data = self._parse_lock_data(self._decrypt(data[4:]), self._model)
         if self._update_parsed_data(lock_data):
             # We leave notifications enabled in case
             # the lock is operated manually before we
@@ -224,11 +228,25 @@ def _update_lock_status(self, data: bytearray) -> None:
             self._fire_callbacks()
 
     @staticmethod
-    def _parse_lock_data(data: bytes) -> dict[str, Any]:
+    def _parse_lock_data(data: bytes, model: SwitchbotModel) -> dict[str, Any]:
+        if model == SwitchbotModel.LOCK:
+            return {
+                "calibration": bool(data[0] & 0b10000000),
+                "status": LockStatus((data[0] & 0b01110000) >> 4),
+                "door_open": bool(data[0] & 0b00000100),
+                "unclosed_alarm": bool(data[1] & 0b00100000),
+                "unlocked_alarm": bool(data[1] & 0b00010000),
+            }
+        if model == SwitchbotModel.LOCK_LITE:
+            return {
+                "calibration": bool(data[0] & 0b10000000),
+                "status": LockStatus((data[0] & 0b01110000) >> 4),
+                "unlocked_alarm": bool(data[1] & 0b00010000),
+            }
         return {
             "calibration": bool(data[0] & 0b10000000),
-            "status": LockStatus((data[0] & 0b01110000) >> 4),
-            "door_open": bool(data[0] & 0b00000100),
-            "unclosed_alarm": bool(data[1] & 0b00100000),
-            "unlocked_alarm": bool(data[1] & 0b00010000),
+            "status": LockStatus((data[0] & 0b01111000) >> 3),
+            "door_open": bool(data[1] & 0b00010000),
+            "unclosed_alarm": bool(data[5] & 0b10000000),
+            "unlocked_alarm": bool(data[5] & 0b01000000),
         }
diff --git a/tests/test_adv_parser.py b/tests/test_adv_parser.py
@@ -2650,11 +2650,8 @@ def test_hub3_with_empty_data() -> None:
                 "calibration": True,
                 "status": LockStatus.UNLOCKED,
                 "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,
             },
             "-",
@@ -2688,7 +2685,7 @@ def test_hub3_with_empty_data() -> None:
                 "sequence_number": 58,
                 "battery": 100,
                 "calibration": True,
-                "status": LockStatus.LOCKED,
+                "status": LockStatus.UNLOCKED,
                 "update_from_secondary_lock": False,
                 "door_open": False,
                 "door_open_from_secondary_lock": False,
@@ -2771,11 +2768,8 @@ def test_lock_active(test_case: AdvTestCase) -> None:
                 "calibration": True,
                 "status": LockStatus.UNLOCKED,
                 "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,
             },
             "-",
@@ -2809,7 +2803,7 @@ def test_lock_active(test_case: AdvTestCase) -> None:
                 "sequence_number": 58,
                 "battery": 100,
                 "calibration": True,
-                "status": LockStatus.LOCKED,
+                "status": LockStatus.UNLOCKED,
                 "update_from_secondary_lock": False,
                 "door_open": False,
                 "door_open_from_secondary_lock": False,
diff --git a/tests/test_lock.py b/tests/test_lock.py
