Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update planner.cpp #16996

Merged
merged 2 commits into from
Feb 27, 2020
Merged

Update planner.cpp #16996

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8066d0
Update planner.cpp
mak0t0san Feb 27, 2020
8ac49a7
Update planner.cpp
thinkyhead Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Marlin/src/module/planner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2403,10 +2403,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
LOOP_XYZE(i)
#endif
{
const float jerk = ABS(current_speed[i]); // cs : Starting from zero, change in speed for this axis
maxj = (max_jerk[axis] // mj : The max jerk setting for this axis
const float jerk = ABS(current_speed[i]), // cs : Starting from zero, change in speed for this axis
maxj = (max_jerk[i] // mj : The max jerk setting for this axis
#ifdef TRAVEL_EXTRA_XYJERK
+ (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
+ (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
#endif
);

Expand Down