From 70ee06144ebcdd903b74dc3a0f4d1cc194e3bcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 12 Feb 2022 12:48:39 +0000 Subject: [PATCH 1/2] Add menu back arrow to the Perheat menu All other menus have this arrow on the back button. --- Firmware/ultralcd.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e90eaa8a..0a5d5196 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2384,7 +2384,6 @@ static void mFilamentItem_PVB() void mFilamentBack() { - menu_back(); if (eFilamentAction == FilamentAction::AutoLoad || eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal) @@ -2398,13 +2397,16 @@ void lcd_generic_preheat_menu() MENU_BEGIN(); if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { + ON_MENU_LEAVE( + mFilamentBack(); + ); if (eFilamentAction == FilamentAction::Lay1Cal) { - MENU_ITEM_FUNCTION_P(_T(MSG_BACK), mFilamentBack); + MENU_ITEM_BACK_P(_T(MSG_BACK)); } else { - MENU_ITEM_FUNCTION_P(_T(MSG_MAIN), mFilamentBack); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); } } if (farm_mode) From bd3a8355163e58ceb30041885d651489c73ceacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 12 Feb 2022 14:17:11 +0000 Subject: [PATCH 2/2] Optimise preheat menu's MENU_ITEM_BACK_P Saves 10 bytes of flash memory --- Firmware/ultralcd.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0a5d5196..6d733bff 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2400,14 +2400,7 @@ void lcd_generic_preheat_menu() ON_MENU_LEAVE( mFilamentBack(); ); - if (eFilamentAction == FilamentAction::Lay1Cal) - { - MENU_ITEM_BACK_P(_T(MSG_BACK)); - } - else - { - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - } + MENU_ITEM_BACK_P(_T(eFilamentAction == FilamentAction::Lay1Cal ? MSG_BACK : MSG_MAIN)); } if (farm_mode) {