Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions src/emc/tp/tp.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,25 +359,6 @@ STATIC inline double tpGetRealFinalVel(TP_STRUCT const * const tp,
/**
* Get acceleration for a tc based on the trajectory planner state.
*/
STATIC inline double tpGetScaledAccel(TP_STRUCT const * const tp __attribute__((unused)),
TC_STRUCT const * const tc) {
double a_scale = tc->maxaccel;
/* Parabolic blending conditions: If the next segment or previous segment
* has a parabolic blend with this one, acceleration is scaled down by 1/2
* so that the sum of the two does not exceed the maximum.
*/
if (tc->term_cond == TC_TERM_COND_PARABOLIC || tc->blend_prev) {
a_scale *= 0.5;
}
else {
a_scale *= 8.0/15.0;
}
if (tc->motion_type == TC_CIRCULAR || tc->motion_type == TC_SPHERICAL) {
//Limit acceleration for cirular arcs to allow for normal acceleration
a_scale *= tc->acc_ratio_tan;
}
return a_scale;
}

/**
* Convert the 2-part spindle position and sign to a signed double.
Expand Down
Loading