Skip to content

Fix periodic reporting status for lock series #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2025
Merged

Fix periodic reporting status for lock series #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f64d10
remove enable notifications
zerzhang Jul 9, 2025
0dde8ed
fix COMMAND_DISABLE_NOTIFICATIONS command
zerzhang Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions switchbot/devices/lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@
SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4e0101000000",
SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4e0101000000",
}
COMMAND_ENABLE_NOTIFICATIONS = f"{COMMAND_HEADER}0e01001e00008101"
COMMAND_ENABLE_NOTIFICATIONS = {
SwitchbotModel.LOCK: f"{COMMAND_HEADER}0e01001e00008101",
SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0e01001e00008101",
SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0e01001e00008104",
SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0e01001e00008107",
}
COMMAND_DISABLE_NOTIFICATIONS = f"{COMMAND_HEADER}0e00"

MOVING_STATUSES = {LockStatus.LOCKING, LockStatus.UNLOCKING}
Expand Down Expand Up @@ -197,12 +202,8 @@ async def _get_lock_info(self) -> bytes | None:
return _data

async def _enable_notifications(self) -> bool:
if self._notifications_enabled:
return True
result = await self._send_command(COMMAND_ENABLE_NOTIFICATIONS)
if self._check_command_result(result, 0, COMMAND_RESULT_EXPECTED_VALUES):
self._notifications_enabled = True
return self._notifications_enabled
result = await self._send_command(COMMAND_ENABLE_NOTIFICATIONS[self._model])
return self._check_command_result(result, 0, COMMAND_RESULT_EXPECTED_VALUES)

async def _disable_notifications(self) -> bool:
if not self._notifications_enabled:
Expand All @@ -213,7 +214,7 @@ async def _disable_notifications(self) -> bool:
return not self._notifications_enabled

def _notification_handler(self, _sender: int, data: bytearray) -> None:
if self._notifications_enabled and self._check_command_result(data, 0, {0xF}):
if self._check_command_result(data, 0, {0xF}):
if self._expected_disconnect:
_LOGGER.debug(
"%s: Ignoring lock notification during expected disconnect",
Expand Down
23 changes: 1 addition & 22 deletions tests/test_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,27 +372,6 @@ async def test_enable_notifications(model: str):
with patch.object(device, "_send_command", return_value=b"\x01\x00"):
result = await device._enable_notifications()
assert result is True
assert device._notifications_enabled is True


@pytest.mark.asyncio
@pytest.mark.parametrize(
"model",
[
SwitchbotModel.LOCK,
SwitchbotModel.LOCK_LITE,
SwitchbotModel.LOCK_PRO,
SwitchbotModel.LOCK_ULTRA,
],
)
async def test_enable_notifications_already_enabled(model: str):
"""Test _enable_notifications when already enabled."""
device = create_device_for_command_testing(model)
device._notifications_enabled = True
with patch.object(device, "_send_command") as mock_send:
result = await device._enable_notifications()
assert result is True
mock_send.assert_not_called()


@pytest.mark.asyncio
Expand Down Expand Up @@ -467,7 +446,7 @@ def test_notification_handler_not_enabled(model: str):
"""Test _notification_handler when notifications not enabled."""
device = create_device_for_command_testing(model)
device._notifications_enabled = False
data = bytearray(b"\x0f\x00\x00\x00\x80\x00\x00\x00\x00\x00")
data = bytearray(b"\x01\x00\x00\x00\x80\x00\x00\x00\x00\x00")
with (
patch.object(device, "_update_lock_status") as mock_update,
patch.object(
Expand Down