|
@@ -84,9 +84,9 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
84
|
84
|
START_MENU();
|
85
|
85
|
if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_CENTER|SS_INVERT);
|
86
|
86
|
BACK_ITEM(MSG_BACK);
|
87
|
|
- ACTION_ITEM(MSG_PREHEAT_1, [](){ _change_filament_temp(ui.preheat_hotend_temp[0]); });
|
88
|
|
- ACTION_ITEM(MSG_PREHEAT_2, [](){ _change_filament_temp(ui.preheat_hotend_temp[1]); });
|
89
|
|
- EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_temp_extruder].target, EXTRUDE_MINTEMP, heater_maxtemp[extruder] - 15, [](){
|
|
87
|
+ ACTION_ITEM(MSG_PREHEAT_1, []{ _change_filament_temp(ui.preheat_hotend_temp[0]); });
|
|
88
|
+ ACTION_ITEM(MSG_PREHEAT_2, []{ _change_filament_temp(ui.preheat_hotend_temp[1]); });
|
|
89
|
+ EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_temp_extruder].target, EXTRUDE_MINTEMP, heater_maxtemp[extruder] - 15, []{
|
90
|
90
|
_change_filament_temp(thermalManager.temp_hotend[_change_filament_temp_extruder].target);
|
91
|
91
|
});
|
92
|
92
|
END_MENU();
|
|
@@ -109,42 +109,42 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
109
|
109
|
#if E_STEPPERS == 1
|
110
|
110
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTCHANGE);
|
111
|
111
|
if (thermalManager.targetTooColdToExtrude(active_extruder))
|
112
|
|
- MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
|
112
|
+ MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
113
|
113
|
else
|
114
|
114
|
MENU_ITEM_P(gcode, msg0, PSTR("M600 B0"));
|
115
|
115
|
#else
|
116
|
116
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTCHANGE_E0);
|
117
|
117
|
PGM_P const msg1 = GET_TEXT(MSG_FILAMENTCHANGE_E1);
|
118
|
118
|
if (thermalManager.targetTooColdToExtrude(0))
|
119
|
|
- MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
|
119
|
+ MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
120
|
120
|
else
|
121
|
121
|
MENU_ITEM_P(gcode, msg0, PSTR("M600 B0 T0"));
|
122
|
122
|
if (thermalManager.targetTooColdToExtrude(1))
|
123
|
|
- MENU_ITEM_P(submenu, msg1, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 1); });
|
|
123
|
+ MENU_ITEM_P(submenu, msg1, []{ _menu_temp_filament_op(PauseMode(editable.int8), 1); });
|
124
|
124
|
else
|
125
|
125
|
MENU_ITEM_P(gcode, msg1, PSTR("M600 B0 T1"));
|
126
|
126
|
#if E_STEPPERS > 2
|
127
|
127
|
PGM_P const msg2 = GET_TEXT(MSG_FILAMENTCHANGE_E2);
|
128
|
128
|
if (thermalManager.targetTooColdToExtrude(2))
|
129
|
|
- MENU_ITEM_P(submenu, msg2, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 2); });
|
|
129
|
+ MENU_ITEM_P(submenu, msg2, []{ _menu_temp_filament_op(PauseMode(editable.int8), 2); });
|
130
|
130
|
else
|
131
|
131
|
MENU_ITEM_P(gcode, msg2, PSTR("M600 B0 T2"));
|
132
|
132
|
#if E_STEPPERS > 3
|
133
|
133
|
PGM_P const msg3 = GET_TEXT(MSG_FILAMENTCHANGE_E3);
|
134
|
134
|
if (thermalManager.targetTooColdToExtrude(3))
|
135
|
|
- MENU_ITEM_P(submenu, msg3, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 3); });
|
|
135
|
+ MENU_ITEM_P(submenu, msg3, []{ _menu_temp_filament_op(PauseMode(editable.int8), 3); });
|
136
|
136
|
else
|
137
|
137
|
MENU_ITEM_P(gcode, msg3, PSTR("M600 B0 T3"));
|
138
|
138
|
#if E_STEPPERS > 4
|
139
|
139
|
PGM_P const msg4 = GET_TEXT(MSG_FILAMENTCHANGE_E4);
|
140
|
140
|
if (thermalManager.targetTooColdToExtrude(4))
|
141
|
|
- MENU_ITEM_P(submenu, msg4, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 4); });
|
|
141
|
+ MENU_ITEM_P(submenu, msg4, []{ _menu_temp_filament_op(PauseMode(editable.int8), 4); });
|
142
|
142
|
else
|
143
|
143
|
MENU_ITEM_P(gcode, msg4, PSTR("M600 B0 T4"));
|
144
|
144
|
#if E_STEPPERS > 5
|
145
|
145
|
PGM_P const msg5 = GET_TEXT(MSG_FILAMENTCHANGE_E5);
|
146
|
146
|
if (thermalManager.targetTooColdToExtrude(5))
|
147
|
|
- MENU_ITEM_P(submenu, msg5, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 5); });
|
|
147
|
+ MENU_ITEM_P(submenu, msg5, []{ _menu_temp_filament_op(PauseMode(editable.int8), 5); });
|
148
|
148
|
else
|
149
|
149
|
MENU_ITEM_P(gcode, msg5, PSTR("M600 B0 T5"));
|
150
|
150
|
#endif // E_STEPPERS > 5
|
|
@@ -159,42 +159,42 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
159
|
159
|
#if E_STEPPERS == 1
|
160
|
160
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTLOAD);
|
161
|
161
|
if (thermalManager.targetTooColdToExtrude(active_extruder))
|
162
|
|
- MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
|
162
|
+ MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
163
|
163
|
else
|
164
|
164
|
MENU_ITEM_P(gcode, msg0, PSTR("M701"));
|
165
|
165
|
#else
|
166
|
166
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTLOAD_E0);
|
167
|
167
|
PGM_P const msg1 = GET_TEXT(MSG_FILAMENTLOAD_E1);
|
168
|
168
|
if (thermalManager.targetTooColdToExtrude(0))
|
169
|
|
- MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
|
169
|
+ MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
170
|
170
|
else
|
171
|
171
|
MENU_ITEM_P(gcode, msg0, PSTR("M701 T0"));
|
172
|
172
|
if (thermalManager.targetTooColdToExtrude(1))
|
173
|
|
- MENU_ITEM_P(submenu, msg1, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); });
|
|
173
|
+ MENU_ITEM_P(submenu, msg1, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); });
|
174
|
174
|
else
|
175
|
175
|
MENU_ITEM_P(gcode, msg1, PSTR("M701 T1"));
|
176
|
176
|
#if E_STEPPERS > 2
|
177
|
177
|
PGM_P const msg2 = GET_TEXT(MSG_FILAMENTLOAD_E2);
|
178
|
178
|
if (thermalManager.targetTooColdToExtrude(2))
|
179
|
|
- MENU_ITEM_P(submenu, msg2, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); });
|
|
179
|
+ MENU_ITEM_P(submenu, msg2, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); });
|
180
|
180
|
else
|
181
|
181
|
MENU_ITEM_P(gcode, msg2, PSTR("M701 T2"));
|
182
|
182
|
#if E_STEPPERS > 3
|
183
|
183
|
PGM_P const msg3 = GET_TEXT(MSG_FILAMENTLOAD_E3);
|
184
|
184
|
if (thermalManager.targetTooColdToExtrude(3))
|
185
|
|
- MENU_ITEM_P(submenu, msg3, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); });
|
|
185
|
+ MENU_ITEM_P(submenu, msg3, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); });
|
186
|
186
|
else
|
187
|
187
|
MENU_ITEM_P(gcode, msg3, PSTR("M701 T3"));
|
188
|
188
|
#if E_STEPPERS > 4
|
189
|
189
|
PGM_P const msg4 = GET_TEXT(MSG_FILAMENTLOAD_E4);
|
190
|
190
|
if (thermalManager.targetTooColdToExtrude(4))
|
191
|
|
- MENU_ITEM_P(submenu, msg4, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); });
|
|
191
|
+ MENU_ITEM_P(submenu, msg4, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); });
|
192
|
192
|
else
|
193
|
193
|
MENU_ITEM_P(gcode, msg4, PSTR("M701 T4"));
|
194
|
194
|
#if E_STEPPERS > 5
|
195
|
195
|
PGM_P const msg5 = GET_TEXT(MSG_FILAMENTLOAD_E5);
|
196
|
196
|
if (thermalManager.targetTooColdToExtrude(5))
|
197
|
|
- MENU_ITEM_P(submenu, msg5, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 5); });
|
|
197
|
+ MENU_ITEM_P(submenu, msg5, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 5); });
|
198
|
198
|
else
|
199
|
199
|
MENU_ITEM_P(gcode, msg5, PSTR("M701 T5"));
|
200
|
200
|
#endif // E_STEPPERS > 5
|
|
@@ -208,7 +208,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
208
|
208
|
if (thermalManager.targetHotEnoughToExtrude(active_extruder))
|
209
|
209
|
GCODES_ITEM(MSG_FILAMENTUNLOAD, PSTR("M702"));
|
210
|
210
|
else
|
211
|
|
- SUBMENU(MSG_FILAMENTUNLOAD, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
|
|
211
|
+ SUBMENU(MSG_FILAMENTUNLOAD, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
|
212
|
212
|
#else
|
213
|
213
|
#if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
|
214
|
214
|
if (JOIN_N(E_STEPPERS, &&,
|
|
@@ -220,36 +220,36 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
220
|
220
|
thermalManager.targetHotEnoughToExtrude(5))
|
221
|
221
|
) GCODES_ITEM(MSG_FILAMENTUNLOAD_ALL, PSTR("M702"));
|
222
|
222
|
else
|
223
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_ALL, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, -1); });
|
|
223
|
+ SUBMENU(MSG_FILAMENTUNLOAD_ALL, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, -1); });
|
224
|
224
|
#endif
|
225
|
225
|
if (thermalManager.targetHotEnoughToExtrude(0))
|
226
|
226
|
GCODES_ITEM(MSG_FILAMENTUNLOAD_E0, PSTR("M702 T0"));
|
227
|
227
|
else
|
228
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_E0, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
|
|
228
|
+ SUBMENU(MSG_FILAMENTUNLOAD_E0, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
|
229
|
229
|
if (thermalManager.targetHotEnoughToExtrude(1))
|
230
|
230
|
GCODES_ITEM(MSG_FILAMENTUNLOAD_E1, PSTR("M702 T1"));
|
231
|
231
|
else
|
232
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_E1, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 1); });
|
|
232
|
+ SUBMENU(MSG_FILAMENTUNLOAD_E1, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 1); });
|
233
|
233
|
#if E_STEPPERS > 2
|
234
|
234
|
if (thermalManager.targetHotEnoughToExtrude(2))
|
235
|
235
|
GCODES_ITEM(MSG_FILAMENTUNLOAD_E2, PSTR("M702 T2"));
|
236
|
236
|
else
|
237
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_E2, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 2); });
|
|
237
|
+ SUBMENU(MSG_FILAMENTUNLOAD_E2, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 2); });
|
238
|
238
|
#if E_STEPPERS > 3
|
239
|
239
|
if (thermalManager.targetHotEnoughToExtrude(3))
|
240
|
240
|
GCODES_ITEM(MSG_FILAMENTUNLOAD_E3, PSTR("M702 T3"));
|
241
|
241
|
else
|
242
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_E3, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 3); });
|
|
242
|
+ SUBMENU(MSG_FILAMENTUNLOAD_E3, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 3); });
|
243
|
243
|
#if E_STEPPERS > 4
|
244
|
244
|
if (thermalManager.targetHotEnoughToExtrude(4))
|
245
|
245
|
GCODES_ITEM(MSG_FILAMENTUNLOAD_E4, PSTR("M702 T4"));
|
246
|
246
|
else
|
247
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_E4, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 4); });
|
|
247
|
+ SUBMENU(MSG_FILAMENTUNLOAD_E4, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 4); });
|
248
|
248
|
#if E_STEPPERS > 5
|
249
|
249
|
if (thermalManager.targetHotEnoughToExtrude(5))
|
250
|
250
|
GCODES_ITEM(MSG_FILAMENTUNLOAD_E5, PSTR("M702 T5"));
|
251
|
251
|
else
|
252
|
|
- SUBMENU(MSG_FILAMENTUNLOAD_E5, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 5); });
|
|
252
|
+ SUBMENU(MSG_FILAMENTUNLOAD_E5, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 5); });
|
253
|
253
|
#endif // E_STEPPERS > 5
|
254
|
254
|
#endif // E_STEPPERS > 4
|
255
|
255
|
#endif // E_STEPPERS > 3
|
|
@@ -298,13 +298,13 @@ void menu_pause_option() {
|
298
|
298
|
#if LCD_HEIGHT > 2
|
299
|
299
|
STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER);
|
300
|
300
|
#endif
|
301
|
|
- ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_PURGE, [](){ pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE; });
|
|
301
|
+ ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_PURGE, []{ pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE; });
|
302
|
302
|
#if HAS_FILAMENT_SENSOR
|
303
|
303
|
if (runout.filament_ran_out)
|
304
|
304
|
EDIT_ITEM(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
|
305
|
305
|
else
|
306
|
306
|
#endif
|
307
|
|
- ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_RESUME, [](){ pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT; });
|
|
307
|
+ ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_RESUME, []{ pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT; });
|
308
|
308
|
END_MENU();
|
309
|
309
|
}
|
310
|
310
|
|