Repository navigation
fix(print): keep the cancel loadscreen until the cancel macro finishes - #373
Open
gmmcosta15 wants to merge 2 commits into
Open
gmmcosta15 wants to merge 2 commits into
gmmcosta15 wants to merge 2 commits into
Conversation
This branch has not been deployed
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
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
Cancelling a print could leave the UI stuck behind the "Cancelling print" loadscreen. The loadscreen was dropped only on
print_statsstandby, which is never reached after a cancel until the next job or a manual action.Changes
PrintTabtracks a pending cancel (_cancel_pending) and drops the loadscreen once both conditions hold:print_stats.stateiscancelledidle_timeout.stateis no longerPrintingprint_statsturnscancelledpartway through theCANCEL_PRINTmacro, butidle_timeoutstaysPrintingwhile the gcode mutex is held and moves are queued. Waiting for both keeps the loadscreen up until the macro and its moves have finished.print_statsnever reachescancelledin that case.Tests