|
@@ -1096,12 +1096,20 @@ Having the real displacement of the head, we can calculate the total movement le
|
|
|
&& delta_mm[E_AXIS] >= 0
|
|
|
&& abs(delta_mm[Z_AXIS]) < 0.5;
|
|
|
if (block->use_advance_lead) {
|
|
|
+#ifdef LA_FLOWADJ
|
|
|
+
|
|
|
+ float delta_e = (e - position_float[E_AXIS]) / extruder_multiplier[extruder];
|
|
|
+#else
|
|
|
+
|
|
|
+ float delta_e = (e - position_float[E_AXIS]);
|
|
|
+#endif
|
|
|
+ float delta_D = sqrt(sq(x - position_float[X_AXIS])
|
|
|
+ + sq(y - position_float[Y_AXIS])
|
|
|
+ + sq(z - position_float[Z_AXIS]));
|
|
|
+
|
|
|
|
|
|
|
|
|
- e_D_ratio = ((e - position_float[E_AXIS]) / extruder_multiplier[extruder]) /
|
|
|
- sqrt(sq(x - position_float[X_AXIS])
|
|
|
- + sq(y - position_float[Y_AXIS])
|
|
|
- + sq(z - position_float[Z_AXIS]));
|
|
|
+ e_D_ratio = delta_e / delta_D;
|
|
|
|
|
|
|
|
|
|