|
@@ -517,8 +517,11 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
|
517
|
517
|
delta_mm[Y_AXIS] = (target[Y_AXIS]-position[Y_AXIS])/axis_steps_per_unit[Y_AXIS];
|
518
|
518
|
delta_mm[Z_AXIS] = (target[Z_AXIS]-position[Z_AXIS])/axis_steps_per_unit[Z_AXIS];
|
519
|
519
|
delta_mm[E_AXIS] = (target[E_AXIS]-position[E_AXIS])/axis_steps_per_unit[E_AXIS];
|
520
|
|
- block->millimeters = sqrt(square(delta_mm[X_AXIS]) + square(delta_mm[Y_AXIS]) +
|
521
|
|
- square(delta_mm[Z_AXIS]) + square(delta_mm[E_AXIS]));
|
|
520
|
+ if ( block->steps_x == 0 && block->steps_y == 0 && block->steps_z == 0 ) {
|
|
521
|
+ block->millimeters = delta_mm[E_AXIS];
|
|
522
|
+ } else {
|
|
523
|
+ block->millimeters = sqrt(square(delta_mm[X_AXIS]) + square(delta_mm[Y_AXIS]) + square(delta_mm[Z_AXIS]));
|
|
524
|
+ }
|
522
|
525
|
float inverse_millimeters = 1.0/block->millimeters; // Inverse millimeters to remove multiple divides
|
523
|
526
|
|
524
|
527
|
// Calculate speed in mm/second for each axis. No divide by zero due to previous checks.
|
|
@@ -527,9 +530,6 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
|
527
|
530
|
block->nominal_speed = block->millimeters * inverse_second; // (mm/sec) Always > 0
|
528
|
531
|
block->nominal_rate = ceil(block->step_event_count * inverse_second); // (step/sec) Always > 0
|
529
|
532
|
|
530
|
|
-
|
531
|
|
-
|
532
|
|
-
|
533
|
533
|
if (block->steps_e == 0) {
|
534
|
534
|
if(feed_rate<mintravelfeedrate) feed_rate=mintravelfeedrate;
|
535
|
535
|
}
|
|
@@ -537,7 +537,6 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
|
537
|
537
|
if(feed_rate<minimumfeedrate) feed_rate=minimumfeedrate;
|
538
|
538
|
}
|
539
|
539
|
|
540
|
|
-
|
541
|
540
|
// slow down when de buffer starts to empty, rather than wait at the corner for a buffer refill
|
542
|
541
|
int moves_queued=(block_buffer_head-block_buffer_tail + BLOCK_BUFFER_SIZE) & (BLOCK_BUFFER_SIZE - 1);
|
543
|
542
|
#ifdef SLOWDOWN
|