|
@@ -2404,12 +2404,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
|
2404
|
2404
|
#endif
|
2405
|
2405
|
{
|
2406
|
2406
|
const float jerk = ABS(current_speed[i]), // cs : Starting from zero, change in speed for this axis
|
2407
|
|
- maxj = (max_jerk[i] // mj : The max jerk setting for this axis
|
2408
|
|
- #ifdef TRAVEL_EXTRA_XYJERK
|
2409
|
|
- + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
|
2410
|
|
- #endif
|
2411
|
|
- );
|
2412
|
|
-
|
|
2407
|
+ maxj = (max_jerk[i] + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0.0f)); // mj : The max jerk setting for this axis
|
2413
|
2408
|
if (jerk > maxj) { // cs > mj : New current speed too fast?
|
2414
|
2409
|
if (limited) { // limited already?
|
2415
|
2410
|
const float mjerk = nominal_speed * maxj; // ns*mj
|
|
@@ -2461,11 +2456,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
|
2461
|
2456
|
: // v_exit <= v_entry coasting axis reversal
|
2462
|
2457
|
( (v_entry < 0 || v_exit > 0) ? (v_entry - v_exit) : _MAX(-v_exit, v_entry) );
|
2463
|
2458
|
|
2464
|
|
- const float maxj = (max_jerk[axis]
|
2465
|
|
- #ifdef TRAVEL_EXTRA_XYJERK
|
2466
|
|
- + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
|
2467
|
|
- #endif
|
2468
|
|
- );
|
|
2459
|
+ const float maxj = (max_jerk[axis] + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0.0f));
|
2469
|
2460
|
|
2470
|
2461
|
if (jerk > maxj) {
|
2471
|
2462
|
v_factor *= maxj / jerk;
|