|
@@ -35,60 +35,60 @@ bool mmuMenuWait;
|
35
|
35
|
// Load Filament
|
36
|
36
|
//
|
37
|
37
|
|
38
|
|
-void _mmu2_loadFilamentToNozzle(uint8_t index) {
|
|
38
|
+void _mmu2_load_filamentToNozzle(uint8_t index) {
|
39
|
39
|
ui.reset_status();
|
40
|
40
|
ui.return_to_status();
|
41
|
41
|
ui.status_printf_P(0, PSTR(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
|
42
|
|
- if (mmu2.loadFilamentToNozzle(index)) ui.reset_status();
|
|
42
|
+ if (mmu2.load_filament_to_nozzle(index)) ui.reset_status();
|
43
|
43
|
}
|
44
|
44
|
|
45
|
|
-inline void action_mmu2_loadFilamentToNozzle(const uint8_t tool) {
|
46
|
|
- _mmu2_loadFilamentToNozzle(tool);
|
|
45
|
+inline void action_mmu2_load_filament_to_nozzl_e(const uint8_t tool) {
|
|
46
|
+ _mmu2_load_filamentToNozzle(tool);
|
47
|
47
|
ui.return_to_status();
|
48
|
48
|
}
|
49
|
|
-inline void action_mmu2_loadFilamentToNozzle0() { action_mmu2_loadFilamentToNozzle(0); }
|
50
|
|
-inline void action_mmu2_loadFilamentToNozzle1() { action_mmu2_loadFilamentToNozzle(1); }
|
51
|
|
-inline void action_mmu2_loadFilamentToNozzle2() { action_mmu2_loadFilamentToNozzle(2); }
|
52
|
|
-inline void action_mmu2_loadFilamentToNozzle3() { action_mmu2_loadFilamentToNozzle(3); }
|
53
|
|
-inline void action_mmu2_loadFilamentToNozzle4() { action_mmu2_loadFilamentToNozzle(4); }
|
|
49
|
+inline void action_mmu2_load_filament_to_nozzle_0() { action_mmu2_load_filament_to_nozzl_e(0); }
|
|
50
|
+inline void action_mmu2_load_filament_to_nozzle_1() { action_mmu2_load_filament_to_nozzl_e(1); }
|
|
51
|
+inline void action_mmu2_load_filament_to_nozzle_2() { action_mmu2_load_filament_to_nozzl_e(2); }
|
|
52
|
+inline void action_mmu2_load_filament_to_nozzle_3() { action_mmu2_load_filament_to_nozzl_e(3); }
|
|
53
|
+inline void action_mmu2_load_filament_to_nozzle_4() { action_mmu2_load_filament_to_nozzl_e(4); }
|
54
|
54
|
|
55
|
|
-void _mmu2_loadFilament(uint8_t index) {
|
|
55
|
+void _mmu2_load_filament(uint8_t index) {
|
56
|
56
|
ui.return_to_status();
|
57
|
57
|
ui.status_printf_P(0, PSTR(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
|
58
|
|
- mmu2.loadFilament(index);
|
|
58
|
+ mmu2.load_filament(index);
|
59
|
59
|
ui.reset_status();
|
60
|
60
|
}
|
61
|
|
-void action_mmu2_loadAll() {
|
|
61
|
+void action_mmu2_load_all() {
|
62
|
62
|
for (uint8_t i = 0; i < EXTRUDERS; i++)
|
63
|
|
- _mmu2_loadFilament(i);
|
|
63
|
+ _mmu2_load_filament(i);
|
64
|
64
|
ui.return_to_status();
|
65
|
65
|
}
|
66
|
|
-inline void action_mmu2_loadFilament0() { _mmu2_loadFilament(0); }
|
67
|
|
-inline void action_mmu2_loadFilament1() { _mmu2_loadFilament(1); }
|
68
|
|
-inline void action_mmu2_loadFilament2() { _mmu2_loadFilament(2); }
|
69
|
|
-inline void action_mmu2_loadFilament3() { _mmu2_loadFilament(3); }
|
70
|
|
-inline void action_mmu2_loadFilament4() { _mmu2_loadFilament(4); }
|
|
66
|
+inline void action_mmu2_load_filament_0() { _mmu2_load_filament(0); }
|
|
67
|
+inline void action_mmu2_load_filament_1() { _mmu2_load_filament(1); }
|
|
68
|
+inline void action_mmu2_load_filament_2() { _mmu2_load_filament(2); }
|
|
69
|
+inline void action_mmu2_load_filament_3() { _mmu2_load_filament(3); }
|
|
70
|
+inline void action_mmu2_load_filament_4() { _mmu2_load_filament(4); }
|
71
|
71
|
|
72
|
|
-void menu_mmu2_loadFilament() {
|
|
72
|
+void menu_mmu2_load_filament() {
|
73
|
73
|
START_MENU();
|
74
|
74
|
MENU_BACK(MSG_MMU2_MENU);
|
75
|
|
- MENU_ITEM(function, MSG_MMU2_ALL, action_mmu2_loadAll);
|
76
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_loadFilament0);
|
77
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_loadFilament1);
|
78
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT2, action_mmu2_loadFilament2);
|
79
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT3, action_mmu2_loadFilament3);
|
80
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT4, action_mmu2_loadFilament4);
|
|
75
|
+ MENU_ITEM(function, MSG_MMU2_ALL, action_mmu2_load_all);
|
|
76
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_load_filament_0);
|
|
77
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_load_filament_1);
|
|
78
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT2, action_mmu2_load_filament_2);
|
|
79
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT3, action_mmu2_load_filament_3);
|
|
80
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT4, action_mmu2_load_filament_4);
|
81
|
81
|
END_MENU();
|
82
|
82
|
}
|
83
|
83
|
|
84
|
|
-void menu_mmu2_loadToNozzle() {
|
|
84
|
+void menu_mmu2_load_to_nozzle() {
|
85
|
85
|
START_MENU();
|
86
|
86
|
MENU_BACK(MSG_MMU2_MENU);
|
87
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_loadFilamentToNozzle0);
|
88
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_loadFilamentToNozzle1);
|
89
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT2, action_mmu2_loadFilamentToNozzle2);
|
90
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT3, action_mmu2_loadFilamentToNozzle3);
|
91
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT4, action_mmu2_loadFilamentToNozzle4);
|
|
87
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_load_filament_to_nozzle_0);
|
|
88
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_load_filament_to_nozzle_1);
|
|
89
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT2, action_mmu2_load_filament_to_nozzle_2);
|
|
90
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT3, action_mmu2_load_filament_to_nozzle_3);
|
|
91
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT4, action_mmu2_load_filament_to_nozzle_4);
|
92
|
92
|
END_MENU();
|
93
|
93
|
}
|
94
|
94
|
|
|
@@ -96,19 +96,19 @@ void menu_mmu2_loadToNozzle() {
|
96
|
96
|
// Eject Filament
|
97
|
97
|
//
|
98
|
98
|
|
99
|
|
-void _mmu2_ejectFilament(uint8_t index) {
|
|
99
|
+void _mmu2_eject_filament(uint8_t index) {
|
100
|
100
|
ui.reset_status();
|
101
|
101
|
ui.return_to_status();
|
102
|
102
|
ui.status_printf_P(0, PSTR(MSG_MMU2_EJECTING_FILAMENT), int(index + 1));
|
103
|
|
- if (mmu2.ejectFilament(index, true)) ui.reset_status();
|
|
103
|
+ if (mmu2.eject_filament(index, true)) ui.reset_status();
|
104
|
104
|
}
|
105
|
|
-inline void action_mmu2_ejectFilament0() { _mmu2_ejectFilament(0); }
|
106
|
|
-inline void action_mmu2_ejectFilament1() { _mmu2_ejectFilament(1); }
|
107
|
|
-inline void action_mmu2_ejectFilament2() { _mmu2_ejectFilament(2); }
|
108
|
|
-inline void action_mmu2_ejectFilament3() { _mmu2_ejectFilament(3); }
|
109
|
|
-inline void action_mmu2_ejectFilament4() { _mmu2_ejectFilament(4); }
|
|
105
|
+inline void action_mmu2_eject_filament_0() { _mmu2_eject_filament(0); }
|
|
106
|
+inline void action_mmu2_eject_filament_1() { _mmu2_eject_filament(1); }
|
|
107
|
+inline void action_mmu2_eject_filament_2() { _mmu2_eject_filament(2); }
|
|
108
|
+inline void action_mmu2_eject_filament_3() { _mmu2_eject_filament(3); }
|
|
109
|
+inline void action_mmu2_eject_filament_4() { _mmu2_eject_filament(4); }
|
110
|
110
|
|
111
|
|
-void action_mmu2_unloadFilament() {
|
|
111
|
+void action_mmu2_unload_filament() {
|
112
|
112
|
ui.reset_status();
|
113
|
113
|
ui.return_to_status();
|
114
|
114
|
LCD_MESSAGEPGM(MSG_MMU2_UNLOADING_FILAMENT);
|
|
@@ -116,14 +116,14 @@ void action_mmu2_unloadFilament() {
|
116
|
116
|
if (mmu2.unload()) ui.reset_status();
|
117
|
117
|
}
|
118
|
118
|
|
119
|
|
-void menu_mmu2_ejectFilament() {
|
|
119
|
+void menu_mmu2_eject_filament() {
|
120
|
120
|
START_MENU();
|
121
|
121
|
MENU_BACK(MSG_MMU2_MENU);
|
122
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_ejectFilament0);
|
123
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_ejectFilament1);
|
124
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT2, action_mmu2_ejectFilament2);
|
125
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT3, action_mmu2_ejectFilament3);
|
126
|
|
- MENU_ITEM(function, MSG_MMU2_FILAMENT4, action_mmu2_ejectFilament4);
|
|
122
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_eject_filament_0);
|
|
123
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_eject_filament_1);
|
|
124
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT2, action_mmu2_eject_filament_2);
|
|
125
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT3, action_mmu2_eject_filament_3);
|
|
126
|
+ MENU_ITEM(function, MSG_MMU2_FILAMENT4, action_mmu2_eject_filament_4);
|
127
|
127
|
END_MENU();
|
128
|
128
|
}
|
129
|
129
|
|
|
@@ -139,10 +139,10 @@ void action_mmu2_reset() {
|
139
|
139
|
void menu_mmu2() {
|
140
|
140
|
START_MENU();
|
141
|
141
|
MENU_BACK(MSG_MAIN);
|
142
|
|
- MENU_ITEM(submenu, MSG_MMU2_LOAD_FILAMENT, menu_mmu2_loadFilament);
|
143
|
|
- MENU_ITEM(submenu, MSG_MMU2_LOAD_TO_NOZZLE, menu_mmu2_loadToNozzle);
|
144
|
|
- MENU_ITEM(submenu, MSG_MMU2_EJECT_FILAMENT, menu_mmu2_ejectFilament);
|
145
|
|
- MENU_ITEM(function, MSG_MMU2_UNLOAD_FILAMENT, action_mmu2_unloadFilament);
|
|
142
|
+ MENU_ITEM(submenu, MSG_MMU2_LOAD_FILAMENT, menu_mmu2_load_filament);
|
|
143
|
+ MENU_ITEM(submenu, MSG_MMU2_LOAD_TO_NOZZLE, menu_mmu2_load_to_nozzle);
|
|
144
|
+ MENU_ITEM(submenu, MSG_MMU2_EJECT_FILAMENT, menu_mmu2_eject_filament);
|
|
145
|
+ MENU_ITEM(function, MSG_MMU2_UNLOAD_FILAMENT, action_mmu2_unload_filament);
|
146
|
146
|
MENU_ITEM(function, MSG_MMU2_RESET, action_mmu2_reset);
|
147
|
147
|
END_MENU();
|
148
|
148
|
}
|
|
@@ -161,7 +161,7 @@ inline void action_mmu2_choose2() { action_mmu2_choose(2); }
|
161
|
161
|
inline void action_mmu2_choose3() { action_mmu2_choose(3); }
|
162
|
162
|
inline void action_mmu2_choose4() { action_mmu2_choose(4); }
|
163
|
163
|
|
164
|
|
-void menu_mmu2_chooseFilament() {
|
|
164
|
+void menu_mmu2_choose_filament() {
|
165
|
165
|
START_MENU();
|
166
|
166
|
#if LCD_HEIGHT > 2
|
167
|
167
|
STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, true, true);
|
|
@@ -178,21 +178,21 @@ void menu_mmu2_chooseFilament() {
|
178
|
178
|
// MMU2 Filament Runout
|
179
|
179
|
//
|
180
|
180
|
|
181
|
|
-inline void action_mmu2_M600_loadCurrentFilament() { mmu2.loadFilament(currentTool); }
|
182
|
|
-inline void action_mmu2_M600_loadCurrentFilamentToNozzle() { mmu2.loadFilamentToNozzle(currentTool); }
|
183
|
|
-inline void action_mmu2_M600_unloadFilament() { mmu2.unload(); }
|
|
181
|
+inline void action_mmu2_M600_load_current_filament() { mmu2.load_filament(currentTool); }
|
|
182
|
+inline void action_mmu2_M600_load_current_filament_to_nozzle() { mmu2.load_filament_to_nozzle(currentTool); }
|
|
183
|
+inline void action_mmu2_M600_unload_filament() { mmu2.unload(); }
|
184
|
184
|
inline void action_mmu2_M600_resume() { mmuMenuWait = false; }
|
185
|
185
|
|
186
|
186
|
void menu_mmu2_pause() {
|
187
|
|
- currentTool = mmu2.getCurrentTool();
|
|
187
|
+ currentTool = mmu2.get_current_tool();
|
188
|
188
|
START_MENU();
|
189
|
189
|
#if LCD_HEIGHT > 2
|
190
|
190
|
STATIC_ITEM(MSG_MMU2_FILAMENT_CHANGE_HEADER, true, true);
|
191
|
191
|
#endif
|
192
|
192
|
MENU_ITEM(function, MSG_MMU2_RESUME, action_mmu2_M600_resume);
|
193
|
|
- MENU_ITEM(function, MSG_MMU2_UNLOAD_FILAMENT, action_mmu2_M600_unloadFilament);
|
194
|
|
- MENU_ITEM(function, MSG_MMU2_LOAD_FILAMENT, action_mmu2_M600_loadCurrentFilament);
|
195
|
|
- MENU_ITEM(function, MSG_MMU2_LOAD_TO_NOZZLE, action_mmu2_M600_loadCurrentFilamentToNozzle);
|
|
193
|
+ MENU_ITEM(function, MSG_MMU2_UNLOAD_FILAMENT, action_mmu2_M600_unload_filament);
|
|
194
|
+ MENU_ITEM(function, MSG_MMU2_LOAD_FILAMENT, action_mmu2_M600_load_current_filament);
|
|
195
|
+ MENU_ITEM(function, MSG_MMU2_LOAD_TO_NOZZLE, action_mmu2_M600_load_current_filament_to_nozzle);
|
196
|
196
|
END_MENU();
|
197
|
197
|
}
|
198
|
198
|
|
|
@@ -203,9 +203,9 @@ void mmu2_M600() {
|
203
|
203
|
while (mmuMenuWait) idle();
|
204
|
204
|
}
|
205
|
205
|
|
206
|
|
-uint8_t mmu2_chooseFilament() {
|
|
206
|
+uint8_t mmu2_choose_filament() {
|
207
|
207
|
ui.defer_status_screen();
|
208
|
|
- ui.goto_screen(menu_mmu2_chooseFilament);
|
|
208
|
+ ui.goto_screen(menu_mmu2_choose_filament);
|
209
|
209
|
mmuMenuWait = true;
|
210
|
210
|
while (mmuMenuWait) idle();
|
211
|
211
|
ui.return_to_status();
|