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

Fix build failure

This commit is contained in:
gudnimg 2023-11-19 11:51:41 +00:00 committed by Guðni Már Gilbert
parent a6de11059f
commit a2e6cda37e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View File

@ -3423,7 +3423,7 @@ static void gcode_M600(const bool automatic, const float x_position, const float
fanSpeed = 0; fanSpeed = 0;
// Retract E // Retract E
if (!isPrintPaused) if (!print_job_timer.isPaused())
{ {
current_position[E_AXIS] += e_shift; current_position[E_AXIS] += e_shift;
plan_buffer_line_curposXYZE(FILAMENTCHANGE_RFEED); plan_buffer_line_curposXYZE(FILAMENTCHANGE_RFEED);
@ -3486,7 +3486,7 @@ static void gcode_M600(const bool automatic, const float x_position, const float
// Feed a little of filament to stabilize pressure // Feed a little of filament to stabilize pressure
if (!automatic) { if (!automatic) {
if (isPrintPaused) if (print_job_timer.isPaused())
{ {
// Return to retracted state during a pause // Return to retracted state during a pause
// @todo is retraction really needed? E-position is reverted a few lines below // @todo is retraction really needed? E-position is reverted a few lines below
@ -3522,7 +3522,7 @@ static void gcode_M600(const bool automatic, const float x_position, const float
feedmultiply = feedmultiplyBckp; feedmultiply = feedmultiplyBckp;
enquecommandf_P(MSG_M220, feedmultiplyBckp); enquecommandf_P(MSG_M220, feedmultiplyBckp);
} }
if (isPrintPaused) lcd_setstatuspgm(_T(MSG_PRINT_PAUSED)); if (print_job_timer.isPaused()) lcd_setstatuspgm(_T(MSG_PRINT_PAUSED));
else lcd_setstatuspgm(MSG_WELCOME); else lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status; custom_message_type = CustomMsg::Status;
} }