From 367a28a5a8dd1c7fbc2308f953447194659584e9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 23 Apr 2019 20:24:04 +0200 Subject: [PATCH] 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 48c408f9c..3f7c6960b 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)