MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix planner.cpp compile (#16996)

Browse Source
This commit is contained in:
Makoto Schoppert 2020-02-27 04:29:44 -05:00 committed by GitHub
parent a80eda41bc
commit 8164cac797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/planner.cpp
View File

@ -2403,10 +2403,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
LOOP_XYZE(i) LOOP_XYZE(i)
#endif #endif
{ {
const float jerk = ABS(current_speed[i]); // cs : Starting from zero, change in speed for this axis 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 maxj = (max_jerk[i] // mj : The max jerk setting for this axis
#ifdef TRAVEL_EXTRA_XYJERK #ifdef TRAVEL_EXTRA_XYJERK
+ (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0) + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
#endif #endif
); );