josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: remove automatic parameter from unload_filament() 

In M600 and M702, the Z-lift is taken care of outside this function
so it makes no sense to have a Z-lift within unload_filament()

Only exception to this is in the wizard, there I moved the Z-lift to
happen before we start heating the nozzle.

Change in memory:
Flash: -12 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2022-10-15 08:08:30 +00:00 committed by DRracer
parent 090c72367d
commit 2e7c237a17
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -3544,7 +3544,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
if (MMU2::mmu2.Enabled()) if (MMU2::mmu2.Enabled())
mmu_M600_unload_filament(); mmu_M600_unload_filament();
else else
unload_filament(FILAMENTCHANGE_FINALRETRACT, true); // unload filament for single material (used also in M702) unload_filament(FILAMENTCHANGE_FINALRETRACT);
st_synchronize(); // finish moves st_synchronize(); // finish moves
{ {
FSensorBlockRunout fsBlockRunout; FSensorBlockRunout fsBlockRunout;

15
Firmware/ultralcd.cpp
View File

@ -4030,13 +4030,14 @@ void lcd_wizard(WizState state)
} }
wizard_event = gcode_M45(true, 0); wizard_event = gcode_M45(true, 0);
if (wizard_event) { if (wizard_event) {
raise_z_above(MIN_Z_FOR_SWAP);
//current filament needs to be unloaded and then new filament should be loaded //current filament needs to be unloaded and then new filament should be loaded
//start to preheat nozzle for unloading remaining PLA filament //start to preheat nozzle for unloading remaining PLA filament
setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0); setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0);
lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); ////MSG_WIZARD_WILL_PREHEAT c=20 r=4 lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); ////MSG_WIZARD_WILL_PREHEAT c=20 r=4
wait_preheat(); wait_preheat();
//unload current filament //unload current filament
unload_filament(FILAMENTCHANGE_FINALRETRACT, true); unload_filament(FILAMENTCHANGE_FINALRETRACT);
//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
@ -5124,21 +5125,15 @@ static void mmu_loading_test_menu() {
} }
} }
// unload filament for single material printer (used in M702 gcode) /// @brief unload filament for single material printer (used in M600 and M702)
// @param automatic: If true, unload_filament is part of a unload+load sequence (M600) /// @param unloadLength Retract distance for removal (manual reload)
void unload_filament(float unloadLength, bool automatic) void unload_filament(float unloadLength)
{ {
custom_message_type = CustomMsg::FilamentLoading; custom_message_type = CustomMsg::FilamentLoading;
lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT)); lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT));
FSensorBlockRunout fsBlockRunout; FSensorBlockRunout fsBlockRunout;
if (automatic)
{
// M600
raise_z_above(MIN_Z_FOR_SWAP);
}
// Retract filament // Retract filament
current_position[E_AXIS] += -FILAMENT_UNLOAD_PURGE_RETRACT; current_position[E_AXIS] += -FILAMENT_UNLOAD_PURGE_RETRACT;
plan_buffer_line_curposXYZE(PAUSE_PARK_RETRACT_FEEDRATE); plan_buffer_line_curposXYZE(PAUSE_PARK_RETRACT_FEEDRATE);

2
Firmware/ultralcd.h
View File

@ -197,7 +197,7 @@ extern bool bFilamentAction;
void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void mFilamentItem(uint16_t nTemp,uint16_t nTempBed);
void mFilamentItemForce(); void mFilamentItemForce();
void lcd_generic_preheat_menu(); void lcd_generic_preheat_menu();
void unload_filament(float unloadLength, bool automatic = false); void unload_filament(float unloadLength);
void lcd_wait_for_heater(); void lcd_wait_for_heater();