|
@@ -4885,7 +4885,7 @@ void lcd_wizard(WizState state)
|
|
lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA."));
|
|
lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA."));
|
|
wait_preheat();
|
|
wait_preheat();
|
|
//unload current filament
|
|
//unload current filament
|
|
- unload_filament();
|
|
|
|
|
|
+ unload_filament(true);
|
|
//load filament
|
|
//load filament
|
|
lcd_wizard_load();
|
|
lcd_wizard_load();
|
|
setTargetHotend(0, 0); //we are finished, cooldown nozzle
|
|
setTargetHotend(0, 0); //we are finished, cooldown nozzle
|
|
@@ -6200,13 +6200,14 @@ static void change_extr_menu(){
|
|
}
|
|
}
|
|
#endif //SNMM
|
|
#endif //SNMM
|
|
|
|
|
|
-//unload filament for single material printer (used in M702 gcode)
|
|
|
|
-void unload_filament()
|
|
|
|
|
|
+// unload filament for single material printer (used in M702 gcode)
|
|
|
|
+// @param automatic: If true, unload_filament is part of a unload+load sequence (M600)
|
|
|
|
+void unload_filament(bool automatic)
|
|
{
|
|
{
|
|
custom_message_type = CustomMsg::FilamentLoading;
|
|
custom_message_type = CustomMsg::FilamentLoading;
|
|
lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT));
|
|
lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT));
|
|
|
|
|
|
- raise_z_above(MIN_Z_FOR_UNLOAD);
|
|
|
|
|
|
+ raise_z_above(automatic? MIN_Z_FOR_SWAP: MIN_Z_FOR_UNLOAD);
|
|
|
|
|
|
// extr_unload2();
|
|
// extr_unload2();
|
|
|
|
|