Skip to content

Commit 267ac38

Browse files
author
Luca Toniolo
committed
small fix max jerk limit
1 parent 1dfbca0 commit 267ac38

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/emc/tp/tp.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,9 @@ STATIC int tpComputeOptimalVelocity(TP_STRUCT const * const tp, TC_STRUCT * cons
17671767
double vs_back = pmSqrt(pmSq(tc->finalvel) + 2.0 * acc_this * tc->target);
17681768
if(GET_TRAJ_PLANNER_TYPE() == 1){
17691769
double vs_back2;
1770-
if(findSCurveVSpeedWithEndSpeed(tc->target * 2.0 , tc->finalvel, acc_this, emcmotStatus->jerk, &vs_back2) == 1)
1770+
// Use clamped jerk to match execution phase behavior
1771+
double maxjerk = fmin(tc->maxjerk, emcmotStatus->jerk);
1772+
if(findSCurveVSpeedWithEndSpeed(tc->target * 2.0 , tc->finalvel, acc_this, maxjerk, &vs_back2) == 1)
17711773
vs_back = vs_back2;
17721774
}
17731775
// Find the reachable velocity of prev1_tc, moving forwards in time

0 commit comments

Comments
 (0)