|
@@ -4107,7 +4107,7 @@ void lcd_wizard(WizState state)
|
|
|
lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); ////MSG_WIZARD_WILL_PREHEAT c=20 r=4
|
|
|
wait_preheat();
|
|
|
//unload current filament
|
|
|
- unload_filament(true);
|
|
|
+ unload_filament(FILAMENTCHANGE_FINALRETRACT, true);
|
|
|
//load filament
|
|
|
lcd_wizard_load();
|
|
|
setTargetHotend(0, 0); //we are finished, cooldown nozzle
|
|
@@ -5249,7 +5249,7 @@ static void mmu_load_to_bondtech_menu() {
|
|
|
|
|
|
// 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)
|
|
|
+void unload_filament(float unloadLength, bool automatic)
|
|
|
{
|
|
|
custom_message_type = CustomMsg::FilamentLoading;
|
|
|
lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT));
|
|
@@ -5262,17 +5262,9 @@ void unload_filament(bool automatic)
|
|
|
raise_z_above(MIN_Z_FOR_SWAP);
|
|
|
}
|
|
|
|
|
|
- // extr_unload2();
|
|
|
-
|
|
|
- current_position[E_AXIS] -= 45;
|
|
|
- plan_buffer_line_curposXYZE(5200 / 60);
|
|
|
- st_synchronize();
|
|
|
- current_position[E_AXIS] -= 15;
|
|
|
- plan_buffer_line_curposXYZE(1000 / 60);
|
|
|
- st_synchronize();
|
|
|
- current_position[E_AXIS] -= 20;
|
|
|
- plan_buffer_line_curposXYZE(1000 / 60);
|
|
|
- st_synchronize();
|
|
|
+ current_position[E_AXIS] -= unloadLength;
|
|
|
+ plan_buffer_line_curposXYZE(1000 / 60);
|
|
|
+ st_synchronize();
|
|
|
|
|
|
lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT));
|
|
|
|