From 2aa6cfc1abccb431587eaabd7592bf50861fa148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 2 Jul 2022 07:04:14 +0000 Subject: [PATCH] Optimise mmu_cut_filament_menu (#40) preheat_or_continue should be used here to reduce copying code --- Firmware/ultralcd.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dae03e8f7..104597797 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5222,17 +5222,9 @@ static void mmu_cut_filament_menu() { for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 MENU_END(); - } - else - { + } else { eFilamentAction=FilamentAction::MmuCut; - bFilamentFirstRun=false; - if(target_temperature[0] >= extrude_min_temp) - { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); - } - else lcd_generic_preheat_menu(); + preheat_or_continue(); } } #endif //MMU_HAS_CUTTER