josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.

This commit is contained in:
Marek Bel 2019-02-26 10:32:10 +01:00
parent d5c5ed55eb
commit 34e2495487
3 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Firmware/mmu.cpp
View File

@ -1183,40 +1183,6 @@ void extr_adj_4()
#endif #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() void mmu_eject_fil_0()
{ {

5
Firmware/mmu.h
View File

@ -108,11 +108,6 @@ extern void extr_adj_1();
extern void extr_adj_2(); extern void extr_adj_2();
extern void extr_adj_3(); extern void extr_adj_3();
extern void extr_adj_4(); 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 load_all();
extern void extr_change_0(); extern void extr_change_0();
extern void extr_change_1(); extern void extr_change_1();

18
Firmware/ultralcd.cpp
View File

@ -5685,18 +5685,24 @@ static void fil_load_menu()
MENU_END(); MENU_END();
} }
template <uint8_t filament>
static void mmu_load_to_nozzle()
{
menu_back();
lcd_mmu_load_to_nozzle(filament);
}
static void mmu_load_to_nozzle_menu() static void mmu_load_to_nozzle_menu()
{ {
//-//if (degHotend0() > EXTRUDE_MINTEMP)
if(bFilamentAction) if(bFilamentAction)
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); 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 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 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 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 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 5"), mmu_load_to_nozzle<4>);
MENU_END(); MENU_END();
} }
else { else {