Skip to content

Commit 253b14d

Browse files
committed
Clamp Z movements to machine limits
1 parent 44fce06 commit 253b14d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Firmware/Marlin_main.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -3688,6 +3688,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
36883688

36893689
//Lift Z
36903690
current_position[Z_AXIS] += z_shift;
3691+
clamp_to_software_endstops(current_position);
36913692
plan_buffer_line_curposXYZE(FILAMENTCHANGE_ZFEED);
36923693
st_synchronize();
36933694

@@ -10734,7 +10735,7 @@ void long_pause() //long pause print
1073410735

1073510736
//lift z
1073610737
current_position[Z_AXIS] += Z_PAUSE_LIFT;
10737-
if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS;
10738+
clamp_to_software_endstops(current_position);
1073810739
plan_buffer_line_curposXYZE(15);
1073910740

1074010741
//Move XY to side

Firmware/ultralcd.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -6309,6 +6309,7 @@ void lcd_print_stop()
63096309

63106310
if (axis_known_position[Z_AXIS]) {
63116311
current_position[Z_AXIS] += Z_CANCEL_LIFT;
6312+
clamp_to_software_endstops(current_position);
63126313
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60);
63136314
}
63146315

0 commit comments

Comments
 (0)