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

Merge pull request #1416 from PavelSindler/z_cal_endstops 

Z cal endstops and stop paused print fix
This commit is contained in:
PavelSindler 2018-12-19 19:46:27 +01:00 committed by GitHub
parent 98c995ff81 f79137898a
commit b0fce9122e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/Marlin_main.cpp
View File

@ -2793,10 +2793,15 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2)); lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));
} }
bool endstops_enabled = enable_endstops(false);
current_position[Z_AXIS] -= 1; //move 1mm down with disabled endstop
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder);
st_synchronize();
// Move the print head close to the bed. // Move the print head close to the bed.
current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
bool endstops_enabled = enable_endstops(true); enable_endstops(true);
#ifdef TMC2130 #ifdef TMC2130
tmc2130_home_enter(Z_AXIS_MASK); tmc2130_home_enter(Z_AXIS_MASK);
#endif //TMC2130 #endif //TMC2130

3
Firmware/ultralcd.cpp
View File

@ -6058,6 +6058,7 @@ static void lcd_sd_updir()
void lcd_print_stop() void lcd_print_stop()
{ {
saved_printing = false;
cancel_heatup = true; cancel_heatup = true;
#ifdef MESH_BED_LEVELING #ifdef MESH_BED_LEVELING
mbl.active = false; mbl.active = false;
@ -6091,7 +6092,7 @@ void lcd_print_stop()
void lcd_sdcard_stop() void lcd_sdcard_stop()
{ {
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
lcd_puts_P(_T(MSG_STOP_PRINT)); lcd_puts_P(_T(MSG_STOP_PRINT));
lcd_set_cursor(2, 2); lcd_set_cursor(2, 2);