Explorar el Código

🚸 Filament Change add confirm step (#22277)

Cytown hace 3 años
padre
commit
71bf61901c
No account linked to committer's email address
Se han modificado 2 ficheros con 18 adiciones y 9 borrados
  1. 13
    4
      Marlin/src/lcd/menu/menu_filament.cpp
  2. 5
    5
      Marlin/src/lcd/menu/menu_main.cpp

+ 13
- 4
Marlin/src/lcd/menu/menu_filament.cpp Ver fichero

106
  * "Change Filament" submenu
106
  * "Change Filament" submenu
107
  */
107
  */
108
 #if E_STEPPERS > 1 || ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
108
 #if E_STEPPERS > 1 || ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
109
-
110
   bool printingIsPaused();
109
   bool printingIsPaused();
110
+#endif
111
 
111
 
112
-  void menu_change_filament() {
112
+void menu_change_filament() {
113
+  #if E_STEPPERS > 1 || ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
113
     // Say "filament change" when no print is active
114
     // Say "filament change" when no print is active
114
     editable.int8 = printingIsPaused() ? PAUSE_MODE_PAUSE_PRINT : PAUSE_MODE_CHANGE_FILAMENT;
115
     editable.int8 = printingIsPaused() ? PAUSE_MODE_PAUSE_PRINT : PAUSE_MODE_CHANGE_FILAMENT;
115
 
116
 
204
     #endif
205
     #endif
205
 
206
 
206
     END_MENU();
207
     END_MENU();
207
-  }
208
-#endif
208
+
209
+  #else
210
+
211
+    if (thermalManager.targetHotEnoughToExtrude(active_extruder))
212
+      queue.inject_P(PSTR("M600B0"));
213
+    else
214
+      _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0);
215
+
216
+  #endif
217
+}
209
 
218
 
210
 static uint8_t hotend_status_extruder = 0;
219
 static uint8_t hotend_status_extruder = 0;
211
 
220
 

+ 5
- 5
Marlin/src/lcd/menu/menu_main.cpp Ver fichero

77
 #endif
77
 #endif
78
 
78
 
79
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
79
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
80
-  void _menu_temp_filament_op(const PauseMode, const int8_t);
81
   void menu_change_filament();
80
   void menu_change_filament();
82
 #endif
81
 #endif
83
 
82
 
365
 
364
 
366
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
365
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
367
     #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
366
     #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
368
-      if (thermalManager.targetHotEnoughToExtrude(active_extruder))
369
-        GCODES_ITEM(MSG_FILAMENTCHANGE, PSTR("M600 B0"));
370
-      else
371
-        SUBMENU(MSG_FILAMENTCHANGE, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
367
+      CONFIRM_ITEM(MSG_FILAMENTCHANGE,
368
+        MSG_YES, MSG_NO,
369
+        menu_change_filament, ui.goto_previous_screen,
370
+        GET_TEXT(MSG_FILAMENTCHANGE), (const char *)nullptr, PSTR("?")
371
+      );
372
     #else
372
     #else
373
       SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
373
       SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
374
     #endif
374
     #endif

Loading…
Cancelar
Guardar