From 21ff43188fe6ca3edea189f7f37303a884cc751c Mon Sep 17 00:00:00 2001 From: Scott Mikutsky Date: Sat, 12 Aug 2023 15:51:38 -0400 Subject: [PATCH 1/4] Add Filament Change Menu position option Make the menu rearrangement and arbitrary conditional in #24694 optional --- Marlin/Configuration_adv.h | 1 + Marlin/src/lcd/menu/menu_main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8e66d7555dbf..13d2b96e6dc2 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2830,6 +2830,7 @@ //#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. + //#define FILAMENT_CHANGE_MENU_AT_BOTTOM // Add the filament change menu to the bottom of the main menu instead of below temperature //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) #endif diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 1bf380e3608c..aa80deb0a7a2 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -332,7 +332,7 @@ void menu_main() { SUBMENU(MSG_MOTION, menu_motion); } - #if ALL(ADVANCED_PAUSE_FEATURE, DISABLE_ENCODER) + #if ENABLED(ADVANCED_PAUSE_FEATURE) && DISABLED(FILAMENT_CHANGE_MENU_AT_BOTTOM) FILAMENT_CHANGE_ITEM(); #endif @@ -503,7 +503,7 @@ void menu_main() { }); #endif - #if ENABLED(ADVANCED_PAUSE_FEATURE) && DISABLED(DISABLE_ENCODER) + #if ALL(ADVANCED_PAUSE_FEATURE, FILAMENT_CHANGE_MENU_AT_BOTTOM) FILAMENT_CHANGE_ITEM(); #endif From 1186eedcda96566745b08ac44a4a3bffde877f7f Mon Sep 17 00:00:00 2001 From: Scott Mikutsky Date: Sat, 12 Aug 2023 17:31:05 -0400 Subject: [PATCH 2/4] Moved Filament Change below Temperature --- Marlin/src/lcd/menu/menu_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index aa80deb0a7a2..6125648539cf 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -332,10 +332,6 @@ void menu_main() { SUBMENU(MSG_MOTION, menu_motion); } - #if ENABLED(ADVANCED_PAUSE_FEATURE) && DISABLED(FILAMENT_CHANGE_MENU_AT_BOTTOM) - FILAMENT_CHANGE_ITEM(); - #endif - #if HAS_CUTTER SUBMENU(MSG_CUTTER(MENU), STICKY_SCREEN(menu_spindle_laser)); #endif @@ -344,6 +340,10 @@ void menu_main() { SUBMENU(MSG_TEMPERATURE, menu_temperature); #endif + #if ENABLED(ADVANCED_PAUSE_FEATURE) && DISABLED(FILAMENT_CHANGE_MENU_AT_BOTTOM) + FILAMENT_CHANGE_ITEM(); + #endif + #if HAS_POWER_MONITOR SUBMENU(MSG_POWER_MONITOR, menu_power_monitor); #endif From c0b0c9bdd7cff3c08b394cd4ad916a6a03c86dca Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 23 Jan 2024 14:26:41 -0600 Subject: [PATCH 3/4] move --- Marlin/Configuration_adv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 13d2b96e6dc2..11d4cb24949a 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2830,8 +2830,9 @@ //#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. - //#define FILAMENT_CHANGE_MENU_AT_BOTTOM // Add the filament change menu to the bottom of the main menu instead of below temperature //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) + + //#define FILAMENT_CHANGE_MENU_AT_BOTTOM // Add the filament change menu to the bottom of the main menu instead of below temperature. #endif // @section tmc_smart From b359248f9536ced74acddf7287a9c8a3f3681f29 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 5 Feb 2024 23:06:45 -0600 Subject: [PATCH 4/4] always move --- Marlin/Configuration_adv.h | 2 -- Marlin/src/lcd/menu/menu_main.cpp | 12 ++++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 11d4cb24949a..8e66d7555dbf 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2831,8 +2831,6 @@ //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) - - //#define FILAMENT_CHANGE_MENU_AT_BOTTOM // Add the filament change menu to the bottom of the main menu instead of below temperature. #endif // @section tmc_smart diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 6125648539cf..0851f0ea4ae2 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -336,12 +336,12 @@ void menu_main() { SUBMENU(MSG_CUTTER(MENU), STICKY_SCREEN(menu_spindle_laser)); #endif - #if HAS_TEMPERATURE - SUBMENU(MSG_TEMPERATURE, menu_temperature); + #if ENABLED(ADVANCED_PAUSE_FEATURE) + FILAMENT_CHANGE_ITEM(); #endif - #if ENABLED(ADVANCED_PAUSE_FEATURE) && DISABLED(FILAMENT_CHANGE_MENU_AT_BOTTOM) - FILAMENT_CHANGE_ITEM(); + #if HAS_TEMPERATURE + SUBMENU(MSG_TEMPERATURE, menu_temperature); #endif #if HAS_POWER_MONITOR @@ -503,10 +503,6 @@ void menu_main() { }); #endif - #if ALL(ADVANCED_PAUSE_FEATURE, FILAMENT_CHANGE_MENU_AT_BOTTOM) - FILAMENT_CHANGE_ITEM(); - #endif - END_MENU(); }