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

Merge pull request #2116 from mkbel/fix_mmu_lay1cal

Browse Source 
Fix mmu lay1cal
This commit is contained in:
DRracer 2019-08-19 19:07:10 +02:00 committed by GitHub
commit f07635d08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -7768,7 +7768,7 @@ Sigma_Exit:
if (mmu_enabled) if (mmu_enabled)
{ {
st_synchronize(); st_synchronize();
mmu_continue_loading(is_usb_printing); mmu_continue_loading(is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal));
mmu_extruder = tmp_extruder; //filament change is finished mmu_extruder = tmp_extruder; //filament change is finished
mmu_load_to_nozzle(); mmu_load_to_nozzle();
} }
@ -7812,7 +7812,7 @@ Sigma_Exit:
#endif //defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT) #endif //defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT)
mmu_command(MmuCmd::T0 + tmp_extruder); mmu_command(MmuCmd::T0 + tmp_extruder);
manage_response(true, true, MMU_TCODE_MOVE); manage_response(true, true, MMU_TCODE_MOVE);
mmu_continue_loading(is_usb_printing); mmu_continue_loading(is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal));
mmu_extruder = tmp_extruder; //filament change is finished mmu_extruder = tmp_extruder; //filament change is finished

33
Firmware/first_lay_cal.cpp
View File

@ -40,15 +40,26 @@ void lay1cal_preheat()
} }
//! @brief Print intro line //! @brief Load filament
//! @param cmd_buffer character buffer needed to format gcodes //! @param cmd_buffer character buffer needed to format gcodes
//! @param filament filament to use (applies for MMU only) //! @param filament filament to use (applies for MMU only)
void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) void lay1cal_load_filament(char *cmd_buffer, uint8_t filament)
{ {
static const char cmd_intro_mmu_0[] PROGMEM = "M83"; if (mmu_enabled)
static const char cmd_intro_mmu_1[] PROGMEM = "G1 Y-3.0 F1000.0"; {
static const char cmd_intro_mmu_2[] PROGMEM = "G1 Z0.4 F1000.0"; enquecommand_P(PSTR("M83"));
static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0"; // call T code before enquecommand_P(PSTR("G1 Y-3.0 F1000.0"));
enquecommand_P(PSTR("G1 Z0.4 F1000.0"));
sprintf_P(cmd_buffer, PSTR("T%d"), filament);
enquecommand(cmd_buffer);
}
}
//! @brief Print intro line
void lay1cal_intro_line()
{
static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0";
static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5.0 E32.0 F1800.0"; static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5.0 E32.0 F1800.0";
static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55.0 E8.0 F2000.0"; static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55.0 E8.0 F2000.0";
static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000.0"; static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000.0";
@ -61,10 +72,7 @@ void lay1cal_intro_line(char *cmd_buffer, uint8_t filament)
static const char * const intro_mmu_cmd[] PROGMEM = static const char * const intro_mmu_cmd[] PROGMEM =
{ {
cmd_intro_mmu_0, cmd_intro_mmu_3,
cmd_intro_mmu_1,
cmd_intro_mmu_2,
cmd_intro_mmu_3, // call T code before
cmd_intro_mmu_4, cmd_intro_mmu_4,
cmd_intro_mmu_5, cmd_intro_mmu_5,
cmd_intro_mmu_6, cmd_intro_mmu_6,
@ -80,11 +88,6 @@ void lay1cal_intro_line(char *cmd_buffer, uint8_t filament)
{ {
for (uint8_t i = 0; i < (sizeof(intro_mmu_cmd)/sizeof(intro_mmu_cmd[0])); ++i) for (uint8_t i = 0; i < (sizeof(intro_mmu_cmd)/sizeof(intro_mmu_cmd[0])); ++i)
{ {
if (3 == i)
{
sprintf_P(cmd_buffer, PSTR("T%d"), filament);
enquecommand(cmd_buffer);
}
enquecommand_P(static_cast<char*>(pgm_read_ptr(&intro_mmu_cmd[i]))); enquecommand_P(static_cast<char*>(pgm_read_ptr(&intro_mmu_cmd[i])));
} }
} }

3
Firmware/first_lay_cal.h
View File

@ -7,7 +7,8 @@
#include <stdint.h> #include <stdint.h>
void lay1cal_preheat(); void lay1cal_preheat();
void lay1cal_intro_line(char *cmd_buffer, uint8_t filament); void lay1cal_load_filament(char *cmd_buffer, uint8_t filament);
void lay1cal_intro_line();
void lay1cal_before_meander(); void lay1cal_before_meander();
void lay1cal_meander(char *cmd_buffer); void lay1cal_meander(char *cmd_buffer);
void lay1cal_square(char *cmd_buffer, uint8_t i); void lay1cal_square(char *cmd_buffer, uint8_t i);

2
Firmware/mmu.cpp
View File

@ -889,7 +889,7 @@ void mmu_M600_load_filament(bool automatic, float nozzle_temp)
mmu_command(MmuCmd::T0 + tmp_extruder); mmu_command(MmuCmd::T0 + tmp_extruder);
manage_response(false, true, MMU_LOAD_MOVE); manage_response(false, true, MMU_LOAD_MOVE);
mmu_continue_loading(is_usb_printing); mmu_continue_loading(is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal));
mmu_extruder = tmp_extruder; //filament change is finished mmu_extruder = tmp_extruder; //filament change is finished
mmu_load_to_nozzle(); mmu_load_to_nozzle();

20
Firmware/ultralcd.cpp
View File

@ -1354,42 +1354,46 @@ void lcd_commands()
if(lcd_commands_step>1) lcd_timeoutToStatus.start(); //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen if(lcd_commands_step>1) lcd_timeoutToStatus.start(); //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen
if (!blocks_queued() && cmd_buffer_empty()) if (!blocks_queued() && cmd_buffer_empty() && !saved_printing)
{ {
switch(lcd_commands_step) switch(lcd_commands_step)
{ {
case 0: case 0:
lcd_commands_step = 10; lcd_commands_step = 11;
break; break;
case 20: case 20:
filament = 0; filament = 0;
lcd_commands_step = 10; lcd_commands_step = 11;
break; break;
case 21: case 21:
filament = 1; filament = 1;
lcd_commands_step = 10; lcd_commands_step = 11;
break; break;
case 22: case 22:
filament = 2; filament = 2;
lcd_commands_step = 10; lcd_commands_step = 11;
break; break;
case 23: case 23:
filament = 3; filament = 3;
lcd_commands_step = 10; lcd_commands_step = 11;
break; break;
case 24: case 24:
filament = 4; filament = 4;
lcd_commands_step = 11;
break;
case 11:
lay1cal_preheat();
lcd_commands_step = 10; lcd_commands_step = 10;
break; break;
case 10: case 10:
lay1cal_preheat(); lay1cal_load_filament(cmd1, filament);
lcd_commands_step = 9; lcd_commands_step = 9;
break; break;
case 9: case 9:
lcd_clear(); lcd_clear();
menu_depth = 0; menu_depth = 0;
menu_submenu(lcd_babystep_z); menu_submenu(lcd_babystep_z);
lay1cal_intro_line(cmd1, filament); lay1cal_intro_line();
lcd_commands_step = 8; lcd_commands_step = 8;
break; break;
case 8: case 8: