|
@@ -63,22 +63,14 @@ void menu_mmu2_load_filament() {
|
63
|
63
|
START_MENU();
|
64
|
64
|
BACK_ITEM(MSG_MMU2_MENU);
|
65
|
65
|
ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
|
66
|
|
- ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(0); });
|
67
|
|
- ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(1); });
|
68
|
|
- ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(2); });
|
69
|
|
- ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(3); });
|
70
|
|
- ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(4); });
|
|
66
|
+ LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(MenuItemBase::itemIndex); });
|
71
|
67
|
END_MENU();
|
72
|
68
|
}
|
73
|
69
|
|
74
|
70
|
void menu_mmu2_load_to_nozzle() {
|
75
|
71
|
START_MENU();
|
76
|
72
|
BACK_ITEM(MSG_MMU2_MENU);
|
77
|
|
- ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(0); });
|
78
|
|
- ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(1); });
|
79
|
|
- ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(2); });
|
80
|
|
- ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(3); });
|
81
|
|
- ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(4); });
|
|
73
|
+ LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(MenuItemBase::itemIndex); });
|
82
|
74
|
END_MENU();
|
83
|
75
|
}
|
84
|
76
|
|
|
@@ -104,11 +96,7 @@ void action_mmu2_unload_filament() {
|
104
|
96
|
void menu_mmu2_eject_filament() {
|
105
|
97
|
START_MENU();
|
106
|
98
|
BACK_ITEM(MSG_MMU2_MENU);
|
107
|
|
- ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(0); });
|
108
|
|
- ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(1); });
|
109
|
|
- ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(2); });
|
110
|
|
- ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(3); });
|
111
|
|
- ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(4); });
|
|
99
|
+ LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(MenuItemBase::itemIndex); });
|
112
|
100
|
END_MENU();
|
113
|
101
|
}
|
114
|
102
|
|
|
@@ -146,11 +134,7 @@ void menu_mmu2_choose_filament() {
|
146
|
134
|
#if LCD_HEIGHT > 2
|
147
|
135
|
STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
|
148
|
136
|
#endif
|
149
|
|
- ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(0); });
|
150
|
|
- ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(1); });
|
151
|
|
- ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(2); });
|
152
|
|
- ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(3); });
|
153
|
|
- ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(4); });
|
|
137
|
+ LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(MenuItemBase::itemIndex); });
|
154
|
138
|
END_MENU();
|
155
|
139
|
}
|
156
|
140
|
|