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

Merge pull request #2353 from wavexx/lcd_pause_fixes

Browse source 
Fix the LCD pause (regression)
This commit is contained in:
DRracer 2019-12-13 13:53:29 +01:00 committed by GitHub
commit 30cee7afca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Firmware/Marlin_main.cpp
View file

@ -8415,8 +8415,6 @@ void prepare_move()
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply*(1./(60.f*100.f)), active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply*(1./(60.f*100.f)), active_extruder);
#endif #endif
} }
if (waiting_inside_plan_buffer_line_print_aborted)
return;
set_current_to_destination(); set_current_to_destination();
} }
@ -9565,9 +9563,11 @@ float temp_compensation_pinda_thermistor_offset(float temperature_pinda)
void long_pause() //long pause print void long_pause() //long pause print
{ {
st_synchronize(); st_synchronize();
start_pause_print = _millis(); start_pause_print = _millis();
// Stop heaters
setAllTargetHotends(0);
//retract //retract
current_position[E_AXIS] -= default_retraction; current_position[E_AXIS] -= default_retraction;
plan_buffer_line_curposXYZE(400, active_extruder); plan_buffer_line_curposXYZE(400, active_extruder);
@ -9582,8 +9582,7 @@ void long_pause() //long pause print
current_position[Y_AXIS] = Y_PAUSE_POS; current_position[Y_AXIS] = Y_PAUSE_POS;
plan_buffer_line_curposXYZE(50, active_extruder); plan_buffer_line_curposXYZE(50, active_extruder);
// Turn off the hotends and print fan // Turn off the print fan
setAllTargetHotends(0);
fanSpeed = 0; fanSpeed = 0;
} }
@ -10230,7 +10229,9 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
sei(); sei();
if ((z_move != 0) || (e_move != 0)) { // extruder or z move if ((z_move != 0) || (e_move != 0)) { // extruder or z move
#if 1 #if 1
// Rather than calling plan_buffer_line directly, push the move into the command queue, // Rather than calling plan_buffer_line directly, push the move into the command queue so that
// the caller can continue processing. This is used during powerpanic to save the state as we
// move away from the print.
char buf[48]; char buf[48];
// First unretract (relative extrusion) // First unretract (relative extrusion)
@ -10259,6 +10260,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
memcpy(current_position, saved_pos, sizeof(saved_pos)); memcpy(current_position, saved_pos, sizeof(saved_pos));
memcpy(destination, current_position, sizeof(destination)); memcpy(destination, current_position, sizeof(destination));
#endif #endif
waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack
} }
} }

4
Firmware/ultralcd.cpp
View file

@ -1100,6 +1100,7 @@ void lcd_commands()
lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1 lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1
lcd_commands_type = LcdCommands::Idle; lcd_commands_type = LcdCommands::Idle;
lcd_commands_step = 0; lcd_commands_step = 0;
long_pause();
} }
} }
@ -1656,9 +1657,8 @@ void lcd_return_to_status()
//! @brief Pause print, disable nozzle heater, move to park position //! @brief Pause print, disable nozzle heater, move to park position
void lcd_pause_print() void lcd_pause_print()
{ {
lcd_return_to_status();
stop_and_save_print_to_ram(0.0,0.0); stop_and_save_print_to_ram(0.0,0.0);
long_pause(); lcd_return_to_status();
isPrintPaused = true; isPrintPaused = true;
if (LcdCommands::Idle == lcd_commands_type) if (LcdCommands::Idle == lcd_commands_type)
{ {