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

Add Unloading message to LCD 

Also made mmu_M600_load_filament static to limit its scope
This commit is contained in:
Guðni Már Gilbert 2022-06-18 09:28:44 +00:00 committed by D.R.racer
parent d5cdb412ba
commit b9c23cd6b8
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Firmware/Marlin_main.cpp
View File

@ -3508,9 +3508,29 @@ static void mmu_M600_wait_and_beep() {
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
} }
/**
* @brief Handling of unload when using MMU with M600
* A fullscreen message showing "Unloading Filament x"
* should be shown on the LCD and LCD updates should be
* are disabled in the meantime.
*/
static void mmu_M600_unload_filament() {
uint8_t tmp_extruder = MMU2::mmu2.get_current_tool();
lcd_update_enable(false);
lcd_clear();
lcd_puts_at_P(0, 1, _T(MSG_UNLOADING_FILAMENT));
lcd_print(' ');
lcd_print(tmp_extruder + 1);
// unload just current filament for multimaterial printers (used also in M702)
MMU2::mmu2.unload();
lcd_update_enable(true);
}
/// @brief load filament for mmu v2 /// @brief load filament for mmu v2
/// @par nozzle_temp nozzle temperature to load filament /// @par nozzle_temp nozzle temperature to load filament
void mmu_M600_load_filament(bool automatic, float nozzle_temp) { static void mmu_M600_load_filament(bool automatic, float nozzle_temp) {
uint8_t tmp_extruder = MMU2::mmu2.get_previous_tool(); uint8_t tmp_extruder = MMU2::mmu2.get_previous_tool();
// TODO SpoolJoin // TODO SpoolJoin
@ -3574,7 +3594,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
// Unload filament // Unload filament
if (MMU2::mmu2.Enabled()) if (MMU2::mmu2.Enabled())
MMU2::mmu2.unload(); // unload just current filament for multimaterial printers (used also in M702) mmu_M600_unload_filament();
else else
unload_filament(true); // unload filament for single material (used also in M702) unload_filament(true); // unload filament for single material (used also in M702)
st_synchronize(); // finish moves st_synchronize(); // finish moves