From 34e24954879118201f6a1ef8b199597b7d5f73df Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 26 Feb 2019 10:32:10 +0100 Subject: [PATCH] Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template. --- Firmware/mmu.cpp | 34 ---------------------------------- Firmware/mmu.h | 5 ----- Firmware/ultralcd.cpp | 18 ++++++++++++------ 3 files changed, 12 insertions(+), 45 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 2f7bf96c3..158b3cb77 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1183,40 +1183,6 @@ void extr_adj_4() #endif } -void mmu_load_to_nozzle_0() -{ -//-// - menu_back(); - lcd_mmu_load_to_nozzle(0); -} - -void mmu_load_to_nozzle_1() -{ -//-// - menu_back(); - lcd_mmu_load_to_nozzle(1); -} - -void mmu_load_to_nozzle_2() -{ -//-// - menu_back(); - lcd_mmu_load_to_nozzle(2); -} - -void mmu_load_to_nozzle_3() -{ -//-// - menu_back(); - lcd_mmu_load_to_nozzle(3); -} - -void mmu_load_to_nozzle_4() -{ -//-// - menu_back(); - lcd_mmu_load_to_nozzle(4); -} void mmu_eject_fil_0() { diff --git a/Firmware/mmu.h b/Firmware/mmu.h index 446c9aec0..b2f9cefb8 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -108,11 +108,6 @@ extern void extr_adj_1(); extern void extr_adj_2(); extern void extr_adj_3(); extern void extr_adj_4(); -extern void mmu_load_to_nozzle_0(); -extern void mmu_load_to_nozzle_1(); -extern void mmu_load_to_nozzle_2(); -extern void mmu_load_to_nozzle_3(); -extern void mmu_load_to_nozzle_4(); extern void load_all(); extern void extr_change_0(); extern void extr_change_1(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f6502cef9..339d5195d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5685,18 +5685,24 @@ static void fil_load_menu() MENU_END(); } +template +static void mmu_load_to_nozzle() +{ + menu_back(); + lcd_mmu_load_to_nozzle(filament); +} + static void mmu_load_to_nozzle_menu() { -//-//if (degHotend0() > EXTRUDE_MINTEMP) if(bFilamentAction) { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Load filament 1"), mmu_load_to_nozzle_0); - MENU_ITEM_FUNCTION_P(_i("Load filament 2"), mmu_load_to_nozzle_1); - MENU_ITEM_FUNCTION_P(_i("Load filament 3"), mmu_load_to_nozzle_2); - MENU_ITEM_FUNCTION_P(_i("Load filament 4"), mmu_load_to_nozzle_3); - MENU_ITEM_FUNCTION_P(_i("Load filament 5"), mmu_load_to_nozzle_4); + MENU_ITEM_FUNCTION_P(_i("Load filament 1"), mmu_load_to_nozzle<0>); + MENU_ITEM_FUNCTION_P(_i("Load filament 2"), mmu_load_to_nozzle<1>); + MENU_ITEM_FUNCTION_P(_i("Load filament 3"), mmu_load_to_nozzle<2>); + MENU_ITEM_FUNCTION_P(_i("Load filament 4"), mmu_load_to_nozzle<3>); + MENU_ITEM_FUNCTION_P(_i("Load filament 5"), mmu_load_to_nozzle<4>); MENU_END(); } else {