From 7d927b66913c0740af691c6bbabb4c5f995ce1f7 Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Wed, 30 Jan 2019 22:08:36 -0500 Subject: [PATCH] Move Z Probe Z Offset from Advanced to basic Configuration (#13056) --- Marlin/src/lcd/menu/menu_advanced.cpp | 6 ------ Marlin/src/lcd/menu/menu_configuration.cpp | 10 ++++++++++ Marlin/src/lcd/menu/menu_main.cpp | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp index f1da33e44a..70674259c0 100644 --- a/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin/src/lcd/menu/menu_advanced.cpp @@ -558,12 +558,6 @@ void menu_advanced_settings() { START_MENU(); MENU_BACK(MSG_CONFIGURATION); - #if ENABLED(BABYSTEP_ZPROBE_OFFSET) - MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); - #elif HAS_BED_PROBE - MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); - #endif - #if DISABLED(SLIM_LCD_MENUS) #if HAS_M206_COMMAND diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index 1e96773316..c6853c4b5b 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -40,6 +40,10 @@ #include "../../feature/power_loss_recovery.h" #endif +#if HAS_BED_PROBE + #include "../../module/probe.h" +#endif + #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST) void menu_advanced_settings(); @@ -306,6 +310,12 @@ void menu_configuration() { MENU_ITEM(submenu, MSG_ADVANCED_SETTINGS, menu_advanced_settings); + #if ENABLED(BABYSTEP_ZPROBE_OFFSET) + MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); + #elif HAS_BED_PROBE + MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); + #endif + const bool busy = printer_busy(); if (!busy) { // diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 6ed21eab83..8838ddfde4 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -61,7 +61,8 @@ void lcd_pause() { void lcd_resume() { #if ENABLED(SDSUPPORT) if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24")); - #elif defined(ACTION_ON_RESUME) + #endif + #ifdef ACTION_ON_RESUME host_action_resume(); #endif }