Skip to content

feat: add set_start_time and set_end_time to V1 timer traits #856

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

Draft
allenporter wants to merge 2 commits into
base: main
Choose a base branch
from
+162 −0
Draft

feat: add set_start_time and set_end_time to V1 timer traits #856

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
454199c
feat: add set_start_time and set_end_time to V1 timer traits
allenporter Jun 26, 2026
5815a6c
test: add test for setting end time when start time is not set
allenporter Jun 27, 2026
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
26 changes: 26 additions & 0 deletions roborock/devices/traits/v1/do_not_disturb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import datetime

from roborock.data import DnDTimer
from roborock.devices.traits.v1 import common
from roborock.roborock_typing import RoborockCommand
Expand All @@ -21,6 +23,30 @@ async def set_dnd_timer(self, dnd_timer: DnDTimer) -> None:
await self.rpc_channel.send_command(RoborockCommand.SET_DND_TIMER, params=dnd_timer.as_list())
await self.refresh()

async def set_start_time(self, start_time: datetime.time) -> None:
"""Set the start time of the Do Not Disturb (DND) timer."""
timer = DnDTimer(
start_hour=start_time.hour,
start_minute=start_time.minute,
end_hour=self.end_hour,
end_minute=self.end_minute,
enabled=self.enabled,
)
await self.rpc_channel.send_command(RoborockCommand.SET_DND_TIMER, params=timer.as_list())
await self.refresh()

async def set_end_time(self, end_time: datetime.time) -> None:
"""Set the end time of the Do Not Disturb (DND) timer."""
timer = DnDTimer(

@Lash-L Lash-L Jun 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we be checking if by chance self.start_hour or minute is None here? That's the root of the bug Paulus was having right? same thing above?

@allenporter allenporter Jun 27, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, sure. Once we check them for None what are you expecting to happen? Send in zeros or nulls? (i believe this is current behavior) or send nothing? lie to the caller and set end time on the trait without sending the RPC?

@Lash-L Lash-L Jul 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I think it shouldn't be possible to set a DND end time without passing in a start time. I'd have to test it but it seems like it would be wrong. i.e. if DND is somehow None, then the start time should be set before the end time.

Although, start time would be broken then, as the same issue could happen there.

@Lash-L Lash-L Jul 3, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can play around with some tests later.

@Lash-L Lash-L Jul 4, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay confirmed @allenporter

Vacuum will respond with '-10005: At least 1 parameter is not number' if any of the keys are None.

So we have to make sure we don't send None, maybe we need one more function that allows setting start and end time at the same time? I'm not sure if start/end will ever be None? My gut assumption would be that they default to some value, but I don't have proof for that.

start_hour=self.start_hour,
start_minute=self.start_minute,
end_hour=end_time.hour,
end_minute=end_time.minute,
enabled=self.enabled,
)
await self.rpc_channel.send_command(RoborockCommand.SET_DND_TIMER, params=timer.as_list())
await self.refresh()

async def clear_dnd_timer(self) -> None:
"""Clear the Do Not Disturb (DND) timer settings of the device."""
await self.rpc_channel.send_command(RoborockCommand.CLOSE_DND_TIMER)
Expand Down
26 changes: 26 additions & 0 deletions roborock/devices/traits/v1/valley_electricity_timer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import datetime

from roborock.data import ValleyElectricityTimer
from roborock.devices.traits.v1 import common
from roborock.roborock_typing import RoborockCommand
Expand All @@ -22,6 +24,30 @@ async def set_timer(self, timer: ValleyElectricityTimer) -> None:
await self.rpc_channel.send_command(RoborockCommand.SET_VALLEY_ELECTRICITY_TIMER, params=timer.as_list())
await self.refresh()

async def set_start_time(self, start_time: datetime.time) -> None:
"""Set the start time of the Valley Electricity Timer."""
timer = ValleyElectricityTimer(
start_hour=start_time.hour,
start_minute=start_time.minute,
end_hour=self.end_hour,
end_minute=self.end_minute,
enabled=self.enabled,
)
await self.rpc_channel.send_command(RoborockCommand.SET_VALLEY_ELECTRICITY_TIMER, params=timer.as_list())
await self.refresh()

async def set_end_time(self, end_time: datetime.time) -> None:
"""Set the end time of the Valley Electricity Timer."""
timer = ValleyElectricityTimer(
start_hour=self.start_hour,
start_minute=self.start_minute,
end_hour=end_time.hour,
end_minute=end_time.minute,
enabled=self.enabled,
)
await self.rpc_channel.send_command(RoborockCommand.SET_VALLEY_ELECTRICITY_TIMER, params=timer.as_list())
await self.refresh()

async def clear_timer(self) -> None:
"""Clear the Valley Electricity Timer settings of the device."""
await self.rpc_channel.send_command(RoborockCommand.CLOSE_VALLEY_ELECTRICITY_TIMER)
Expand Down
110 changes: 110 additions & 0 deletions tests/devices/traits/v1/test_dnd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Tests for the DoNotDisturbTrait class."""

import datetime
from unittest.mock import AsyncMock, call

import pytest
Expand Down Expand Up @@ -48,6 +49,8 @@ async def test_get_dnd_timer_success(
assert dnd_trait.end_minute == 0
assert dnd_trait.enabled == 1
assert dnd_trait.is_on
assert dnd_trait.start_time == datetime.time(22, 0)
assert dnd_trait.end_time == datetime.time(8, 0)

# Verify the RPC call was made correctly
mock_rpc_channel.send_command.assert_called_once_with(RoborockCommand.GET_DND_TIMER)
Expand Down Expand Up @@ -108,6 +111,113 @@ async def test_set_dnd_timer_success(
assert dnd_trait.end_minute == 0


async def test_set_start_time_success(dnd_trait: DoNotDisturbTrait, mock_rpc_channel: AsyncMock) -> None:
"""Test successfully setting start time on DND timer."""
mock_rpc_channel.send_command.side_effect = [
# Response for SET_DND_TIMER
{},
# Response for GET_DND_TIMER after updating
{
"startHour": 23,
"startMinute": 30,
"endHour": 8,
"endMinute": 0,
"enabled": 1,
},
]

# Set up initial trait state so it has an end time
dnd_trait.start_hour = 22
dnd_trait.start_minute = 0
dnd_trait.end_hour = 8
dnd_trait.end_minute = 0

await dnd_trait.set_start_time(datetime.time(23, 30))

# Verify the RPC call used the updated start hour/minute but kept the old end hour/minute
expected_params = [23, 30, 8, 0]
assert mock_rpc_channel.send_command.mock_calls == [
call(RoborockCommand.SET_DND_TIMER, params=expected_params),
call(RoborockCommand.GET_DND_TIMER),
]

assert dnd_trait.start_hour == 23
assert dnd_trait.start_minute == 30
assert dnd_trait.start_time == datetime.time(23, 30)


async def test_set_end_time_success(dnd_trait: DoNotDisturbTrait, mock_rpc_channel: AsyncMock) -> None:
"""Test successfully setting end time on DND timer."""
mock_rpc_channel.send_command.side_effect = [
# Response for SET_DND_TIMER
{},
# Response for GET_DND_TIMER after updating
{
"startHour": 22,
"startMinute": 0,
"endHour": 9,
"endMinute": 45,
"enabled": 1,
},
]

# Set up initial trait state so it has a start time
dnd_trait.start_hour = 22
dnd_trait.start_minute = 0
dnd_trait.end_hour = 8
dnd_trait.end_minute = 0

await dnd_trait.set_end_time(datetime.time(9, 45))

# Verify the RPC call used the old start hour/minute but updated the end hour/minute
expected_params = [22, 0, 9, 45]
assert mock_rpc_channel.send_command.mock_calls == [
call(RoborockCommand.SET_DND_TIMER, params=expected_params),
call(RoborockCommand.GET_DND_TIMER),
]

assert dnd_trait.end_hour == 9
assert dnd_trait.end_minute == 45
assert dnd_trait.end_time == datetime.time(9, 45)


async def test_set_end_time_when_start_time_not_set(dnd_trait: DoNotDisturbTrait, mock_rpc_channel: AsyncMock) -> None:
"""Test setting end time when start time is not set."""
mock_rpc_channel.send_command.side_effect = [
# Response for SET_DND_TIMER
{},
# Response for GET_DND_TIMER after updating
{
"startHour": None,
"startMinute": None,
"endHour": 9,
"endMinute": 45,
"enabled": 1,
},
]

# Set up initial trait state so it does NOT have a start time
dnd_trait.start_hour = None
dnd_trait.start_minute = None
dnd_trait.end_hour = None
dnd_trait.end_minute = None

await dnd_trait.set_end_time(datetime.time(9, 45))

expected_params = [None, None, 9, 45]
assert mock_rpc_channel.send_command.mock_calls == [
call(RoborockCommand.SET_DND_TIMER, params=expected_params),
call(RoborockCommand.GET_DND_TIMER),
]

assert dnd_trait.start_hour is None
assert dnd_trait.start_minute is None
assert dnd_trait.end_hour == 9
assert dnd_trait.end_minute == 45
assert dnd_trait.end_time == datetime.time(9, 45)
assert dnd_trait.start_time is None


async def test_clear_dnd_timer_success(dnd_trait: DoNotDisturbTrait, mock_rpc_channel: AsyncMock) -> None:
"""Test successfully clearing DnD timer settings."""
mock_rpc_channel.send_command.side_effect = [
Expand Down
Loading