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

Merge pull request #2393 from wavexx/sync_before_resume 

Sync before resume
This commit is contained in:
DRracer 2020-01-15 12:49:56 +01:00 committed by GitHub
parent 1a8420f3f9 57be14fca6
commit 7230b99448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -10318,12 +10318,10 @@ void restore_print_from_ram_and_continue(float e_move)
//first move print head in XY to the saved position: //first move print head in XY to the saved position:
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], current_position[Z_AXIS], saved_pos[E_AXIS] - e_move, homing_feedrate[Z_AXIS]/13, active_extruder); plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], current_position[Z_AXIS], saved_pos[E_AXIS] - e_move, homing_feedrate[Z_AXIS]/13, active_extruder);
st_synchronize();
//then move Z //then move Z
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS] - e_move, homing_feedrate[Z_AXIS]/13, active_extruder); plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS] - e_move, homing_feedrate[Z_AXIS]/13, active_extruder);
st_synchronize();
//and finaly unretract (35mm/s) //and finaly unretract (35mm/s)
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS], 35, active_extruder); plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder);
st_synchronize(); st_synchronize();
#ifdef FANCHECK #ifdef FANCHECK

1
Firmware/mmu.cpp
View File

@ -1589,6 +1589,7 @@ void mmu_continue_loading(bool blocking)
if (blocking) if (blocking)
{ {
marlin_wait_for_click(); marlin_wait_for_click();
st_synchronize();
restore_print_from_ram_and_continue(0); restore_print_from_ram_and_continue(0);
state = Ls::Retry; state = Ls::Retry;
} }

7
Firmware/ultralcd.cpp
View File

@ -6678,12 +6678,13 @@ static bool fan_error_selftest()
void lcd_resume_print() void lcd_resume_print()
{ {
lcd_return_to_status(); lcd_return_to_status();
lcd_reset_alert_level();
lcd_setstatuspgm(_T(MSG_RESUMING_PRINT));
lcd_reset_alert_level(); //for fan speed error lcd_reset_alert_level(); //for fan speed error
if (fan_error_selftest()) return; //abort if error persists if (fan_error_selftest()) return; //abort if error persists
lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS));
st_synchronize();
lcd_setstatuspgm(_T(MSG_RESUMING_PRINT));
isPrintPaused = false; isPrintPaused = false;
restore_print_from_ram_and_continue(default_retraction); restore_print_from_ram_and_continue(default_retraction);
pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation