From 67c206ea5c3c00c598543344e2f6d2ff9cf828d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 11:53:05 +0000 Subject: [PATCH] Remove menu_back_if_clicked_fb Since feedback is always produced on knob click we can use menu_back_if_clicked instead Change in memory: Flash: -18 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 9 --------- Firmware/menu.h | 2 -- Firmware/ultralcd.cpp | 17 ++++++++--------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 56e729639..4cc87b26d 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -119,15 +119,6 @@ void menu_back_if_clicked(void) menu_back(); } -void menu_back_if_clicked_fb(void) -{ - if (lcd_clicked()) - { - lcd_quick_feedback(); - menu_back(); - } -} - void menu_submenu(menu_func_t submenu) { if (menu_depth < MENU_DEPTH_MAX) diff --git a/Firmware/menu.h b/Firmware/menu.h index 4b5a6780d..cb4101e10 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -78,8 +78,6 @@ extern void menu_back(uint8_t nLevel); extern void menu_back_if_clicked(void); -extern void menu_back_if_clicked_fb(void); - extern void menu_submenu(menu_func_t submenu); extern void menu_submenu_no_reset(menu_func_t submenu); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d568b785d..c5b87baac 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1142,7 +1142,7 @@ static void lcd_menu_fails_stats_mmu_print() { _T(MSG_LAST_PRINT_FAILURES), _T(MSG_MMU_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL) ), _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL) )); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Show Total Failures Statistics MMU @@ -1168,7 +1168,7 @@ static void lcd_menu_fails_stats_mmu_total() { _T(MSG_MMU_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_FAIL_TOT) ), _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT) ), _T(MSG_MMU_POWER_FAILS), clamp999( MMU2::mmu2.TMCFailures() )); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Show Total Failures Statistics MMU @@ -1197,8 +1197,7 @@ static void lcd_menu_toolchange_stats_mmu_total() lcd_print(eeprom_read_dword((uint32_t*)EEPROM_MMU_MATERIAL_CHANGES)); _md->initialized = true; } - - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } #if defined(TMC2130) && defined(FILAMENT_SENSOR) @@ -1225,7 +1224,7 @@ static void lcd_menu_fails_stats_total() _T(MSG_CRASH), clamp999( eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT) ), clamp999( eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT) )); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Show Last Print Failures Statistics @@ -1252,7 +1251,7 @@ static void lcd_menu_fails_stats_print() _T(MSG_POWER_FAILURES), power, _T(MSG_FIL_RUNOUTS), filam, _T(MSG_CRASH), crashX, crashY); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Open fail statistics menu @@ -1349,7 +1348,7 @@ static void lcd_menu_debug() " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=14 #endif //DEBUG_STACK_MONITOR - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } #endif /* DEBUG_BUILD */ @@ -2354,7 +2353,7 @@ void lcd_menu_statistics() ), _i("Filament used"), _met, ////MSG_FILAMENT_USED c=19 _i("Print time"), _h, _m, _s); ////MSG_PRINT_TIME c=19 - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } else { @@ -2376,7 +2375,7 @@ void lcd_menu_statistics() ), _i("Total filament"), _filament_m, ////MSG_TOTAL_FILAMENT c=19 _i("Total print time"), _days, _hours, _minutes); ////MSG_TOTAL_PRINT_TIME c=19 - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } }