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

Fix an issue where MMU unloads filament while its cooling down 

Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
This commit is contained in:
gudnimg 2024-11-17 16:58:55 +00:00 committed by Alexandra Voinea
parent d1470d8abc
commit a0278b2844
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Firmware/first_lay_cal.cpp
View File

@ -11,7 +11,6 @@
#include "mmu2.h" #include "mmu2.h"
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <math.h> #include <math.h>
#include "temperature.h"
//! @brief Count extrude length //! @brief Count extrude length
//! //!
@ -38,7 +37,14 @@ static constexpr float spacing(float layer_height, float extrusion_width, float
static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence, const uint8_t steps) { static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence, const uint8_t steps) {
for (uint8_t i = 0; i < steps; ++i) for (uint8_t i = 0; i < steps; ++i)
{ {
enquecommand_P(static_cast<char*>(pgm_read_ptr(cmd_sequence + i))); void * pgm_ptr = pgm_read_ptr(cmd_sequence + i);
// M702 is currently only used with MMU enabled
if (pgm_ptr == MSG_M702 && !MMU2::mmu2.Enabled()) {
continue;
}
enquecommand_P(static_cast<char*>(pgm_ptr));
} }
} }
@ -237,24 +243,27 @@ void lay1cal_square(uint8_t step, float layer_height, float extrusion_width)
} }
} }
void lay1cal_finish(bool mmu_enabled) void lay1cal_finish()
{ {
static const char cmd_cal_finish_2[] PROGMEM = "G1E-0.075F2100"; //retract static const char cmd_cal_finish_1[] PROGMEM = "G1E-0.075F2100"; // Retract
static const char cmd_cal_finish_3[] PROGMEM = "G1Z10F1300"; //lift Z static const char cmd_cal_finish_2[] PROGMEM = "M140S0"; // Turn off bed heater
static const char cmd_cal_finish_4[] PROGMEM = "G1X10Y180F4000"; //Go to parking position static const char cmd_cal_finish_3[] PROGMEM = "M104S0"; // Turn off hotend heater
static const char cmd_cal_finish_4[] PROGMEM = "G1Z10F1300"; // Lift Z
static const char cmd_cal_finish_5[] PROGMEM = "G1X10Y180F4000"; // Go to parking position
static const char * const cmd_cal_finish[] PROGMEM = static const char * const cmd_cal_finish[] PROGMEM =
{ {
MSG_M107, // turn off printer fan MSG_G90, // Set to Absolute Positioning
cmd_cal_finish_2, MSG_M107, // Turn off printer fan
cmd_cal_finish_3, cmd_cal_finish_1, // Retract
cmd_cal_finish_4 cmd_cal_finish_2, // Turn off bed heater
MSG_M702, // Unload filament (MMU only)
cmd_cal_finish_3, // Turn off hotend heater
cmd_cal_finish_4, // Lift Z
cmd_cal_finish_5, // Go to parking position
MSG_M84 // Disable stepper motors
}; };
enquecommand_P(MSG_G90);
lay1cal_common_enqueue_loop(cmd_cal_finish, (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0]))); lay1cal_common_enqueue_loop(cmd_cal_finish, (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0])));
if (mmu_enabled) enquecommand_P(MSG_M702); //unload from nozzle
disable_heater();
enquecommand_P(MSG_M84);// disable motors
} }

2
Firmware/first_lay_cal.h
View File

@ -13,6 +13,6 @@ void lay1cal_before_meander();
void lay1cal_meander_start(float layer_height, float extrusion_width); void lay1cal_meander_start(float layer_height, float extrusion_width);
void lay1cal_meander(float layer_height, float extrusion_width); void lay1cal_meander(float layer_height, float extrusion_width);
void lay1cal_square(uint8_t step, float layer_height, float extrusion_width); void lay1cal_square(uint8_t step, float layer_height, float extrusion_width);
void lay1cal_finish(bool mmu_enabled); void lay1cal_finish();
#endif /* FIRMWARE_FIRST_LAY_CAL_H_ */ #endif /* FIRMWARE_FIRST_LAY_CAL_H_ */

2
Firmware/ultralcd.cpp
View File

@ -869,7 +869,7 @@ void lcd_commands()
lay1cal_square(3, layer_height, extrusion_width); lay1cal_square(3, layer_height, extrusion_width);
break; break;
case 2: case 2:
lay1cal_finish(MMU2::mmu2.Enabled()); lay1cal_finish();
break; break;
case 1: case 1:
lcd_setstatuspgm(MSG_WELCOME); lcd_setstatuspgm(MSG_WELCOME);