|
@@ -12649,7 +12649,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
|
12649
|
12649
|
#if IS_SCARA && ENABLED(SCARA_FEEDRATE_SCALING)
|
12650
|
12650
|
// SCARA needs to scale the feed rate from mm/s to degrees/s
|
12651
|
12651
|
const float inv_segment_length = min(10.0, float(segments) / cartesian_mm), // 1/mm/segs
|
12652
|
|
- feed_factor = inv_segment_length * _feedrate_mm_s;
|
|
12652
|
+ inverse_secs = inv_segment_length * _feedrate_mm_s;
|
12653
|
12653
|
float oldA = stepper.get_axis_position_degrees(A_AXIS),
|
12654
|
12654
|
oldB = stepper.get_axis_position_degrees(B_AXIS);
|
12655
|
12655
|
#endif
|
|
@@ -12683,7 +12683,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
|
12683
|
12683
|
// Use ratio between the length of the move and the larger angle change
|
12684
|
12684
|
const float adiff = abs(delta[A_AXIS] - oldA),
|
12685
|
12685
|
bdiff = abs(delta[B_AXIS] - oldB);
|
12686
|
|
- planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * feed_factor, active_extruder);
|
|
12686
|
+ planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * inverse_secs, active_extruder);
|
12687
|
12687
|
oldA = delta[A_AXIS];
|
12688
|
12688
|
oldB = delta[B_AXIS];
|
12689
|
12689
|
#else
|
|
@@ -12701,7 +12701,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
|
12701
|
12701
|
ADJUST_DELTA(rtarget);
|
12702
|
12702
|
const float adiff = abs(delta[A_AXIS] - oldA),
|
12703
|
12703
|
bdiff = abs(delta[B_AXIS] - oldB);
|
12704
|
|
- planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * feed_factor, active_extruder);
|
|
12704
|
+ planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * inverse_secs, active_extruder);
|
12705
|
12705
|
#else
|
12706
|
12706
|
planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder);
|
12707
|
12707
|
#endif
|