|
@@ -2103,12 +2103,6 @@ static void clean_up_after_endstop_or_probe_move() {
|
2103
|
2103
|
return false;
|
2104
|
2104
|
}
|
2105
|
2105
|
|
2106
|
|
- #if ENABLED(DELTA)
|
2107
|
|
- #define SET_Z_FROM_STEPPERS() set_current_from_steppers()
|
2108
|
|
- #else
|
2109
|
|
- #define SET_Z_FROM_STEPPERS() current_position[Z_AXIS] = LOGICAL_POSITION(stepper.get_axis_position_mm(Z_AXIS), Z_AXIS)
|
2110
|
|
- #endif
|
2111
|
|
-
|
2112
|
2106
|
// Do a single Z probe and return with current_position[Z_AXIS]
|
2113
|
2107
|
// at the height where the probe triggered.
|
2114
|
2108
|
static float run_z_probe() {
|
|
@@ -2120,28 +2114,18 @@ static void clean_up_after_endstop_or_probe_move() {
|
2120
|
2114
|
planner.bed_level_matrix.set_to_identity();
|
2121
|
2115
|
#endif
|
2122
|
2116
|
|
2123
|
|
- #if ENABLED(DELTA)
|
2124
|
|
- float z_before = current_position[Z_AXIS], // Current Z
|
2125
|
|
- z_mm = stepper.get_axis_position_mm(Z_AXIS); // Some tower's current position
|
2126
|
|
- #endif
|
2127
|
|
-
|
2128
|
2117
|
do_blocking_move_to_z(-(Z_MAX_LENGTH + 10), Z_PROBE_SPEED_FAST);
|
2129
|
2118
|
endstops.hit_on_purpose();
|
2130
|
|
- SET_Z_FROM_STEPPERS();
|
|
2119
|
+ set_current_from_steppers();
|
2131
|
2120
|
SYNC_PLAN_POSITION_KINEMATIC();
|
2132
|
2121
|
|
2133
|
2122
|
// move up the retract distance
|
2134
|
2123
|
do_blocking_move_to_z(current_position[Z_AXIS] + home_bump_mm(Z_AXIS), Z_PROBE_SPEED_FAST);
|
2135
|
2124
|
|
2136
|
|
- #if ENABLED(DELTA)
|
2137
|
|
- z_before = current_position[Z_AXIS];
|
2138
|
|
- z_mm = stepper.get_axis_position_mm(Z_AXIS);
|
2139
|
|
- #endif
|
2140
|
|
-
|
2141
|
2125
|
// move back down slowly to find bed
|
2142
|
2126
|
do_blocking_move_to_z(current_position[Z_AXIS] - home_bump_mm(Z_AXIS) * 2, Z_PROBE_SPEED_SLOW);
|
2143
|
2127
|
endstops.hit_on_purpose();
|
2144
|
|
- SET_Z_FROM_STEPPERS();
|
|
2128
|
+ set_current_from_steppers();
|
2145
|
2129
|
SYNC_PLAN_POSITION_KINEMATIC();
|
2146
|
2130
|
|
2147
|
2131
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|