From 8df61893c37b3b542b96c36207078e554f5d06a5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 23 Nov 2024 16:41:42 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Show=20probe/level=20menu=20for?= =?UTF-8?q?=20tramming=20(#27532)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/menu/menu_main.cpp | 4 ++-- Marlin/src/lcd/menu/menu_probe_level.cpp | 4 ++-- buildroot/share/PlatformIO/scripts/common-dependencies.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index c4ac975690..4da92d5e49 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -72,7 +72,7 @@ void menu_motion(); void menu_temperature(); void menu_configuration(); -#if HAS_LEVELING || HAS_BED_PROBE +#if ANY(HAS_LEVELING, HAS_BED_PROBE, ASSISTED_TRAMMING_WIZARD, LCD_BED_TRAMMING) void menu_probe_level(); #endif @@ -338,7 +338,7 @@ void menu_main() { SUBMENU(MSG_MOTION, menu_motion); - #if HAS_LEVELING || HAS_BED_PROBE + #if ANY(HAS_LEVELING, HAS_BED_PROBE, ASSISTED_TRAMMING_WIZARD, LCD_BED_TRAMMING) SUBMENU(MSG_PROBE_AND_LEVEL, menu_probe_level); #endif } diff --git a/Marlin/src/lcd/menu/menu_probe_level.cpp b/Marlin/src/lcd/menu/menu_probe_level.cpp index 2661a6b3fb..588a5b257b 100644 --- a/Marlin/src/lcd/menu/menu_probe_level.cpp +++ b/Marlin/src/lcd/menu/menu_probe_level.cpp @@ -26,7 +26,7 @@ #include "../../inc/MarlinConfigPre.h" -#if HAS_MARLINUI_MENU && (HAS_LEVELING || HAS_BED_PROBE) +#if HAS_MARLINUI_MENU && ANY(HAS_LEVELING, HAS_BED_PROBE, ASSISTED_TRAMMING_WIZARD, LCD_BED_TRAMMING) #include "menu_item.h" @@ -410,4 +410,4 @@ void menu_probe_level() { END_MENU(); } -#endif // HAS_MARLINUI_MENU && (HAS_LEVELING || HAS_BED_PROBE) +#endif // HAS_MARLINUI_MENU && (HAS_LEVELING || HAS_BED_PROBE || ASSISTED_TRAMMING_WIZARD || LCD_BED_TRAMMING) diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.h b/buildroot/share/PlatformIO/scripts/common-dependencies.h index 5edbcc752a..c1e8c83bc7 100644 --- a/buildroot/share/PlatformIO/scripts/common-dependencies.h +++ b/buildroot/share/PlatformIO/scripts/common-dependencies.h @@ -98,7 +98,7 @@ #if ENABLED(TOUCH_SCREEN_CALIBRATION) #define HAS_MENU_TOUCH_SCREEN #endif - #if HAS_LEVELING || HAS_BED_PROBE + #if ANY(HAS_LEVELING, HAS_BED_PROBE, ASSISTED_TRAMMING_WIZARD, LCD_BED_TRAMMING) #define HAS_MENU_PROBE_LEVEL #endif #if ENABLED(ASSISTED_TRAMMING_WIZARD)