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

Merge pull request #1899 from wavexx/fix_lcd_pause_function 

Fix the LCD pause function
This commit is contained in:
DRracer 2019-11-08 14:55:13 +01:00 committed by GitHub
parent 42d70f3dea 2345288d40
commit b33c79e6c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -9540,10 +9540,9 @@ 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 print fan // Turn off the hotends and print fan
setAllTargetHotends(0);
fanSpeed = 0; fanSpeed = 0;
st_synchronize();
} }
void serialecho_temperatures() { void serialecho_temperatures() {

10
Firmware/ultralcd.cpp
View File

@ -1072,12 +1072,8 @@ void lcd_commands()
if (!blocks_queued() && !homing_flag) if (!blocks_queued() && !homing_flag)
{ {
lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1 lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1
long_pause(); lcd_commands_type = LcdCommands::Idle;
if (lcd_commands_type == LcdCommands::LongPause) // !!! because "lcd_commands_type" can be changed during/inside "long_pause()" lcd_commands_step = 0;
{
lcd_commands_type = LcdCommands::Idle;
lcd_commands_step = 0;
}
} }
} }
@ -1636,7 +1632,7 @@ void lcd_pause_print()
{ {
lcd_return_to_status(); lcd_return_to_status();
stop_and_save_print_to_ram(0.0,0.0); stop_and_save_print_to_ram(0.0,0.0);
setAllTargetHotends(0); long_pause();
isPrintPaused = true; isPrintPaused = true;
if (LcdCommands::Idle == lcd_commands_type) if (LcdCommands::Idle == lcd_commands_type)
{ {