Skip to content

Q10: use readable YXCleanType values (vac_and_mop / vacuum / mop) #794

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
allenporter merged 12 commits into from
Mar 22, 2026
Merged

Q10: use readable YXCleanType values (vac_and_mop / vacuum / mop) #794

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3720ca6
refactor(q10): use readable YXCleanType values with legacy aliases
lboue Mar 22, 2026
3bfadcc
fix(cli): make clean mode option case insensitive
lboue Mar 22, 2026
17dd1a9
refactor(YXCleanType): move legacy values to a separate dictionary an…
lboue Mar 22, 2026
7cceb1f
test(YXCleanType): add tests for legacy clean type string aliases
lboue Mar 22, 2026
de68ff2
refactor(YXCleanType): simplify clean type definitions and remove leg…
lboue Mar 22, 2026
93072e2
test(YXCleanType): add tests for readable public values and compatibi…
lboue Mar 22, 2026
b4fa3a0
test(YXCleanType): add compatibility test for readable values in from…
lboue Mar 22, 2026
7e1a216
test(q10): update clean type code mapping tests
lboue Mar 22, 2026
4491a16
fix(q10): restrict clean mode cli choices
lboue Mar 22, 2026
aad3df9
refactor(YXCleanType): remove legacy test for readable public values
lboue Mar 22, 2026
22db4cb
test(YXCleanType): update test for readable values to use canonical n…
lboue Mar 22, 2026
0ba2672
test(YXCleanType): simplify test for readable values in from_value me…
lboue Mar 22, 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
7 changes: 6 additions & 1 deletion roborock/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,12 @@ async def q10_empty_dustbin(ctx: click.Context, device_id: str) -> None:

@session.command()
@click.option("--device_id", required=True, help="Device ID")
@click.option("--mode", required=True, type=click.Choice(["bothwork", "onlysweep", "onlymop"]), help="Clean mode")
@click.option(
"--mode",
required=True,
type=click.Choice(["vac_and_mop", "vacuum", "mop", "bothwork", "onlysweep", "onlymop"], case_sensitive=False),
Comment thread
lboue marked this conversation as resolved.
Outdated
help='Clean mode (preferred: "vac_and_mop", "vacuum", "mop")',
)
Comment thread
lboue marked this conversation as resolved.
Comment thread
lboue marked this conversation as resolved.
@click.pass_context
@async_command
async def q10_set_clean_mode(ctx: click.Context, device_id: str, mode: str) -> None:
Expand Down
6 changes: 3 additions & 3 deletions roborock/data/b01_q10/b01_q10_code_mappings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ class YXRoomMaterial(RoborockModeEnum):

class YXCleanType(RoborockModeEnum):
UNKNOWN = "unknown", -1
BOTH_WORK = "bothwork", 1
ONLY_SWEEP = "onlysweep", 2
ONLY_MOP = "onlymop", 3
VAC_AND_MOP = "vac_and_mop", 1 # bothwork
VACUUM = "vacuum", 2 # onlysweep
MOP = "mop", 3 # onlymop


Comment thread
lboue marked this conversation as resolved.
Comment thread
lboue marked this conversation as resolved.
Comment thread
lboue marked this conversation as resolved.
class YXDeviceState(RoborockModeEnum):
Expand Down
2 changes: 1 addition & 1 deletion tests/devices/traits/b01/q10/test_vacuum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def vacuumm_fixture(q10_api: Q10PropertiesApi) -> VacuumTrait:
(lambda x: x.stop_clean(), {"206": {}}),
(lambda x: x.return_to_dock(), {"203": {}}),
(lambda x: x.empty_dustbin(), {"203": 2}),
(lambda x: x.set_clean_mode(YXCleanType.BOTH_WORK), {"137": 1}),
(lambda x: x.set_clean_mode(YXCleanType.VAC_AND_MOP), {"137": 1}),
(lambda x: x.set_fan_level(YXFanLevel.BALANCED), {"123": 2}),
Comment thread
lboue marked this conversation as resolved.
],
)
Expand Down
Loading