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

Merge pull request #3745 from leptun/MK2.5_XYZ_Cal_fixes 

MK2.5 XYZ calibration fixes
This commit is contained in:
Alex Voinea 2022-11-12 21:48:16 +01:00 committed by GitHub
parent 006fe110cc 661b3a83ff
commit a2bbc4f585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/ultralcd.cpp
View File

@ -2992,6 +2992,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z)
if (lcd_clicked()) { if (lcd_clicked()) {
// Abort a move if in progress. // Abort a move if in progress.
planner_abort_hard(); planner_abort_hard();
planner_aborted = false;
while (lcd_clicked()) ; while (lcd_clicked()) ;
_delay(10); _delay(10);
while (lcd_clicked()) ; while (lcd_clicked()) ;
@ -3008,7 +3009,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z)
uint8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z~carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 uint8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z~carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2
if (result == LCD_BUTTON_TIMEOUT) if (result == LCD_BUTTON_TIMEOUT)
goto canceled; goto canceled;
else if (result == LCD_MIDDLE_BUTTON_CHOICE) else if (result == LCD_LEFT_BUTTON_CHOICE)
goto calibrated; goto calibrated;
// otherwise perform another round of the Z up dialog. // otherwise perform another round of the Z up dialog.
} }