MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch and cleanup run_z_probe

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-22 13:50:31 -07:00
parent 39caef4279
commit b78590e63d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Marlin/Marlin_main.cpp
View File

@ -2087,9 +2087,9 @@ static void clean_up_after_endstop_or_probe_move() {
} }
#if ENABLED(DELTA) #if ENABLED(DELTA)
#define SET_CURRENT_FROM_STEPPERS() current_position[Z_AXIS] = z_before - stepper.get_axis_position_mm(Z_AXIS) + z_mm #define Z_FROM_STEPPERS() z_before + stepper.get_axis_position_mm(Z_AXIS) - z_mm
#else #else
#define SET_CURRENT_FROM_STEPPERS() current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS) #define Z_FROM_STEPPERS() stepper.get_axis_position_mm(Z_AXIS)
#endif #endif
// Do a single Z probe and return with current_position[Z_AXIS] // Do a single Z probe and return with current_position[Z_AXIS]
@ -2104,31 +2104,28 @@ static void clean_up_after_endstop_or_probe_move() {
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
float z_before = current_position[Z_AXIS]; float z_before = current_position[Z_AXIS], // Current Z
float z_mm = stepper.get_axis_position_mm(Z_AXIS); z_mm = stepper.get_axis_position_mm(Z_AXIS); // Some tower's current position
#endif #endif
current_position[Z_AXIS] = -(Z_MAX_LENGTH + 10);
do_blocking_move_to_z(current_position[Z_AXIS], Z_PROBE_SPEED_FAST); do_blocking_move_to_z(-(Z_MAX_LENGTH + 10), Z_PROBE_SPEED_FAST);
endstops.hit_on_purpose(); // clear endstop hit flags endstops.hit_on_purpose();
// Get the current stepper position after bumping an endstop current_position[Z_AXIS] = Z_FROM_STEPPERS();
SET_CURRENT_FROM_STEPPERS(); SYNC_PLAN_POSITION_KINEMATIC();
SYNC_PLAN_POSITION_KINEMATIC(); // tell the planner where we are
// move up the retract distance // move up the retract distance
current_position[Z_AXIS] += home_bump_mm(Z_AXIS); do_blocking_move_to_z(current_position[Z_AXIS] + home_bump_mm(Z_AXIS), Z_PROBE_SPEED_FAST);
do_blocking_move_to_z(current_position[Z_AXIS], Z_PROBE_SPEED_FAST);
#if ENABLED(DELTA) #if ENABLED(DELTA)
z_before = current_position[Z_AXIS]; z_before = current_position[Z_AXIS];
z_mm = stepper.get_axis_position_mm(Z_AXIS); z_mm = stepper.get_axis_position_mm(Z_AXIS);
#endif #endif
// move back down slowly to find bed // move back down slowly to find bed
current_position[Z_AXIS] -= home_bump_mm(Z_AXIS) * 2; do_blocking_move_to_z(current_position[Z_AXIS] - home_bump_mm(Z_AXIS) * 2, Z_PROBE_SPEED_SLOW);
do_blocking_move_to_z(current_position[Z_AXIS], Z_PROBE_SPEED_SLOW); endstops.hit_on_purpose();
endstops.hit_on_purpose(); // clear endstop hit flags current_position[Z_AXIS] = Z_FROM_STEPPERS();
// Get the current stepper position after bumping an endstop SYNC_PLAN_POSITION_KINEMATIC();
SET_CURRENT_FROM_STEPPERS();
SYNC_PLAN_POSITION_KINEMATIC(); // tell the planner where we are
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position);