Tramming wizard returns to status screen prematurely #20796
Merged
Conversation
This file contains 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
|
Temporarily disabling bed leveling (it seems it was ommited in the tramming wizard, although it's done in G35). |
thinkyhead
reviewed
Jan 17, 2021
kpishere
pushed a commit
to kpishere/Marlin
that referenced
this pull request
Feb 19, 2021
zillarob
pushed a commit
to zillarob/Marlin
that referenced
this pull request
Feb 25, 2021
W4tel-BiDi
pushed a commit
to W4tel-BiDi/Marlin
that referenced
this pull request
Apr 5, 2021
thinkyhead
pushed a commit
to thinkyhead/Marlin
that referenced
this pull request
Apr 29, 2021
thinkyhead
pushed a commit
that referenced
this pull request
Apr 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Two instances of the tramming wizard returning to the status screen prematurely:
a. When initial homing involves tool change (i.e. PARKING_EXTRUDER configuration), wizard abruptly ends when tool_change method is invoked. This is caused by the unconditional call to ui.return_to_status() (thus ignoring the defer flag). I'm not sure about the proposed fix (I don't know why tool_change() wants to return back to status screen at this point), but it seemed ok to call ui.update() instead of return_to_status(), in order to respect the defer flag. Also considered checking defer_return_to_status on the spot, but it seemed counter-intuitive (MarlinUI class should take care of its own flags).
b. When navigating back from a tramming single probe menu item, the wizard (obviously, unintentionally) resets the defer flag, so next probe item will return to status screen during move_to_tramming_wait_pos().
Requirements
None.
Benefits
Tramming wizard now operates and completes normally.
Configurations
PARKING_EXTRUDER enabled for (a), Default (disabled) LCD_TIMEOUT_TO_STATUS to demonstrate (b).
Related Issues
N/A.