bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Refactor and optimize Stepper/Planner

Browse Source 
Better encapsulation and considerably reduce stepper jitter
This commit is contained in:
etagle
2018-05-09 02:17:53 -03:00
committed by Scott Lahteine
parent 0566badcef
commit a11eb50a3e
16 changed files with 975 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/config/M540.cpp
View File

@ -33,7 +33,7 @@
void GcodeSuite::M540() {
if (parser.seen('S'))
stepper.abort_on_endstop_hit = parser.value_bool();
planner.abort_on_endstop_hit = parser.value_bool();
}

2
Marlin/src/gcode/control/M17_M18_M84.cpp
View File

@ -47,7 +47,7 @@ void GcodeSuite::M18_M84() {
else {
bool all_axis = !(parser.seen('X') || parser.seen('Y') || parser.seen('Z') || parser.seen('E'));
if (all_axis) {
stepper.finish_and_disable();
planner.finish_and_disable();
}
else {
planner.synchronize();

2
Marlin/src/gcode/control/M80_M81.cpp
View File

@ -95,7 +95,7 @@
*/
void GcodeSuite::M81() {
thermalManager.disable_all_heaters();
stepper.finish_and_disable();
planner.finish_and_disable();
#if FAN_COUNT > 0
for (uint8_t i = 0; i < FAN_COUNT; i++) fanSpeeds[i] = 0;

9
Marlin/src/gcode/motion/G2_G3.cpp
View File

@ -197,14 +197,17 @@ void plan_arc(
// i.e., Complete the angular vector in the given time.
inverse_kinematics(raw);
ADJUST_DELTA(raw);
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);
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))
break;
oldA = delta[A_AXIS]; oldB = delta[B_AXIS];
#elif HAS_UBL_AND_CURVES
float pos[XYZ] = { raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS] };
planner.apply_leveling(pos);
planner.buffer_segment(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS], raw[E_AXIS], fr_mm_s, active_extruder);
if (!planner.buffer_segment(pos[X_AXIS], pos[Y_AXIS], pos[Z_AXIS], raw[E_AXIS], fr_mm_s, active_extruder))
break;
#else
planner.buffer_line_kinematic(raw, fr_mm_s, active_extruder);
if (!planner.buffer_line_kinematic(raw, fr_mm_s, active_extruder))
break;
#endif
}