From 367a28a5a8dd1c7fbc2308f953447194659584e9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 23 Apr 2019 20:24:04 +0200 Subject: [PATCH 1/3] Default to "Live Adjust Z" when longpressing during a print (closes #1604) - Disable longpress action when homing or calibrating - Default to Live Adjust during a print - Retain "Move Z" otherwise --- Firmware/ultralcd.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 48c408f9..3f7c6960 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8252,8 +8252,22 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { - move_menu_scale = 1.0; - menu_submenu(lcd_move_z); + if (homing_flag || mesh_bed_leveling_flag) + { + // disable longpress while homing or calibration + return; + } + + if (moves_planned() || IS_SD_PRINTING || is_usb_printing) + { + lcd_clear(); + menu_submenu(lcd_babystep_z); + } + else + { + move_menu_scale = 1.0; + menu_submenu(lcd_move_z); + } } void menu_lcd_charsetup_func(void) From 3a87ff56f678a4811679393eaf7ef61ce5ffa422 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 16 Jul 2019 21:15:58 +0200 Subject: [PATCH 2/3] Default to "Move Z" above a certain height even when printing This speeds-up the ability to manually get the carriage out of the way just after a print has finished --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3f7c6960..169a1f18 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8258,7 +8258,7 @@ void menu_lcd_longpress_func(void) return; } - if (moves_planned() || IS_SD_PRINTING || is_usb_printing) + if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing )) { lcd_clear(); menu_submenu(lcd_babystep_z); From 33037d369cf35fb0ea8d962bb9c8d26df9dfd561 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 5 Aug 2019 18:22:56 +0200 Subject: [PATCH 3/3] Prevent LCD long-press re-entry (fixes #1196) --- Firmware/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 169a1f18..7e96fcc8 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8252,9 +8252,10 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { - if (homing_flag || mesh_bed_leveling_flag) + if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) { - // disable longpress while homing or calibration + // disable longpress during re-entry, while homing or calibration + lcd_quick_feedback(); return; }