Skip to content

Commit 67ef4b7

Browse files
committed
fix(v1): ignore any pushed water code the slider cannot name
1 parent 436f986 commit 67ef4b7

2 files changed

Lines changed: 21 additions & 14 deletions

File tree

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,18 @@
3232
_DPS_CONVERTER = DpsDataConverter.from_dataclass(StatusV2)
3333

3434

35-
_LEGACY_WATER_LEVEL_CODES = frozenset({WaterModes.LOW.code, WaterModes.MEDIUM.code, WaterModes.HIGH.code})
35+
# Non-slider codes that water-slide devices report as valid (custom and smart mode).
36+
_WATER_MODE_CODES_KEPT = frozenset({WaterModes.CUSTOMIZED.code, WaterModes.SMART_MODE.code})
3637

3738

38-
def _drop_legacy_water_levels(decoded_dps: dict[RoborockDataProtocol, Any]) -> dict[RoborockDataProtocol, Any]:
39-
"""Return the pushed data without a legacy water level (low, medium or high)."""
40-
if decoded_dps.get(RoborockDataProtocol.WATER_BOX_MODE) not in _LEGACY_WATER_LEVEL_CODES:
39+
def _drop_unresolvable_water_level(decoded_dps: dict[RoborockDataProtocol, Any]) -> dict[RoborockDataProtocol, Any]:
40+
"""Return the pushed data without a water code a water-slide device cannot name.
41+
42+
Water-slide devices push legacy codes (201-203, 208) that get_status never
43+
returns. Only slider codes, off, smart water, smart mode and custom are kept.
44+
"""
45+
code = decoded_dps.get(RoborockDataProtocol.WATER_BOX_MODE)
46+
if code is None or code in _WATER_MODE_CODES_KEPT or get_water_slide_mode_name(code) is not None:
4147
return decoded_dps
4248
return {key: value for key, value in decoded_dps.items() if key != RoborockDataProtocol.WATER_BOX_MODE}
4349

@@ -186,10 +192,10 @@ def update_from_dps(self, decoded_dps: dict[RoborockDataProtocol, Any]) -> None:
186192
This handles unsolicited status updates pushed by the device
187193
via RoborockDataProtocol codes (e.g. STATE=121, BATTERY=122).
188194
"""
189-
# Water-slide devices push legacy level codes (201-203) while get_status
190-
# returns slider codes, so a pushed legacy level would overwrite the real value.
195+
# Water-slide devices push legacy codes (e.g. 201-203, 208) while get_status
196+
# returns slider codes, so a pushed legacy code would overwrite the real value.
191197
if self._device_features_trait.is_water_slide_mode_supported:
192-
decoded_dps = _drop_legacy_water_levels(decoded_dps)
198+
decoded_dps = _drop_unresolvable_water_level(decoded_dps)
193199
if _DPS_CONVERTER.update_from_dps(self, decoded_dps):
194200
self._notify_update()
195201

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -918,9 +918,9 @@ def test_update_from_dps_partial(status_trait: StatusTrait) -> None:
918918
assert status_trait.state == RoborockStateCode.charging # Unchanged
919919

920920

921-
@pytest.mark.parametrize("pushed", [201, 202, 203])
922-
def test_update_from_dps_water_slide_ignores_legacy_levels(pushed: int) -> None:
923-
"""Legacy water level codes pushed to a water-slide device do not overwrite the slider value."""
921+
@pytest.mark.parametrize("pushed", [201, 202, 203, 208, 251, 999])
922+
def test_update_from_dps_water_slide_ignores_unresolvable_water_codes(pushed: int) -> None:
923+
"""Water codes the slider cannot name do not overwrite the slider value."""
924924
status_trait = _create_cleaning_mode_status_trait(is_water_slide_mode_supported=True)
925925
status_trait.water_box_mode = 235
926926
listener = Mock()
@@ -933,7 +933,7 @@ def test_update_from_dps_water_slide_ignores_legacy_levels(pushed: int) -> None:
933933
listener.assert_not_called()
934934

935935

936-
@pytest.mark.parametrize("pushed", [200, 209, 225, 245])
936+
@pytest.mark.parametrize("pushed", [200, WaterModes.CUSTOMIZED.code, 209, 221, 225, 245, 250])
937937
def test_update_from_dps_water_slide_keeps_other_water_codes(pushed: int) -> None:
938938
"""Slider codes pushed to a water-slide device are applied."""
939939
status_trait = _create_cleaning_mode_status_trait(is_water_slide_mode_supported=True)
@@ -955,13 +955,14 @@ def test_update_from_dps_water_slide_still_applies_other_fields() -> None:
955955
assert status_trait.water_box_mode == 235
956956

957957

958-
def test_update_from_dps_without_water_slide_keeps_legacy_levels() -> None:
958+
@pytest.mark.parametrize("pushed", [201, 202, 203, 208])
959+
def test_update_from_dps_without_water_slide_keeps_legacy_levels(pushed: int) -> None:
959960
"""Devices without the water slider use the legacy level codes."""
960961
status_trait = _create_cleaning_mode_status_trait(is_water_slide_mode_supported=False)
961962

962-
status_trait.update_from_dps({RoborockDataProtocol.WATER_BOX_MODE: 202})
963+
status_trait.update_from_dps({RoborockDataProtocol.WATER_BOX_MODE: pushed})
963964

964-
assert status_trait.water_box_mode == 202
965+
assert status_trait.water_box_mode == pushed
965966

966967

967968
def test_update_listener(status_trait: StatusTrait) -> None:

0 commit comments

Comments
 (0)