Browse Source

Show "FILAMENT CHANGE" during filament change

Scott Lahteine 5 years ago
parent
commit
6b945eb548

+ 2
- 2
Marlin/src/feature/pause.cpp View File

240
 
240
 
241
     wait_for_user = true;
241
     wait_for_user = true;
242
     #if ENABLED(HOST_PROMPT_SUPPORT)
242
     #if ENABLED(HOST_PROMPT_SUPPORT)
243
-      host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Continuous Purge Running..."), PSTR("Continue"));
243
+      host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purge Running..."), PSTR("Continue"));
244
     #endif
244
     #endif
245
     #if ENABLED(EXTENSIBLE_UI)
245
     #if ENABLED(EXTENSIBLE_UI)
246
-      ExtUI::onUserConfirmRequired(PSTR("Continuous Purge Running..."));
246
+      ExtUI::onUserConfirmRequired(PSTR("Filament Purge Running..."));
247
     #endif
247
     #endif
248
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
248
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
249
       do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
249
       do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);

+ 1
- 0
Marlin/src/feature/pause.h View File

39
 enum PauseMode : char {
39
 enum PauseMode : char {
40
   PAUSE_MODE_SAME,
40
   PAUSE_MODE_SAME,
41
   PAUSE_MODE_PAUSE_PRINT,
41
   PAUSE_MODE_PAUSE_PRINT,
42
+  PAUSE_MODE_CHANGE_FILAMENT,
42
   PAUSE_MODE_LOAD_FILAMENT,
43
   PAUSE_MODE_LOAD_FILAMENT,
43
   PAUSE_MODE_UNLOAD_FILAMENT
44
   PAUSE_MODE_UNLOAD_FILAMENT
44
 };
45
 };

+ 11
- 8
Marlin/src/lcd/language/language_en.h View File

1266
 #ifndef MSG_DAC_EEPROM_WRITE
1266
 #ifndef MSG_DAC_EEPROM_WRITE
1267
   #define MSG_DAC_EEPROM_WRITE                _UxGT("DAC EEPROM Write")
1267
   #define MSG_DAC_EEPROM_WRITE                _UxGT("DAC EEPROM Write")
1268
 #endif
1268
 #endif
1269
+#ifndef MSG_FILAMENT_CHANGE_HEADER
1270
+  #define MSG_FILAMENT_CHANGE_HEADER          _UxGT("FILAMENT CHANGE")
1271
+#endif
1269
 #ifndef MSG_FILAMENT_CHANGE_HEADER_PAUSE
1272
 #ifndef MSG_FILAMENT_CHANGE_HEADER_PAUSE
1270
   #define MSG_FILAMENT_CHANGE_HEADER_PAUSE    _UxGT("PRINT PAUSED")
1273
   #define MSG_FILAMENT_CHANGE_HEADER_PAUSE    _UxGT("PRINT PAUSED")
1271
 #endif
1274
 #endif
1493
     #define MSG_FILAMENT_CHANGE_HEATING_2     _UxGT("Please wait...")
1496
     #define MSG_FILAMENT_CHANGE_HEATING_2     _UxGT("Please wait...")
1494
   #endif
1497
   #endif
1495
   #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
1498
   #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
1496
-    #define MSG_FILAMENT_CHANGE_UNLOAD_1      _UxGT("Wait for")
1497
-    #define MSG_FILAMENT_CHANGE_UNLOAD_2      _UxGT("filament unload")
1499
+    #define MSG_FILAMENT_CHANGE_UNLOAD_1      _UxGT("Wait for filament")
1500
+    #define MSG_FILAMENT_CHANGE_UNLOAD_2      _UxGT("to fully unload")
1498
   #endif
1501
   #endif
1499
   #ifndef MSG_FILAMENT_CHANGE_LOAD_1
1502
   #ifndef MSG_FILAMENT_CHANGE_LOAD_1
1500
-    #define MSG_FILAMENT_CHANGE_LOAD_1        _UxGT("Wait for")
1501
-    #define MSG_FILAMENT_CHANGE_LOAD_2        _UxGT("filament load")
1503
+    #define MSG_FILAMENT_CHANGE_LOAD_1        _UxGT("Wait for filament")
1504
+    #define MSG_FILAMENT_CHANGE_LOAD_2        _UxGT("to load to nozzle")
1502
   #endif
1505
   #endif
1503
   #ifndef MSG_FILAMENT_CHANGE_PURGE_1
1506
   #ifndef MSG_FILAMENT_CHANGE_PURGE_1
1504
-    #define MSG_FILAMENT_CHANGE_PURGE_1       _UxGT("Wait for")
1505
-    #define MSG_FILAMENT_CHANGE_PURGE_2       _UxGT("filament purge")
1507
+    #define MSG_FILAMENT_CHANGE_PURGE_1       _UxGT("Wait for filament")
1508
+    #define MSG_FILAMENT_CHANGE_PURGE_2       _UxGT("purge to finish")
1506
   #endif
1509
   #endif
1507
   #ifndef MSG_FILAMENT_CHANGE_CONT_PURGE_1
1510
   #ifndef MSG_FILAMENT_CHANGE_CONT_PURGE_1
1508
-    #define MSG_FILAMENT_CHANGE_CONT_PURGE_1  _UxGT("Click to finish")
1509
-    #define MSG_FILAMENT_CHANGE_CONT_PURGE_2  _UxGT("filament purge")
1511
+    #define MSG_FILAMENT_CHANGE_CONT_PURGE_1  _UxGT("Click to stop")
1512
+    #define MSG_FILAMENT_CHANGE_CONT_PURGE_2  _UxGT("purging filament")
1510
   #endif
1513
   #endif
1511
   #ifndef MSG_FILAMENT_CHANGE_RESUME_1
1514
   #ifndef MSG_FILAMENT_CHANGE_RESUME_1
1512
     #define MSG_FILAMENT_CHANGE_RESUME_1      _UxGT("Wait for print")
1515
     #define MSG_FILAMENT_CHANGE_RESUME_1      _UxGT("Wait for print")

+ 7
- 1
Marlin/src/lcd/menu/menu_filament.cpp View File

47
       return PSTR("M701 T%d");
47
       return PSTR("M701 T%d");
48
     case PAUSE_MODE_UNLOAD_FILAMENT:
48
     case PAUSE_MODE_UNLOAD_FILAMENT:
49
       return _change_filament_temp_extruder >= 0 ? PSTR("M702 T%d") : PSTR("M702 ;%d");
49
       return _change_filament_temp_extruder >= 0 ? PSTR("M702 T%d") : PSTR("M702 ;%d");
50
+    case PAUSE_MODE_CHANGE_FILAMENT:
50
     case PAUSE_MODE_PAUSE_PRINT:
51
     case PAUSE_MODE_PAUSE_PRINT:
51
     default:
52
     default:
52
       return PSTR("M600 B0 T%d");
53
       return PSTR("M600 B0 T%d");
75
   return PSTR(MSG_FILAMENTCHANGE);
76
   return PSTR(MSG_FILAMENTCHANGE);
76
 }
77
 }
77
 
78
 
78
-void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
79
+void _menu_temp_filament_op(const PauseMode inMode, const int8_t extruder) {
80
+  // If no print is active, just label as "filament change"
81
+  const PauseMode mode = (inMode != PAUSE_MODE_PAUSE_PRINT || printingIsPaused()) ? inMode : PAUSE_MODE_CHANGE_FILAMENT;
79
   _change_filament_temp_mode = mode;
82
   _change_filament_temp_mode = mode;
80
   _change_filament_temp_extruder = extruder;
83
   _change_filament_temp_extruder = extruder;
81
   START_MENU();
84
   START_MENU();
315
 
318
 
316
 static PGM_P pause_header() {
319
 static PGM_P pause_header() {
317
   switch (pause_mode) {
320
   switch (pause_mode) {
321
+    case PAUSE_MODE_CHANGE_FILAMENT:
322
+      return PSTR(MSG_FILAMENT_CHANGE_HEADER);
318
     case PAUSE_MODE_LOAD_FILAMENT:
323
     case PAUSE_MODE_LOAD_FILAMENT:
319
       return PSTR(MSG_FILAMENT_CHANGE_HEADER_LOAD);
324
       return PSTR(MSG_FILAMENT_CHANGE_HEADER_LOAD);
320
     case PAUSE_MODE_UNLOAD_FILAMENT:
325
     case PAUSE_MODE_UNLOAD_FILAMENT:
321
       return PSTR(MSG_FILAMENT_CHANGE_HEADER_UNLOAD);
326
       return PSTR(MSG_FILAMENT_CHANGE_HEADER_UNLOAD);
327
+    case PAUSE_MODE_PAUSE_PRINT:
322
     default: break;
328
     default: break;
323
   }
329
   }
324
   return PSTR(MSG_FILAMENT_CHANGE_HEADER_PAUSE);
330
   return PSTR(MSG_FILAMENT_CHANGE_HEADER_PAUSE);

Loading…
Cancel
Save