[1.1] Cleanup Nozzle class, fix XY vs Z move order #8248
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
thinkyhead
force-pushed
the
bf1_nozzle_cleanup
branch
from
8f55b07
to
17044f2
Compare
thinkyhead
changed the title
thinkyhead
force-pushed
the
bf1_nozzle_cleanup
branch
7 times, most recently
from
c48b5d7
to
75155c2
Compare
thinkyhead
force-pushed
the
bf1_nozzle_cleanup
branch
from
75155c2
to
267c247
Compare
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.
Addressing #8240, based on #8248
Two Nozzle Clean issues are fixed by this PR:
NOZZLE_CLEAN_GOBACK. This PR fixes the Z versus XY move order by using thedo_blocking_move_to(x, y, z)function for all Z-then-XY and XY-then-Z moves, becausedo_blocking_move_tocontains all the logic needed to decide whether to move Z before or after XY, and the logic for Delta to make sure it's in the "safe zone" first.This results in slightly smaller
Nozzleclass code with ideal behavior.Nozzle::zigzagzigs (or zags) outside the cleaning area if the cleaning areaend.xis less thanstart.xor if theend.yis less thanstart.y. This PR rewriteszigzagso it simply alternates sides in the narrow dimension.