From 1cdc2e712b32b6c79e020306fc07e1d757a18844 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 10 Nov 2022 22:20:01 +0100 Subject: [PATCH 1/2] MK2.5: unblock planner after plan_abort_hard() --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 63b4fad1d..03220df90 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2992,6 +2992,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) if (lcd_clicked()) { // Abort a move if in progress. planner_abort_hard(); + planner_aborted = false; while (lcd_clicked()) ; _delay(10); while (lcd_clicked()) ; From 661b3a83fff355d56733867e183a5b632622f7bd Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 10 Nov 2022 22:20:46 +0100 Subject: [PATCH 2/2] MK2.5: fix swapped yes/no messaged for Z manual alignment --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 03220df90..7f67c7be8 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3009,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 if (result == LCD_BUTTON_TIMEOUT) goto canceled; - else if (result == LCD_MIDDLE_BUTTON_CHOICE) + else if (result == LCD_LEFT_BUTTON_CHOICE) goto calibrated; // otherwise perform another round of the Z up dialog. }