|
@@ -34,19 +34,20 @@
|
34
|
34
|
#if HAS_FILAMENT_SENSOR
|
35
|
35
|
#include "../../feature/runout.h"
|
36
|
36
|
#endif
|
|
37
|
+
|
37
|
38
|
//
|
38
|
39
|
// Change Filament > Change/Unload/Load Filament
|
39
|
40
|
//
|
40
|
|
-static AdvancedPauseMode _change_filament_temp_mode; // =ADVANCED_PAUSE_MODE_PAUSE_PRINT
|
|
41
|
+static PauseMode _change_filament_temp_mode; // =PAUSE_MODE_PAUSE_PRINT
|
41
|
42
|
static int8_t _change_filament_temp_extruder; // =0
|
42
|
43
|
|
43
|
44
|
inline PGM_P _change_filament_temp_command() {
|
44
|
45
|
switch (_change_filament_temp_mode) {
|
45
|
|
- case ADVANCED_PAUSE_MODE_LOAD_FILAMENT:
|
|
46
|
+ case PAUSE_MODE_LOAD_FILAMENT:
|
46
|
47
|
return PSTR("M701 T%d");
|
47
|
|
- case ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT:
|
|
48
|
+ case PAUSE_MODE_UNLOAD_FILAMENT:
|
48
|
49
|
return _change_filament_temp_extruder >= 0 ? PSTR("M702 T%d") : PSTR("M702 ;%d");
|
49
|
|
- case ADVANCED_PAUSE_MODE_PAUSE_PRINT:
|
|
50
|
+ case PAUSE_MODE_PAUSE_PRINT:
|
50
|
51
|
default:
|
51
|
52
|
return PSTR("M600 B0 T%d");
|
52
|
53
|
}
|
|
@@ -63,18 +64,18 @@ inline void _lcd_change_filament_temp_1_func() { _change_filament_temp(ui.pre
|
63
|
64
|
inline void _lcd_change_filament_temp_2_func() { _change_filament_temp(ui.preheat_hotend_temp[1]); }
|
64
|
65
|
inline void _lcd_change_filament_temp_custom_cb() { _change_filament_temp(thermalManager.temp_hotend[_change_filament_temp_extruder].target); }
|
65
|
66
|
|
66
|
|
-static PGM_P change_filament_header(const AdvancedPauseMode mode) {
|
|
67
|
+static PGM_P change_filament_header(const PauseMode mode) {
|
67
|
68
|
switch (mode) {
|
68
|
|
- case ADVANCED_PAUSE_MODE_LOAD_FILAMENT:
|
|
69
|
+ case PAUSE_MODE_LOAD_FILAMENT:
|
69
|
70
|
return PSTR(MSG_FILAMENTLOAD);
|
70
|
|
- case ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT:
|
|
71
|
+ case PAUSE_MODE_UNLOAD_FILAMENT:
|
71
|
72
|
return PSTR(MSG_FILAMENTUNLOAD);
|
72
|
73
|
default: break;
|
73
|
74
|
}
|
74
|
75
|
return PSTR(MSG_FILAMENTCHANGE);
|
75
|
76
|
}
|
76
|
77
|
|
77
|
|
-void _menu_temp_filament_op(const AdvancedPauseMode mode, const int8_t extruder) {
|
|
78
|
+void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
78
|
79
|
_change_filament_temp_mode = mode;
|
79
|
80
|
_change_filament_temp_extruder = extruder;
|
80
|
81
|
START_MENU();
|
|
@@ -105,28 +106,28 @@ void _menu_temp_filament_op(const AdvancedPauseMode mode, const int8_t extruder)
|
105
|
106
|
END_MENU();
|
106
|
107
|
}
|
107
|
108
|
#if E_STEPPERS
|
108
|
|
- void menu_temp_e0_filament_change() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_PAUSE_PRINT, 0); }
|
109
|
|
- void menu_temp_e0_filament_load() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_LOAD_FILAMENT, 0); }
|
110
|
|
- void menu_temp_e0_filament_unload() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, 0); }
|
|
109
|
+ void menu_temp_e0_filament_change() { _menu_temp_filament_op(PAUSE_MODE_PAUSE_PRINT, 0); }
|
|
110
|
+ void menu_temp_e0_filament_load() { _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); }
|
|
111
|
+ void menu_temp_e0_filament_unload() { _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); }
|
111
|
112
|
#if E_STEPPERS > 1
|
112
|
|
- void menu_temp_e1_filament_change() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_PAUSE_PRINT, 1); }
|
113
|
|
- void menu_temp_e1_filament_load() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_LOAD_FILAMENT, 1); }
|
114
|
|
- void menu_temp_e1_filament_unload() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, 1); }
|
|
113
|
+ void menu_temp_e1_filament_change() { _menu_temp_filament_op(PAUSE_MODE_PAUSE_PRINT, 1); }
|
|
114
|
+ void menu_temp_e1_filament_load() { _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); }
|
|
115
|
+ void menu_temp_e1_filament_unload() { _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 1); }
|
115
|
116
|
#if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
|
116
|
|
- void menu_unload_filament_all_temp() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, -1); }
|
|
117
|
+ void menu_unload_filament_all_temp() { _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, -1); }
|
117
|
118
|
#endif
|
118
|
119
|
#if E_STEPPERS > 2
|
119
|
|
- void menu_temp_e2_filament_change() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_PAUSE_PRINT, 2); }
|
120
|
|
- void menu_temp_e2_filament_load() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_LOAD_FILAMENT, 2); }
|
121
|
|
- void menu_temp_e2_filament_unload() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, 2); }
|
|
120
|
+ void menu_temp_e2_filament_change() { _menu_temp_filament_op(PAUSE_MODE_PAUSE_PRINT, 2); }
|
|
121
|
+ void menu_temp_e2_filament_load() { _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); }
|
|
122
|
+ void menu_temp_e2_filament_unload() { _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 2); }
|
122
|
123
|
#if E_STEPPERS > 3
|
123
|
|
- void menu_temp_e3_filament_change() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_PAUSE_PRINT, 3); }
|
124
|
|
- void menu_temp_e3_filament_load() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_LOAD_FILAMENT, 3); }
|
125
|
|
- void menu_temp_e3_filament_unload() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, 3); }
|
|
124
|
+ void menu_temp_e3_filament_change() { _menu_temp_filament_op(PAUSE_MODE_PAUSE_PRINT, 3); }
|
|
125
|
+ void menu_temp_e3_filament_load() { _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); }
|
|
126
|
+ void menu_temp_e3_filament_unload() { _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 3); }
|
126
|
127
|
#if E_STEPPERS > 4
|
127
|
|
- void menu_temp_e4_filament_change() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_PAUSE_PRINT, 4); }
|
128
|
|
- void menu_temp_e4_filament_load() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_LOAD_FILAMENT, 4); }
|
129
|
|
- void menu_temp_e4_filament_unload() { _menu_temp_filament_op(ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, 4); }
|
|
128
|
+ void menu_temp_e4_filament_change() { _menu_temp_filament_op(PAUSE_MODE_PAUSE_PRINT, 4); }
|
|
129
|
+ void menu_temp_e4_filament_load() { _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); }
|
|
130
|
+ void menu_temp_e4_filament_unload() { _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 4); }
|
130
|
131
|
#endif // E_STEPPERS > 4
|
131
|
132
|
#endif // E_STEPPERS > 3
|
132
|
133
|
#endif // E_STEPPERS > 2
|
|
@@ -310,14 +311,13 @@ void _menu_temp_filament_op(const AdvancedPauseMode mode, const int8_t extruder)
|
310
|
311
|
}
|
311
|
312
|
#endif
|
312
|
313
|
|
313
|
|
-static AdvancedPauseMode advanced_pause_mode = ADVANCED_PAUSE_MODE_PAUSE_PRINT;
|
314
|
314
|
static uint8_t hotend_status_extruder = 0;
|
315
|
315
|
|
316
|
|
-static PGM_P advanced_pause_header() {
|
317
|
|
- switch (advanced_pause_mode) {
|
318
|
|
- case ADVANCED_PAUSE_MODE_LOAD_FILAMENT:
|
|
316
|
+static PGM_P pause_header() {
|
|
317
|
+ switch (pause_mode) {
|
|
318
|
+ case PAUSE_MODE_LOAD_FILAMENT:
|
319
|
319
|
return PSTR(MSG_FILAMENT_CHANGE_HEADER_LOAD);
|
320
|
|
- case ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT:
|
|
320
|
+ case PAUSE_MODE_UNLOAD_FILAMENT:
|
321
|
321
|
return PSTR(MSG_FILAMENT_CHANGE_HEADER_UNLOAD);
|
322
|
322
|
default: break;
|
323
|
323
|
}
|
|
@@ -340,26 +340,26 @@ static PGM_P advanced_pause_header() {
|
340
|
340
|
++_thisItemNr; \
|
341
|
341
|
}while(0)
|
342
|
342
|
|
343
|
|
-void lcd_advanced_pause_resume_print() {
|
344
|
|
- advanced_pause_menu_response = ADVANCED_PAUSE_RESPONSE_RESUME_PRINT;
|
|
343
|
+void lcd_pause_resume_print() {
|
|
344
|
+ pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
|
345
|
345
|
}
|
346
|
346
|
|
347
|
|
-void lcd_advanced_pause_extrude_more() {
|
348
|
|
- advanced_pause_menu_response = ADVANCED_PAUSE_RESPONSE_EXTRUDE_MORE;
|
|
347
|
+void lcd_pause_extrude_more() {
|
|
348
|
+ pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
|
349
|
349
|
}
|
350
|
350
|
|
351
|
|
-void menu_advanced_pause_option() {
|
|
351
|
+void menu_pause_option() {
|
352
|
352
|
START_MENU();
|
353
|
353
|
#if LCD_HEIGHT > 2
|
354
|
354
|
STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER, true, false);
|
355
|
355
|
#endif
|
356
|
|
- MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_PURGE, lcd_advanced_pause_extrude_more);
|
|
356
|
+ MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_PURGE, lcd_pause_extrude_more);
|
357
|
357
|
#if HAS_FILAMENT_SENSOR
|
358
|
358
|
if (runout.filament_ran_out)
|
359
|
359
|
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
|
360
|
360
|
else
|
361
|
361
|
#endif
|
362
|
|
- MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_RESUME, lcd_advanced_pause_resume_print);
|
|
362
|
+ MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_RESUME, lcd_pause_resume_print);
|
363
|
363
|
END_MENU();
|
364
|
364
|
}
|
365
|
365
|
|
|
@@ -367,9 +367,9 @@ void menu_advanced_pause_option() {
|
367
|
367
|
// ADVANCED_PAUSE_FEATURE message screens
|
368
|
368
|
//
|
369
|
369
|
|
370
|
|
-void _lcd_advanced_pause_message(PGM_P const msg1, PGM_P const msg2=NULL, PGM_P const msg3=NULL) {
|
|
370
|
+void _lcd_pause_message(PGM_P const msg1, PGM_P const msg2=NULL, PGM_P const msg3=NULL) {
|
371
|
371
|
START_SCREEN();
|
372
|
|
- STATIC_ITEM_P(advanced_pause_header(), true, true);
|
|
372
|
+ STATIC_ITEM_P(pause_header(), true, true);
|
373
|
373
|
STATIC_ITEM_P(msg1);
|
374
|
374
|
if (msg2) STATIC_ITEM_P(msg2);
|
375
|
375
|
if (msg3) STATIC_ITEM_P(msg3);
|
|
@@ -378,8 +378,19 @@ void _lcd_advanced_pause_message(PGM_P const msg1, PGM_P const msg2=NULL, PGM_P
|
378
|
378
|
END_SCREEN();
|
379
|
379
|
}
|
380
|
380
|
|
381
|
|
-void lcd_advanced_pause_init_message() {
|
382
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_INIT_1)
|
|
381
|
+void lcd_pause_pausing_message() {
|
|
382
|
+ _lcd_pause_message(PSTR(MSG_PAUSE_PRINT_INIT_1)
|
|
383
|
+ #ifdef MSG_PAUSE_PRINT_INIT_2
|
|
384
|
+ , PSTR(MSG_PAUSE_PRINT_INIT_2)
|
|
385
|
+ #ifdef MSG_PAUSE_PRINT_INIT_3
|
|
386
|
+ , PSTR(MSG_PAUSE_PRINT_INIT_3)
|
|
387
|
+ #endif
|
|
388
|
+ #endif
|
|
389
|
+ );
|
|
390
|
+}
|
|
391
|
+
|
|
392
|
+void lcd_pause_changing_message() {
|
|
393
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_INIT_1)
|
383
|
394
|
#ifdef MSG_FILAMENT_CHANGE_INIT_2
|
384
|
395
|
, PSTR(MSG_FILAMENT_CHANGE_INIT_2)
|
385
|
396
|
#ifdef MSG_FILAMENT_CHANGE_INIT_3
|
|
@@ -389,8 +400,8 @@ void lcd_advanced_pause_init_message() {
|
389
|
400
|
);
|
390
|
401
|
}
|
391
|
402
|
|
392
|
|
-void lcd_advanced_pause_unload_message() {
|
393
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_UNLOAD_1)
|
|
403
|
+void lcd_pause_unload_message() {
|
|
404
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_UNLOAD_1)
|
394
|
405
|
#ifdef MSG_FILAMENT_CHANGE_UNLOAD_2
|
395
|
406
|
, PSTR(MSG_FILAMENT_CHANGE_UNLOAD_2)
|
396
|
407
|
#ifdef MSG_FILAMENT_CHANGE_UNLOAD_3
|
|
@@ -400,8 +411,8 @@ void lcd_advanced_pause_unload_message() {
|
400
|
411
|
);
|
401
|
412
|
}
|
402
|
413
|
|
403
|
|
-void lcd_advanced_pause_heating_message() {
|
404
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_HEATING_1)
|
|
414
|
+void lcd_pause_heating_message() {
|
|
415
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_HEATING_1)
|
405
|
416
|
#ifdef MSG_FILAMENT_CHANGE_HEATING_2
|
406
|
417
|
, PSTR(MSG_FILAMENT_CHANGE_HEATING_2)
|
407
|
418
|
#ifdef MSG_FILAMENT_CHANGE_HEATING_3
|
|
@@ -411,8 +422,8 @@ void lcd_advanced_pause_heating_message() {
|
411
|
422
|
);
|
412
|
423
|
}
|
413
|
424
|
|
414
|
|
-void lcd_advanced_pause_heat_message() {
|
415
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_HEAT_1)
|
|
425
|
+void lcd_pause_heat_message() {
|
|
426
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_HEAT_1)
|
416
|
427
|
#ifdef MSG_FILAMENT_CHANGE_HEAT_2
|
417
|
428
|
, PSTR(MSG_FILAMENT_CHANGE_HEAT_2)
|
418
|
429
|
#ifdef MSG_FILAMENT_CHANGE_HEAT_3
|
|
@@ -422,8 +433,8 @@ void lcd_advanced_pause_heat_message() {
|
422
|
433
|
);
|
423
|
434
|
}
|
424
|
435
|
|
425
|
|
-void lcd_advanced_pause_insert_message() {
|
426
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_INSERT_1)
|
|
436
|
+void lcd_pause_insert_message() {
|
|
437
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_INSERT_1)
|
427
|
438
|
#ifdef MSG_FILAMENT_CHANGE_INSERT_2
|
428
|
439
|
, PSTR(MSG_FILAMENT_CHANGE_INSERT_2)
|
429
|
440
|
#ifdef MSG_FILAMENT_CHANGE_INSERT_3
|
|
@@ -433,8 +444,8 @@ void lcd_advanced_pause_insert_message() {
|
433
|
444
|
);
|
434
|
445
|
}
|
435
|
446
|
|
436
|
|
-void lcd_advanced_pause_load_message() {
|
437
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_LOAD_1)
|
|
447
|
+void lcd_pause_load_message() {
|
|
448
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_LOAD_1)
|
438
|
449
|
#ifdef MSG_FILAMENT_CHANGE_LOAD_2
|
439
|
450
|
, PSTR(MSG_FILAMENT_CHANGE_LOAD_2)
|
440
|
451
|
#ifdef MSG_FILAMENT_CHANGE_LOAD_3
|
|
@@ -444,8 +455,8 @@ void lcd_advanced_pause_load_message() {
|
444
|
455
|
);
|
445
|
456
|
}
|
446
|
457
|
|
447
|
|
-void lcd_advanced_pause_waiting_message() {
|
448
|
|
- _lcd_advanced_pause_message(PSTR(MSG_ADVANCED_PAUSE_WAITING_1)
|
|
458
|
+void lcd_pause_waiting_message() {
|
|
459
|
+ _lcd_pause_message(PSTR(MSG_ADVANCED_PAUSE_WAITING_1)
|
449
|
460
|
#ifdef MSG_ADVANCED_PAUSE_WAITING_2
|
450
|
461
|
, PSTR(MSG_ADVANCED_PAUSE_WAITING_2)
|
451
|
462
|
#ifdef MSG_ADVANCED_PAUSE_WAITING_3
|
|
@@ -455,8 +466,8 @@ void lcd_advanced_pause_waiting_message() {
|
455
|
466
|
);
|
456
|
467
|
}
|
457
|
468
|
|
458
|
|
-void lcd_advanced_pause_resume_message() {
|
459
|
|
- _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_RESUME_1)
|
|
469
|
+void lcd_pause_resume_message() {
|
|
470
|
+ _lcd_pause_message(PSTR(MSG_FILAMENT_CHANGE_RESUME_1)
|
460
|
471
|
#ifdef MSG_FILAMENT_CHANGE_RESUME_2
|
461
|
472
|
, PSTR(MSG_FILAMENT_CHANGE_RESUME_2)
|
462
|
473
|
#ifdef MSG_FILAMENT_CHANGE_RESUME_3
|
|
@@ -466,8 +477,8 @@ void lcd_advanced_pause_resume_message() {
|
466
|
477
|
);
|
467
|
478
|
}
|
468
|
479
|
|
469
|
|
-void lcd_advanced_pause_purge_message() {
|
470
|
|
- _lcd_advanced_pause_message(
|
|
480
|
+void lcd_pause_purge_message() {
|
|
481
|
+ _lcd_pause_message(
|
471
|
482
|
#if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
|
472
|
483
|
PSTR(MSG_FILAMENT_CHANGE_CONT_PURGE_1)
|
473
|
484
|
#ifdef MSG_FILAMENT_CHANGE_CONT_PURGE_2
|
|
@@ -488,31 +499,32 @@ void lcd_advanced_pause_purge_message() {
|
488
|
499
|
);
|
489
|
500
|
}
|
490
|
501
|
|
491
|
|
-FORCE_INLINE screenFunc_t ap_message_screen(const AdvancedPauseMessage message) {
|
|
502
|
+FORCE_INLINE screenFunc_t ap_message_screen(const PauseMessage message) {
|
492
|
503
|
switch (message) {
|
493
|
|
- case ADVANCED_PAUSE_MESSAGE_INIT: return lcd_advanced_pause_init_message;
|
494
|
|
- case ADVANCED_PAUSE_MESSAGE_UNLOAD: return lcd_advanced_pause_unload_message;
|
495
|
|
- case ADVANCED_PAUSE_MESSAGE_WAITING: return lcd_advanced_pause_waiting_message;
|
496
|
|
- case ADVANCED_PAUSE_MESSAGE_INSERT: return lcd_advanced_pause_insert_message;
|
497
|
|
- case ADVANCED_PAUSE_MESSAGE_LOAD: return lcd_advanced_pause_load_message;
|
498
|
|
- case ADVANCED_PAUSE_MESSAGE_PURGE: return lcd_advanced_pause_purge_message;
|
499
|
|
- case ADVANCED_PAUSE_MESSAGE_RESUME: return lcd_advanced_pause_resume_message;
|
500
|
|
- case ADVANCED_PAUSE_MESSAGE_HEAT: return lcd_advanced_pause_heat_message;
|
501
|
|
- case ADVANCED_PAUSE_MESSAGE_HEATING: return lcd_advanced_pause_heating_message;
|
502
|
|
- case ADVANCED_PAUSE_MESSAGE_OPTION: advanced_pause_menu_response = ADVANCED_PAUSE_RESPONSE_WAIT_FOR;
|
503
|
|
- return menu_advanced_pause_option;
|
504
|
|
- case ADVANCED_PAUSE_MESSAGE_STATUS:
|
|
504
|
+ case PAUSE_MESSAGE_PAUSING: return lcd_pause_pausing_message;
|
|
505
|
+ case PAUSE_MESSAGE_CHANGING: return lcd_pause_changing_message;
|
|
506
|
+ case PAUSE_MESSAGE_UNLOAD: return lcd_pause_unload_message;
|
|
507
|
+ case PAUSE_MESSAGE_WAITING: return lcd_pause_waiting_message;
|
|
508
|
+ case PAUSE_MESSAGE_INSERT: return lcd_pause_insert_message;
|
|
509
|
+ case PAUSE_MESSAGE_LOAD: return lcd_pause_load_message;
|
|
510
|
+ case PAUSE_MESSAGE_PURGE: return lcd_pause_purge_message;
|
|
511
|
+ case PAUSE_MESSAGE_RESUME: return lcd_pause_resume_message;
|
|
512
|
+ case PAUSE_MESSAGE_HEAT: return lcd_pause_heat_message;
|
|
513
|
+ case PAUSE_MESSAGE_HEATING: return lcd_pause_heating_message;
|
|
514
|
+ case PAUSE_MESSAGE_OPTION: pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
|
|
515
|
+ return menu_pause_option;
|
|
516
|
+ case PAUSE_MESSAGE_STATUS:
|
505
|
517
|
default: break;
|
506
|
518
|
}
|
507
|
519
|
return NULL;
|
508
|
520
|
}
|
509
|
521
|
|
510
|
|
-void lcd_advanced_pause_show_message(
|
511
|
|
- const AdvancedPauseMessage message,
|
512
|
|
- const AdvancedPauseMode mode/*=ADVANCED_PAUSE_MODE_SAME*/,
|
|
522
|
+void lcd_pause_show_message(
|
|
523
|
+ const PauseMessage message,
|
|
524
|
+ const PauseMode mode/*=PAUSE_MODE_SAME*/,
|
513
|
525
|
const uint8_t extruder/*=active_extruder*/
|
514
|
526
|
) {
|
515
|
|
- if (mode != ADVANCED_PAUSE_MODE_SAME) advanced_pause_mode = mode;
|
|
527
|
+ if (mode != PAUSE_MODE_SAME) pause_mode = mode;
|
516
|
528
|
hotend_status_extruder = extruder;
|
517
|
529
|
const screenFunc_t next_screen = ap_message_screen(message);
|
518
|
530
|
if (next_screen) {
|