Skip to content

Commit a8244dc

Browse files
authored
Merge pull request prusa3d#3455 from wavexx/stop_raise_higher
Stop raise higher
2 parents 6271f17 + 253b14d commit a8244dc

8 files changed

+13
-3
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

@@ -10758,7 +10759,7 @@ void long_pause() //long pause print
1075810759

1075910760
//lift z
1076010761
current_position[Z_AXIS] += Z_PAUSE_LIFT;
10761-
if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS;
10762+
clamp_to_software_endstops(current_position);
1076210763
plan_buffer_line_curposXYZE(15);
1076310764

1076410765
//Move XY to side

Firmware/ultralcd.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -6307,8 +6307,11 @@ void lcd_print_stop()
63076307

63086308
lcd_cooldown(); //turns off heaters and fan; goes to status screen.
63096309

6310-
current_position[Z_AXIS] += 10; //lift Z.
6311-
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60);
6310+
if (axis_known_position[Z_AXIS]) {
6311+
current_position[Z_AXIS] += Z_CANCEL_LIFT;
6312+
clamp_to_software_endstops(current_position);
6313+
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60);
6314+
}
63126315

63136316
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) //if axis are homed, move to parked position.
63146317
{

Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
// Canceled home position
7272
#define X_CANCEL_POS 50
7373
#define Y_CANCEL_POS 190
74+
#define Z_CANCEL_LIFT 50
7475

7576
//Pause print position
7677
#define X_PAUSE_POS 50

Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
// Canceled home position
7272
#define X_CANCEL_POS 50
7373
#define Y_CANCEL_POS 190
74+
#define Z_CANCEL_LIFT 50
7475

7576
//Pause print position
7677
#define X_PAUSE_POS 50

Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
// Canceled home position
7272
#define X_CANCEL_POS 50
7373
#define Y_CANCEL_POS 190
74+
#define Z_CANCEL_LIFT 50
7475

7576
//Pause print position
7677
#define X_PAUSE_POS 50

Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
// Canceled home position
7272
#define X_CANCEL_POS 50
7373
#define Y_CANCEL_POS 190
74+
#define Z_CANCEL_LIFT 50
7475

7576
//Pause print position
7677
#define X_PAUSE_POS 50

Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
// Canceled home position
7474
#define X_CANCEL_POS 50
7575
#define Y_CANCEL_POS 190
76+
#define Z_CANCEL_LIFT 50
7677

7778
//Pause print position
7879
#define X_PAUSE_POS 50

Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
// Canceled home position
7676
#define X_CANCEL_POS 50
7777
#define Y_CANCEL_POS 190
78+
#define Z_CANCEL_LIFT 50
7879

7980
//Pause print position
8081
#define X_PAUSE_POS 50

0 commit comments

Comments
 (0)