From 9d5453a41e457afa3f062defce798883dab8526a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 20 May 2023 11:54:38 +0000 Subject: [PATCH] PFW-1520 Rename Load Filament menu to Preload to MMU Change in memory: Flash: +18 bytes SRAM: 0 bytes --- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index f50e03bdb..52c657386 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -52,6 +52,7 @@ const char MSG_ITERATION[] PROGMEM_I1 = ISTR("Iteration"); ////MSG_ITERATION c=1 const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_SELECT_FILAMENT c=20 const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////MSG_LAST_PRINT c=18 const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////MSG_LAST_PRINT_FAILURES c=20 +const char MSG_PRELOAD_TO_MMU[] PROGMEM_I1 = ISTR("Preload to MMU"); ////MSG_PRELOAD_TO_MMU c=17 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=17 const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING_TEST c=18 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index f074351d9..0d770371c 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -58,6 +58,7 @@ extern const char MSG_ITERATION[]; extern const char MSG_SELECT_FILAMENT[]; extern const char MSG_LAST_PRINT[]; extern const char MSG_LAST_PRINT_FAILURES[]; +extern const char MSG_PRELOAD_TO_MMU[]; extern const char MSG_LOAD_FILAMENT[]; extern const char MSG_LOADING_TEST[]; extern const char MSG_LOADING_FILAMENT[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index eafcb26e7..8311b8ef9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4760,12 +4760,12 @@ static inline void load_filament_wrapper(uint8_t i){ MMU2::mmu2.load_filament(i); } -static void mmu_load_filament_menu() { +static void mmu_preload_filament_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), load_all_wrapper); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_PRELOAD_TO_MMU c=16 MENU_END(); } @@ -5224,7 +5224,7 @@ static void lcd_main_menu() if ( ! ( printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { if (MMU2::mmu2.Enabled()) { - MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), mmu_load_filament_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_PRELOAD_TO_MMU), mmu_preload_filament_menu); MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18 MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FROM_MMU), mmu_fil_eject_menu);