|
@@ -814,7 +814,7 @@ void Planner::check_axes_activity() {
|
814
|
814
|
delta_mm[Z_AXIS] = dz * steps_to_mm[Z_AXIS];
|
815
|
815
|
#endif
|
816
|
816
|
#endif
|
817
|
|
- delta_mm[E_AXIS] = (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * extruder_multiplier[extruder] / 100.0;
|
|
817
|
+ delta_mm[E_AXIS] = 0.01 * (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * extruder_multiplier[extruder];
|
818
|
818
|
|
819
|
819
|
if (block->steps[X_AXIS] <= dropsegments && block->steps[Y_AXIS] <= dropsegments && block->steps[Z_AXIS] <= dropsegments) {
|
820
|
820
|
block->millimeters = fabs(delta_mm[E_AXIS]);
|
|
@@ -888,7 +888,7 @@ void Planner::check_axes_activity() {
|
888
|
888
|
while (filwidth_delay_dist >= MMD_MM) filwidth_delay_dist -= MMD_MM;
|
889
|
889
|
|
890
|
890
|
// Convert into an index into the measurement array
|
891
|
|
- filwidth_delay_index1 = (int)(filwidth_delay_dist / 10.0 + 0.0001);
|
|
891
|
+ filwidth_delay_index1 = (int)(filwidth_delay_dist * 0.1 + 0.0001);
|
892
|
892
|
|
893
|
893
|
// If the index has changed (must have gone forward)...
|
894
|
894
|
if (filwidth_delay_index1 != filwidth_delay_index2) {
|
|
@@ -975,7 +975,7 @@ void Planner::check_axes_activity() {
|
975
|
975
|
block->acceleration_steps_per_s2 = (max_acceleration_steps_per_s2[E_AXIS] * block->step_event_count) / block->steps[E_AXIS];
|
976
|
976
|
}
|
977
|
977
|
block->acceleration = block->acceleration_steps_per_s2 / steps_per_mm;
|
978
|
|
- block->acceleration_rate = (long)(block->acceleration_steps_per_s2 * 16777216.0 / ((F_CPU) / 8.0));
|
|
978
|
+ block->acceleration_rate = (long)(block->acceleration_steps_per_s2 * 16777216.0 / ((F_CPU) * 0.125));
|
979
|
979
|
|
980
|
980
|
#if 0 // Use old jerk for now
|
981
|
981
|
|
|
@@ -1021,10 +1021,12 @@ void Planner::check_axes_activity() {
|
1021
|
1021
|
#endif
|
1022
|
1022
|
|
1023
|
1023
|
// Start with a safe speed
|
1024
|
|
- float vmax_junction = max_xy_jerk / 2;
|
1025
|
|
- float vmax_junction_factor = 1.0;
|
1026
|
|
- float mz2 = max_z_jerk / 2, me2 = max_e_jerk / 2;
|
1027
|
|
- float csz = current_speed[Z_AXIS], cse = current_speed[E_AXIS];
|
|
1024
|
+ float vmax_junction = max_xy_jerk * 0.5,
|
|
1025
|
+ vmax_junction_factor = 1.0,
|
|
1026
|
+ mz2 = max_z_jerk * 0.5,
|
|
1027
|
+ me2 = max_e_jerk * 0.5,
|
|
1028
|
+ csz = current_speed[Z_AXIS],
|
|
1029
|
+ cse = current_speed[E_AXIS];
|
1028
|
1030
|
if (fabs(csz) > mz2) vmax_junction = min(vmax_junction, mz2);
|
1029
|
1031
|
if (fabs(cse) > me2) vmax_junction = min(vmax_junction, me2);
|
1030
|
1032
|
vmax_junction = min(vmax_junction, block->nominal_speed);
|