josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3455 from wavexx/stop_raise_higher 

Stop raise higher
This commit is contained in:
Yuri D'Elia 2022-07-04 20:05:23 +02:00 committed by GitHub
parent 6271f17340 253b14def1
commit a8244dc2bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -3688,6 +3688,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
//Lift Z //Lift Z
current_position[Z_AXIS] += z_shift; current_position[Z_AXIS] += z_shift;
clamp_to_software_endstops(current_position);
plan_buffer_line_curposXYZE(FILAMENTCHANGE_ZFEED); plan_buffer_line_curposXYZE(FILAMENTCHANGE_ZFEED);
st_synchronize(); st_synchronize();
@ -10758,7 +10759,7 @@ void long_pause() //long pause print
//lift z //lift z
current_position[Z_AXIS] += Z_PAUSE_LIFT; current_position[Z_AXIS] += Z_PAUSE_LIFT;
if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; clamp_to_software_endstops(current_position);
plan_buffer_line_curposXYZE(15); plan_buffer_line_curposXYZE(15);
//Move XY to side //Move XY to side

7
Firmware/ultralcd.cpp
View File

@ -6307,8 +6307,11 @@ void lcd_print_stop()
lcd_cooldown(); //turns off heaters and fan; goes to status screen. lcd_cooldown(); //turns off heaters and fan; goes to status screen.
current_position[Z_AXIS] += 10; //lift Z. if (axis_known_position[Z_AXIS]) {
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60); current_position[Z_AXIS] += Z_CANCEL_LIFT;
clamp_to_software_endstops(current_position);
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60);
}
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) //if axis are homed, move to parked position. if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) //if axis are homed, move to parked position.
{ {

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

@ -71,6 +71,7 @@
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190
#define Z_CANCEL_LIFT 50
//Pause print position //Pause print position
#define X_PAUSE_POS 50 #define X_PAUSE_POS 50

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

@ -71,6 +71,7 @@
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190
#define Z_CANCEL_LIFT 50
//Pause print position //Pause print position
#define X_PAUSE_POS 50 #define X_PAUSE_POS 50

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

@ -71,6 +71,7 @@
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190
#define Z_CANCEL_LIFT 50
//Pause print position //Pause print position
#define X_PAUSE_POS 50 #define X_PAUSE_POS 50

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

@ -71,6 +71,7 @@
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190
#define Z_CANCEL_LIFT 50
//Pause print position //Pause print position
#define X_PAUSE_POS 50 #define X_PAUSE_POS 50

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

@ -73,6 +73,7 @@
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190
#define Z_CANCEL_LIFT 50
//Pause print position //Pause print position
#define X_PAUSE_POS 50 #define X_PAUSE_POS 50

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

@ -75,6 +75,7 @@
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190
#define Z_CANCEL_LIFT 50
//Pause print position //Pause print position
#define X_PAUSE_POS 50 #define X_PAUSE_POS 50