|
|
|
|
651
|
#if ENABLED(SCARA_FEEDRATE_SCALING)
|
651
|
#if ENABLED(SCARA_FEEDRATE_SCALING)
|
652
|
// For SCARA scale the feed rate from mm/s to degrees/s
|
652
|
// For SCARA scale the feed rate from mm/s to degrees/s
|
653
|
// i.e., Complete the angular vector in the given time.
|
653
|
// i.e., Complete the angular vector in the given time.
|
654
|
- 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))
|
|
|
|
|
654
|
+ 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, segment_length))
|
655
|
break;
|
655
|
break;
|
656
|
/*
|
656
|
/*
|
657
|
SERIAL_ECHO(segments);
|
657
|
SERIAL_ECHO(segments);
|
|
|
|
|
664
|
#elif ENABLED(DELTA_FEEDRATE_SCALING)
|
664
|
#elif ENABLED(DELTA_FEEDRATE_SCALING)
|
665
|
// For DELTA scale the feed rate from Effector mm/s to Carriage mm/s
|
665
|
// For DELTA scale the feed rate from Effector mm/s to Carriage mm/s
|
666
|
// i.e., Complete the linear vector in the given time.
|
666
|
// i.e., Complete the linear vector in the given time.
|
667
|
- 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))
|
|
|
|
|
667
|
+ 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, segment_length))
|
668
|
break;
|
668
|
break;
|
669
|
/*
|
669
|
/*
|
670
|
SERIAL_ECHO(segments);
|
670
|
SERIAL_ECHO(segments);
|
|
|
|
|
689
|
#if ENABLED(SCARA_FEEDRATE_SCALING)
|
689
|
#if ENABLED(SCARA_FEEDRATE_SCALING)
|
690
|
const float diff2 = HYPOT2(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB);
|
690
|
const float diff2 = HYPOT2(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB);
|
691
|
if (diff2) {
|
691
|
if (diff2) {
|
692
|
- planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], rtarget[Z_AXIS], rtarget[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder);
|
|
|
|
|
692
|
+ planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], rtarget[Z_AXIS], rtarget[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder, segment_length);
|
693
|
/*
|
693
|
/*
|
694
|
SERIAL_ECHOPAIR("final: A=", delta[A_AXIS]); SERIAL_ECHOPAIR(" B=", delta[B_AXIS]);
|
694
|
SERIAL_ECHOPAIR("final: A=", delta[A_AXIS]); SERIAL_ECHOPAIR(" B=", delta[B_AXIS]);
|
695
|
SERIAL_ECHOPAIR(" adiff=", delta[A_AXIS] - oldA); SERIAL_ECHOPAIR(" bdiff=", delta[B_AXIS] - oldB);
|
695
|
SERIAL_ECHOPAIR(" adiff=", delta[A_AXIS] - oldA); SERIAL_ECHOPAIR(" bdiff=", delta[B_AXIS] - oldB);
|
|
|
|
|
701
|
#elif ENABLED(DELTA_FEEDRATE_SCALING)
|
701
|
#elif ENABLED(DELTA_FEEDRATE_SCALING)
|
702
|
const float diff2 = sq(delta[A_AXIS] - oldA) + sq(delta[B_AXIS] - oldB) + sq(delta[C_AXIS] - oldC);
|
702
|
const float diff2 = sq(delta[A_AXIS] - oldA) + sq(delta[B_AXIS] - oldB) + sq(delta[C_AXIS] - oldC);
|
703
|
if (diff2) {
|
703
|
if (diff2) {
|
704
|
- planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], rtarget[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder);
|
|
|
|
|
704
|
+ planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], rtarget[E_AXIS], SQRT(diff2) * inverse_secs, active_extruder, segment_length);
|
705
|
/*
|
705
|
/*
|
706
|
SERIAL_ECHOPAIR("final: A=", delta[A_AXIS]); SERIAL_ECHOPAIR(" B=", delta[B_AXIS]); SERIAL_ECHOPAIR(" C=", delta[C_AXIS]);
|
706
|
SERIAL_ECHOPAIR("final: A=", delta[A_AXIS]); SERIAL_ECHOPAIR(" B=", delta[B_AXIS]); SERIAL_ECHOPAIR(" C=", delta[C_AXIS]);
|
707
|
SERIAL_ECHOPAIR(" adiff=", delta[A_AXIS] - oldA); SERIAL_ECHOPAIR(" bdiff=", delta[B_AXIS] - oldB); SERIAL_ECHOPAIR(" cdiff=", delta[C_AXIS] - oldC);
|
707
|
SERIAL_ECHOPAIR(" adiff=", delta[A_AXIS] - oldA); SERIAL_ECHOPAIR(" bdiff=", delta[B_AXIS] - oldB); SERIAL_ECHOPAIR(" cdiff=", delta[C_AXIS] - oldC);
|