Repository navigation
fix(v1): offer custom and SmartPlan cleaning modes on water-slide devices #1025
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.
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
Open
paulleonartcalvo
wants to merge
1
commit into
Python-roborock:main
Choose a base branch
from
paulleonartcalvo:fix/water-slide-custom-smart-modes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Quick question on
get_cleaning_mode_options(): on non-slide devices,get_water_modes()already appendsWaterModes.SMART_MODEandWaterModes.CUSTOMIZEDunconditionally wheneveris_smart_clean_mode_set_supported/is_customized_clean_supportedare set (lines 193–196) — checkingsupported_water_modeshere was originally added in #817 only to exclude water-slide devices.Now that water-slide devices support them too, can we drop
supported_water_modesaltogether and gate directly on the feature flags (matchingget_clean_modes()andget_clean_routes())?def get_cleaning_mode_options(features: DeviceFeatures) -> list[CleaningMode]: if not features.is_support_water_mode: return [] - supported_water_modes = get_water_modes(features) options = [CleaningMode.VACUUM, CleaningMode.VAC_AND_MOP] if features.is_pure_clean_mop_supported: options.append(CleaningMode.MOP) - # Water-slide devices report flow as slider positions, so their water mode - # list has no CUSTOMIZED (204) or SMART_MODE (209) entry, but they still - # accept and report those codes for the custom and SmartPlan modes. - is_water_slide = features.is_water_slide_mode_supported - if features.is_customized_clean_supported and (is_water_slide or WaterModes.CUSTOMIZED in supported_water_modes): + if features.is_customized_clean_supported: options.append(CleaningMode.CUSTOM) - if features.is_smart_clean_mode_set_supported and ( - is_water_slide or WaterModes.SMART_MODE in supported_water_modes - ): + if features.is_smart_clean_mode_set_supported: options.append(CleaningMode.SMART_MODE) return options