|
@@ -204,19 +204,19 @@ void plan_arc(
|
204
|
204
|
#if ENABLED(SCARA_FEEDRATE_SCALING)
|
205
|
205
|
// For SCARA scale the feed rate from mm/s to degrees/s
|
206
|
206
|
// i.e., Complete the angular vector in the given time.
|
207
|
|
- if (!planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], raw[Z_AXIS], raw[E_AXIS], HYPOT(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB) * inverse_secs, active_extruder))
|
|
207
|
+ if (!planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], raw[Z_AXIS], raw[E_AXIS], HYPOT(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB) * inverse_secs, active_extruder, MM_PER_ARC_SEGMENT))
|
208
|
208
|
break;
|
209
|
209
|
oldA = delta[A_AXIS]; oldB = delta[B_AXIS];
|
210
|
210
|
#elif ENABLED(DELTA_FEEDRATE_SCALING)
|
211
|
211
|
// For DELTA scale the feed rate from Effector mm/s to Carriage mm/s
|
212
|
212
|
// i.e., Complete the linear vector in the given time.
|
213
|
|
- if (!planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], SQRT(sq(delta[A_AXIS] - oldA) + sq(delta[B_AXIS] - oldB) + sq(delta[C_AXIS] - oldC)) * inverse_secs, active_extruder))
|
|
213
|
+ if (!planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], SQRT(sq(delta[A_AXIS] - oldA) + sq(delta[B_AXIS] - oldB) + sq(delta[C_AXIS] - oldC)) * inverse_secs, active_extruder, MM_PER_ARC_SEGMENT))
|
214
|
214
|
break;
|
215
|
215
|
oldA = delta[A_AXIS]; oldB = delta[B_AXIS]; oldC = delta[C_AXIS];
|
216
|
216
|
#elif HAS_UBL_AND_CURVES
|
217
|
217
|
float pos[XYZ] = { raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS] };
|
218
|
218
|
planner.apply_leveling(pos);
|
219
|
|
- if (!planner.buffer_segment(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS], raw[E_AXIS], fr_mm_s, active_extruder))
|
|
219
|
+ if (!planner.buffer_segment(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS], raw[E_AXIS], fr_mm_s, active_extruder, MM_PER_ARC_SEGMENT))
|
220
|
220
|
break;
|
221
|
221
|
#else
|
222
|
222
|
if (!planner.buffer_line_kinematic(raw, fr_mm_s, active_extruder))
|
|
@@ -233,15 +233,15 @@ void plan_arc(
|
233
|
233
|
#if ENABLED(SCARA_FEEDRATE_SCALING)
|
234
|
234
|
const float diff2 = HYPOT2(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB);
|
235
|
235
|
if (diff2)
|
236
|
|
- planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], cart[Z_AXIS], cart[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder);
|
|
236
|
+ planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], cart[Z_AXIS], cart[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder, MM_PER_ARC_SEGMENT);
|
237
|
237
|
#elif ENABLED(DELTA_FEEDRATE_SCALING)
|
238
|
238
|
const float diff2 = sq(delta[A_AXIS] - oldA) + sq(delta[B_AXIS] - oldB) + sq(delta[C_AXIS] - oldC);
|
239
|
239
|
if (diff2)
|
240
|
|
- planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], cart[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder);
|
|
240
|
+ planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], cart[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder, MM_PER_ARC_SEGMENT);
|
241
|
241
|
#elif HAS_UBL_AND_CURVES
|
242
|
242
|
float pos[XYZ] = { cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS] };
|
243
|
243
|
planner.apply_leveling(pos);
|
244
|
|
- planner.buffer_segment(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS], cart[E_AXIS], fr_mm_s, active_extruder);
|
|
244
|
+ planner.buffer_segment(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS], cart[E_AXIS], fr_mm_s, active_extruder, MM_PER_ARC_SEGMENT);
|
245
|
245
|
#else
|
246
|
246
|
planner.buffer_line_kinematic(cart, fr_mm_s, active_extruder);
|
247
|
247
|
#endif
|