|
@@ -593,7 +593,7 @@ block->steps_y = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-positi
|
593
|
593
|
#endif
|
594
|
594
|
block->steps_z = labs(target[Z_AXIS]-position[Z_AXIS]);
|
595
|
595
|
block->steps_e = labs(target[E_AXIS]-position[E_AXIS]);
|
596
|
|
- block->steps_e *= filament_area[active_extruder];
|
|
596
|
+ block->steps_e *= volumetric_multiplier[active_extruder];
|
597
|
597
|
block->steps_e *= extrudemultiply;
|
598
|
598
|
block->steps_e /= 100;
|
599
|
599
|
block->step_event_count = max(block->steps_x, max(block->steps_y, max(block->steps_z, block->steps_e)));
|
|
@@ -683,7 +683,7 @@ block->steps_y = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-positi
|
683
|
683
|
delta_mm[Y_AXIS] = ((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-position[Y_AXIS]))/axis_steps_per_unit[Y_AXIS];
|
684
|
684
|
#endif
|
685
|
685
|
delta_mm[Z_AXIS] = (target[Z_AXIS]-position[Z_AXIS])/axis_steps_per_unit[Z_AXIS];
|
686
|
|
- delta_mm[E_AXIS] = ((target[E_AXIS]-position[E_AXIS])/axis_steps_per_unit[E_AXIS])*filament_area[active_extruder]*extrudemultiply/100.0;
|
|
686
|
+ delta_mm[E_AXIS] = ((target[E_AXIS]-position[E_AXIS])/axis_steps_per_unit[E_AXIS])*volumetric_multiplier[active_extruder]*extrudemultiply/100.0;
|
687
|
687
|
if ( block->steps_x <=dropsegments && block->steps_y <=dropsegments && block->steps_z <=dropsegments )
|
688
|
688
|
{
|
689
|
689
|
block->millimeters = fabs(delta_mm[E_AXIS]);
|