[1.1.x] Apply feedrate to nozzle movement for kinematic machines #9448
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
7 tasks
thinkyhead
force-pushed
the
1.1.x-kinematic
branch
2 times, most recently
from
52b7bf8
to
dfbb019
Compare
thinkyhead
reviewed
Feb 4, 2018
Marlin/planner.h
Outdated
| @@ -372,7 +372,7 @@ class Planner { | |||
|
|
|||
| FORCE_INLINE static void unskew(float &cx, float &cy, const float &cz) { | |||
| if (WITHIN(cx, X_MIN_POS, X_MAX_POS) && WITHIN(cy, Y_MIN_POS, Y_MAX_POS)) { | |||
| const float sx = cx + cy * xy_skew_factor + cz * xz_skew_factor, | |||
| const float sx = cx + cy * xy_skew_factor + cz * (xz_skew_factor - (xy_skew_factor * yz_skew_factor)), | |||
There was a problem hiding this comment.
I think this was just an error in the merge
thinkyhead
force-pushed
the
1.1.x-kinematic
branch
from
3c931c4
to
f9c26a9
Compare
thinkyhead
force-pushed
the
1.1.x-kinematic
branch
from
f9c26a9
to
5b4e39a
Compare
|
Looks good. I've updated the translations, reversed the incorrect I'll be interested to see how this affects my SCARA kinematics, which has to convert the feedrate from mm/s into a new degrees/s value on every segment. |
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.
#8778 repackaged for 1.1.x.