Skip to content

Commit 5420f8d

Browse files
authored
fix: map water slide positions to the app's flow ranges (#975)
1 parent d54fc90 commit 5420f8d

3 files changed

Lines changed: 70 additions & 6 deletions

File tree

‎roborock/data/v1/v1_clean_modes.py‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ class WaterModes(RoborockModeEnum):
5757
SMART_MODE = ("smart_mode", 209)
5858
PURE_WATER_FLOW_START = ("slight", 221)
5959
PURE_WATER_FLOW_SMALL = ("low", 225)
60+
PURE_WATER_FLOW_GENTLE = ("gentle", 230)
6061
PURE_WATER_FLOW_MIDDLE = ("medium", 235)
61-
PURE_WATER_FLOW_LARGE = ("moderate", 245)
62-
PURE_WATER_SUPER_BEGIN = ("high", 248)
62+
PURE_WATER_FLOW_LARGE = ("moderate", 240)
63+
PURE_WATER_SUPER_BEGIN = ("high", 245)
6364
PURE_WATER_FLOW_END = ("extreme", 250)
6465

6566

@@ -91,12 +92,25 @@ class CleaningMode(StrEnum):
9192
200: WaterModes.OFF,
9293
221: WaterModes.PURE_WATER_FLOW_START,
9394
225: WaterModes.PURE_WATER_FLOW_SMALL,
95+
230: WaterModes.PURE_WATER_FLOW_GENTLE,
9496
235: WaterModes.PURE_WATER_FLOW_MIDDLE,
95-
245: WaterModes.PURE_WATER_FLOW_LARGE,
96-
248: WaterModes.PURE_WATER_SUPER_BEGIN,
97+
240: WaterModes.PURE_WATER_FLOW_LARGE,
98+
245: WaterModes.PURE_WATER_SUPER_BEGIN,
9799
250: WaterModes.PURE_WATER_FLOW_END,
98100
}
99101

102+
# Water slide devices report the raw slider position (1-30) as 220 + position.
103+
# The app groups positions into named ranges, keyed here by their last position.
104+
_WATER_SLIDE_RANGES: tuple[tuple[int, WaterModes], ...] = (
105+
(3, WaterModes.PURE_WATER_FLOW_START),
106+
(7, WaterModes.PURE_WATER_FLOW_SMALL),
107+
(12, WaterModes.PURE_WATER_FLOW_GENTLE),
108+
(17, WaterModes.PURE_WATER_FLOW_MIDDLE),
109+
(22, WaterModes.PURE_WATER_FLOW_LARGE),
110+
(27, WaterModes.PURE_WATER_SUPER_BEGIN),
111+
(30, WaterModes.PURE_WATER_FLOW_END),
112+
)
113+
100114
ModeEnumT = TypeVar("ModeEnumT", bound=RoborockModeEnum)
101115

102116

@@ -183,6 +197,19 @@ def get_water_modes(features: DeviceFeatures) -> list[WaterModes]:
183197
return supported_modes
184198

185199

200+
def get_water_slide_mode_name(code: int) -> str | None:
201+
"""Get the app's range name for a water slide code, or None if out of range."""
202+
if code == 200:
203+
return WaterModes.OFF.value
204+
position = code - 220
205+
if position < 1:
206+
return None
207+
for last_position, mode in _WATER_SLIDE_RANGES:
208+
if position <= last_position:
209+
return mode.value
210+
return None
211+
212+
186213
def get_water_mode_mapping(features: DeviceFeatures) -> dict[int, str]:
187214
"""Get water mode mapping by supported feature set.
188215

‎roborock/devices/traits/v1/status.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
get_current_cleaning_mode,
1616
get_water_mode_mapping,
1717
get_water_modes,
18+
get_water_slide_mode_name,
1819
resolve_cleaning_mode,
1920
)
2021
from roborock.devices.traits.common import DpsDataConverter, TraitUpdateListener
@@ -103,6 +104,8 @@ def fan_speed_name(self) -> str | None:
103104
def water_mode_name(self) -> str | None:
104105
if self.water_box_mode is None:
105106
return None
107+
if self._device_features_trait.is_water_slide_mode_supported:
108+
return get_water_slide_mode_name(self.water_box_mode)
106109
return self.water_mode_mapping.get(self.water_box_mode)
107110

108111
@property

‎tests/devices/traits/v1/test_status.py‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,15 +586,17 @@ def test_water_slide_mode_mapping() -> None:
586586
200: "off",
587587
221: "slight",
588588
225: "low",
589+
230: "gentle",
589590
235: "medium",
590-
245: "moderate",
591-
248: "high",
591+
240: "moderate",
592+
245: "high",
592593
250: "extreme",
593594
}
594595
assert [mode.value for mode in status_trait.water_mode_options] == [
595596
"off",
596597
"slight",
597598
"low",
599+
"gentle",
598600
"medium",
599601
"moderate",
600602
"high",
@@ -607,6 +609,38 @@ def test_water_slide_mode_mapping() -> None:
607609
assert status_trait.water_mode_name == "off"
608610

609611

612+
@pytest.mark.parametrize(
613+
("water_box_mode", "expected_name"),
614+
[
615+
(200, "off"),
616+
(221, "slight"),
617+
(223, "slight"),
618+
(224, "low"),
619+
(227, "low"),
620+
(228, "gentle"),
621+
(232, "gentle"),
622+
(233, "medium"),
623+
(236, "medium"),
624+
(237, "medium"),
625+
(238, "moderate"),
626+
(242, "moderate"),
627+
(243, "high"),
628+
(247, "high"),
629+
(248, "extreme"),
630+
(250, "extreme"),
631+
(220, None),
632+
(251, None),
633+
(999, None),
634+
],
635+
)
636+
def test_water_slide_mode_name_covers_slider_positions(water_box_mode: int, expected_name: str | None) -> None:
637+
"""Every slider position resolves to the label of its range in the Roborock app."""
638+
status_trait = _create_cleaning_mode_status_trait(is_water_slide_mode_supported=True)
639+
status_trait.water_box_mode = water_box_mode
640+
641+
assert status_trait.water_mode_name == expected_name
642+
643+
610644
def test_update_from_dps(status_trait: StatusTrait) -> None:
611645
"""Test updating status from data protocol push message."""
612646
assert status_trait.battery is None

0 commit comments

Comments
 (0)