Browse Source

Fix MMU2 compile error (#15923)

Giuliano Zaro 5 years ago
parent
commit
aa89bb71f9
1 changed files with 20 additions and 20 deletions
  1. 20
    20
      Marlin/src/lcd/menu/menu_mmu2.cpp

+ 20
- 20
Marlin/src/lcd/menu/menu_mmu2.cpp View File

63
   START_MENU();
63
   START_MENU();
64
   BACK_ITEM(MSG_MMU2_MENU);
64
   BACK_ITEM(MSG_MMU2_MENU);
65
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
65
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
66
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ _mmu2_load_filament(0); });
67
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ _mmu2_load_filament(1); });
68
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ _mmu2_load_filament(2); });
69
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ _mmu2_load_filament(3); });
70
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ _mmu2_load_filament(4); });
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); });
71
   END_MENU();
71
   END_MENU();
72
 }
72
 }
73
 
73
 
74
 void menu_mmu2_load_to_nozzle() {
74
 void menu_mmu2_load_to_nozzle() {
75
   START_MENU();
75
   START_MENU();
76
   BACK_ITEM(MSG_MMU2_MENU);
76
   BACK_ITEM(MSG_MMU2_MENU);
77
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ action_mmu2_load_filament_to_nozzle(0); });
78
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ action_mmu2_load_filament_to_nozzle(1); });
79
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ action_mmu2_load_filament_to_nozzle(2); });
80
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ action_mmu2_load_filament_to_nozzle(3); });
81
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ action_mmu2_load_filament_to_nozzle(4); });
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); });
82
   END_MENU();
82
   END_MENU();
83
 }
83
 }
84
 
84
 
104
 void menu_mmu2_eject_filament() {
104
 void menu_mmu2_eject_filament() {
105
   START_MENU();
105
   START_MENU();
106
   BACK_ITEM(MSG_MMU2_MENU);
106
   BACK_ITEM(MSG_MMU2_MENU);
107
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ _mmu2_eject_filament(0); });
108
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ _mmu2_eject_filament(1); });
109
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ _mmu2_eject_filament(2); });
110
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ _mmu2_eject_filament(3); });
111
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ _mmu2_eject_filament(4); });
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); });
112
   END_MENU();
112
   END_MENU();
113
 }
113
 }
114
 
114
 
146
   #if LCD_HEIGHT > 2
146
   #if LCD_HEIGHT > 2
147
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
147
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
148
   #endif
148
   #endif
149
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ action_mmu2_choose(0); });
150
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ action_mmu2_choose(1); });
151
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ action_mmu2_choose(2); });
152
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ action_mmu2_choose(3); });
153
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ action_mmu2_choose(4); });
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); });
154
   END_MENU();
154
   END_MENU();
155
 }
155
 }
156
 
156
 

Loading…
Cancel
Save