Skip to content

Commit 93c2d7e

Browse files
committed
chore: merge main
2 parents 9a94f6c + acd298e commit 93c2d7e

23 files changed

Lines changed: 1240 additions & 81 deletions

‎CHANGELOG.md‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,81 @@
22

33
<!-- version list -->
44

5+
## v7.19.0 (2026-11-08)
6+
7+
### Bug Fixes
8+
9+
- **dyad**: Decode F25 Ultra drying mode
10+
([#1019](https://github.com/Python-roborock/python-roborock/pull/1019),
11+
[`a2cfdcf`](https://github.com/Python-roborock/python-roborock/commit/a2cfdcf133f4c8a0ab9e93b145ea40727f4d0aae))
12+
13+
### Features
14+
15+
- **dyad**: Add F25 Ultra drying mode, schedule and reset support
16+
([#1019](https://github.com/Python-roborock/python-roborock/pull/1019),
17+
[`a2cfdcf`](https://github.com/Python-roborock/python-roborock/commit/a2cfdcf133f4c8a0ab9e93b145ea40727f4d0aae))
18+
19+
- **dyad**: Add filter and brush reset commands
20+
([#1019](https://github.com/Python-roborock/python-roborock/pull/1019),
21+
[`a2cfdcf`](https://github.com/Python-roborock/python-roborock/commit/a2cfdcf133f4c8a0ab9e93b145ea40727f4d0aae))
22+
23+
- **dyad**: Decode schedule and add drying commands
24+
([#1019](https://github.com/Python-roborock/python-roborock/pull/1019),
25+
[`a2cfdcf`](https://github.com/Python-roborock/python-roborock/commit/a2cfdcf133f4c8a0ab9e93b145ea40727f4d0aae))
26+
27+
### Refactoring
28+
29+
- Give water slide modes their own enum values
30+
([#993](https://github.com/Python-roborock/python-roborock/pull/993),
31+
[`4924dca`](https://github.com/Python-roborock/python-roborock/commit/4924dca2e210e72c1f7bc4d7c0cea847ea875142))
32+
33+
34+
## v7.18.0 (2026-11-08)
35+
36+
### Features
37+
38+
- Add Q10 map management controls
39+
([#934](https://github.com/Python-roborock/python-roborock/pull/934),
40+
[`99e47d2`](https://github.com/Python-roborock/python-roborock/commit/99e47d20a0e3552f1bc8c638ee4ebd5d8aee2bfd))
41+
42+
43+
## v7.17.0 (2026-11-08)
44+
45+
### Features
46+
47+
- Render Q10 map obstacle markers
48+
([#938](https://github.com/Python-roborock/python-roborock/pull/938),
49+
[`f0341e8`](https://github.com/Python-roborock/python-roborock/commit/f0341e8629f65393b84df2c5077eef8ce36e5ed0))
50+
51+
52+
## v7.16.0 (2026-11-08)
53+
54+
### Features
55+
56+
- **dyad**: Decode F25 Ultra data points
57+
([#1017](https://github.com/Python-roborock/python-roborock/pull/1017),
58+
[`2052b09`](https://github.com/Python-roborock/python-roborock/commit/2052b09832b3d26cbebcce94a9c6271dea0e2441))
59+
60+
61+
## v7.15.3 (2026-11-08)
62+
63+
### Bug Fixes
64+
65+
- **dyad**: Add steam and hot water clean modes
66+
([#1015](https://github.com/Python-roborock/python-roborock/pull/1015),
67+
[`ba86fec`](https://github.com/Python-roborock/python-roborock/commit/ba86fec51f905f1f58f7208031127d211c250e56))
68+
69+
- **dyad**: Parametrize clean mode tests with F25 Ultra codes
70+
([#1015](https://github.com/Python-roborock/python-roborock/pull/1015),
71+
[`ba86fec`](https://github.com/Python-roborock/python-roborock/commit/ba86fec51f905f1f58f7208031127d211c250e56))
72+
73+
### Documentation
74+
75+
- **dyad**: Note F25 Ultra reports Sponge mode as clean mode 3
76+
([#1015](https://github.com/Python-roborock/python-roborock/pull/1015),
77+
[`ba86fec`](https://github.com/Python-roborock/python-roborock/commit/ba86fec51f905f1f58f7208031127d211c250e56))
78+
79+
580
## v7.15.2 (2026-11-02)
681

782
### Bug Fixes

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "python-roborock"
3-
version = "7.15.2"
3+
version = "7.19.0"
44
description = "A package to control Roborock vacuums."
55
authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
66
requires-python = ">=3.11, <4"

‎roborock/data/b01_q10/b01_q10_code_mappings.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from enum import IntEnum
22

3-
from ..code_mappings import RoborockModeEnum
3+
from ..code_mappings import RoborockEnum, RoborockModeEnum
44

55

66
class B01_Q10_DP(RoborockModeEnum):
@@ -354,3 +354,12 @@ class RemoteCommand(IntEnum):
354354
RIGHT = 3
355355
STOP = 4
356356
EXIT = 5
357+
358+
359+
class Q10RestrictionType(RoborockEnum):
360+
"""Restriction types supported by the Q10 map editor."""
361+
362+
unknown = -1
363+
NO_GO = 0
364+
NO_MOP = 2
365+
THRESHOLD = 3

‎roborock/data/dyad/dyad_code_mappings.py‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ class DyadMode(RoborockEnum):
4545

4646

4747
class DyadCleanMode(RoborockEnum):
48+
unknown = -1
4849
auto = 1
4950
max = 2
50-
dehydration = 3
51+
dehydration = 3 # The F25 Ultra reports its "Sponge" mode with this code.
5152
power_saving = 4
53+
# Heated modes on the F25 Ultra, confirmed by switching modes on the device.
54+
hot_water = 5
55+
steam = 6
5256

5357

5458
class DyadSuction(RoborockEnum):
@@ -79,6 +83,65 @@ class DyadCleanser(RoborockEnum):
7983
max = 3
8084

8185

86+
class DyadCleanserAmount(RoborockEnum):
87+
"""Detergent dosing level (DP 238)."""
88+
89+
unknown = -1
90+
off = 0
91+
low = 1
92+
standard = 2
93+
high = 3
94+
95+
96+
class DyadCleanAssistPower(RoborockEnum):
97+
"""Wheel assist power (DP 241)."""
98+
99+
unknown = -1
100+
gentle = 1
101+
moderate = 2
102+
strong = 3
103+
104+
105+
class DyadSelfCleanWaterTemp(RoborockEnum):
106+
"""Water temperature used for self-cleaning (DP 242, reported back on DP 271)."""
107+
108+
unknown = -1
109+
high = 3
110+
steam = 4
111+
112+
113+
class DyadSelfCleanIntensity(RoborockEnum):
114+
"""Self-cleaning intensity (DP 270).
115+
116+
Smart mode is enabled through DP 239; standard and deep follow DP 203.
117+
"""
118+
119+
unknown = -1
120+
smart = 0
121+
standard = 1
122+
deep = 2
123+
124+
125+
class DyadPowerwheelDirection(RoborockEnum):
126+
"""Drive direction while the vacuum is remote controlled from the app (DP 249)."""
127+
128+
unknown = -1
129+
stop = 0
130+
forward = 1
131+
backward = 2
132+
left = 5
133+
right = 6
134+
exit = 9 # sent when remote control ends
135+
136+
137+
class DyadDryingMode(RoborockEnum):
138+
"""Drying mode of the F25 Ultra, reported on DP 272 and set through DP 225."""
139+
140+
unknown = -1
141+
fast = 5
142+
silent = 22
143+
144+
82145
class DyadError(RoborockEnum):
83146
none = 0
84147
dirty_tank_full = 20000 # Dirty tank full. Empty it

‎roborock/data/dyad/dyad_containers.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,21 @@ class DyadSndState(RoborockBase):
2323
language: str
2424

2525

26+
@dataclass
27+
class DyadScheduleTask(RoborockBase):
28+
"""A task from the device schedule (DP 10002).
29+
30+
`cron` uses the device's local time. On the F25 Ultra every task had the same
31+
`dp_action`, while the device ran nothing, drying, or self-clean and drying,
32+
so the action that will run cannot be inferred from `dp_action`.
33+
"""
34+
35+
id: int
36+
on: bool
37+
cron: str
38+
dp_action: dict[int, int]
39+
40+
2641
@dataclass
2742
class DyadOtaNfo(RoborockBase):
2843
mqttOtaData: dict

‎roborock/data/v1/v1_clean_modes.py‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ class WaterModes(RoborockModeEnum):
5757
SMART_MODE = ("smart_mode", 209)
5858
SMART_WATER = ("smart_water", 210)
5959
PURE_WATER_FLOW_START = ("slight", 221)
60-
PURE_WATER_FLOW_SMALL = ("low", 225)
60+
PURE_WATER_FLOW_SMALL = ("pure_water_flow_small", 225, "low")
6161
PURE_WATER_FLOW_GENTLE = ("gentle", 230)
62-
PURE_WATER_FLOW_MIDDLE = ("medium", 235)
62+
PURE_WATER_FLOW_MIDDLE = ("pure_water_flow_middle", 235, "medium")
6363
PURE_WATER_FLOW_LARGE = ("moderate", 240)
64-
PURE_WATER_SUPER_BEGIN = ("high", 245)
65-
PURE_WATER_FLOW_END = ("extreme", 250)
64+
PURE_WATER_SUPER_BEGIN = ("pure_water_super_begin", 245, "high")
65+
PURE_WATER_FLOW_END = ("pure_water_flow_end", 250, "extreme")
6666

6767

6868
class WashTowelModes(RoborockModeEnum):
@@ -89,16 +89,16 @@ class CleaningMode(StrEnum):
8989
SMART_MODE = "smart_mode"
9090

9191

92-
WATER_SLIDE_MODE_MAPPING: dict[int, WaterModes] = {
93-
200: WaterModes.OFF,
94-
221: WaterModes.PURE_WATER_FLOW_START,
95-
225: WaterModes.PURE_WATER_FLOW_SMALL,
96-
230: WaterModes.PURE_WATER_FLOW_GENTLE,
97-
235: WaterModes.PURE_WATER_FLOW_MIDDLE,
98-
240: WaterModes.PURE_WATER_FLOW_LARGE,
99-
245: WaterModes.PURE_WATER_SUPER_BEGIN,
100-
250: WaterModes.PURE_WATER_FLOW_END,
101-
}
92+
_WATER_SLIDE_MODES: tuple[WaterModes, ...] = (
93+
WaterModes.OFF,
94+
WaterModes.PURE_WATER_FLOW_START,
95+
WaterModes.PURE_WATER_FLOW_SMALL,
96+
WaterModes.PURE_WATER_FLOW_GENTLE,
97+
WaterModes.PURE_WATER_FLOW_MIDDLE,
98+
WaterModes.PURE_WATER_FLOW_LARGE,
99+
WaterModes.PURE_WATER_SUPER_BEGIN,
100+
WaterModes.PURE_WATER_FLOW_END,
101+
)
102102

103103
# Water slide devices report the raw slider position (1-30) as 220 + position.
104104
# The app groups positions into named ranges, keyed here by their last position.
@@ -177,7 +177,7 @@ def get_water_modes(features: DeviceFeatures) -> list[WaterModes]:
177177
"""Get the valid water modes for the device - also known as 'water flow' or 'water level'"""
178178
# Water slide mode supports a separate set of water flow codes.
179179
if features.is_water_slide_mode_supported:
180-
return list(WATER_SLIDE_MODE_MAPPING.values())
180+
return list(_WATER_SLIDE_MODES)
181181

182182
supported_modes = [WaterModes.OFF]
183183
if features.is_mop_shake_module_supported:
@@ -201,7 +201,7 @@ def get_water_modes(features: DeviceFeatures) -> list[WaterModes]:
201201
def get_water_slide_mode_name(code: int) -> str | None:
202202
"""Get the app's range name for a water slide code, or None if out of range."""
203203
mode = _resolve_water_slide_mode(code)
204-
return mode.value if mode is not None else None
204+
return mode.display_name if mode is not None else None
205205

206206

207207
def _resolve_water_slide_mode(code: int) -> WaterModes | None:
@@ -222,13 +222,10 @@ def _resolve_water_slide_mode(code: int) -> WaterModes | None:
222222
def get_water_mode_mapping(features: DeviceFeatures) -> dict[int, str]:
223223
"""Get water mode mapping by supported feature set.
224224
225-
WaterModes contains aliases for multiple codes that share the same value
226-
string (e.g. low can be 201 or 225). For water slide mode devices we need
227-
explicit code mapping to preserve those slide-specific codes.
225+
Water slide modes share user-facing names with legacy modes (e.g. "low" is
226+
201 or 225), so the mapping uses display_name rather than the enum value.
228227
"""
229-
if features.is_water_slide_mode_supported:
230-
return {code: mode.value for code, mode in WATER_SLIDE_MODE_MAPPING.items()}
231-
return {mode.code: mode.value for mode in get_water_modes(features)}
228+
return {mode.code: mode.display_name for mode in get_water_modes(features)}
232229

233230

234231
def get_cleaning_mode_options(features: DeviceFeatures) -> list[CleaningMode]:
@@ -309,14 +306,7 @@ def get_cleaning_mode_parameters(cleaning_mode: CleaningMode, features: DeviceFe
309306
raise RoborockUnsupportedFeature(f"Cleaning mode {cleaning_mode.value!r} is not supported")
310307

311308
fan_power, water_box_mode, mop_mode = _get_clean_motor_mode_params(cleaning_mode, features)
312-
water_code = water_box_mode.code
313-
if features.is_water_slide_mode_supported:
314-
# Aliased water enums retain legacy codes; the device mapping preserves
315-
# slide-specific wire values without changing the user-facing names.
316-
water_code = next(
317-
code for code, name in get_water_mode_mapping(features).items() if name == water_box_mode.value
318-
)
319-
params: dict[str, int] = {"fan_power": fan_power.code, "water_box_mode": water_code}
309+
params: dict[str, int] = {"fan_power": fan_power.code, "water_box_mode": water_box_mode.code}
320310
if features.is_clean_route_setting_supported:
321311
params["mop_mode"] = mop_mode.code
322312
return [params]
@@ -342,6 +332,15 @@ def _resolve_clean_mode(value: int | VacuumModes | None, features: DeviceFeature
342332
return VacuumModes.from_code_optional(value)
343333

344334

335+
def _resolve_water_mode(value: int | WaterModes | None, features: DeviceFeatures) -> WaterModes | None:
336+
"""Resolve a water mode code, mapping raw slider positions on water slide devices."""
337+
if value is None or isinstance(value, WaterModes):
338+
return value
339+
if features.is_water_slide_mode_supported:
340+
return _resolve_water_slide_mode(value) or WaterModes.from_code_optional(value)
341+
return WaterModes.from_code_optional(value)
342+
343+
345344
def get_current_cleaning_mode(
346345
clean_mode: int | VacuumModes | None,
347346
water_mode: int | WaterModes | None,
@@ -352,9 +351,7 @@ def get_current_cleaning_mode(
352351
if not features.is_support_water_mode:
353352
return None
354353
clean_mode_enum = _resolve_clean_mode(clean_mode, features)
355-
water_mode_enum = _resolve_mode_code(water_mode, WaterModes)
356-
if features.is_water_slide_mode_supported and isinstance(water_mode, int):
357-
water_mode_enum = _resolve_water_slide_mode(water_mode) or water_mode_enum
354+
water_mode_enum = _resolve_water_mode(water_mode, features)
358355
mop_mode_enum = _resolve_mode_code(mop_mode, CleanRoutes)
359356
if clean_mode_enum is None or water_mode_enum is None:
360357
return None

0 commit comments

Comments
 (0)