zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix missing dependencies (#14339)

Browse source
This commit is contained in:
Marcio Teixeira 2019-06-20 15:37:20 -06:00 committed by Scott Lahteine
parent 19d4a9ab77
commit 49ea1c635a
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/feature/pause.cpp
View file

@ -683,7 +683,9 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
#if HAS_DISPLAY #if HAS_DISPLAY
ui.reset_status(); ui.reset_status();
ui.return_to_status(); #if HAS_LCD_MENU
ui.return_to_status();
#endif
#endif #endif
} }

8
Marlin/src/lcd/ultralcd.cpp
View file

@ -1424,6 +1424,10 @@ void MarlinUI::update() {
set_status_P(msg, -1); set_status_P(msg, -1);
} }
#if ENABLED(SDSUPPORT)
extern bool wait_for_user, wait_for_heatup;
#endif
void MarlinUI::abort_print() { void MarlinUI::abort_print() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
wait_for_heatup = wait_for_user = false; wait_for_heatup = wait_for_user = false;
@ -1442,6 +1446,10 @@ void MarlinUI::update() {
#endif #endif
} }
#if ANY(PARK_HEAD_ON_PAUSE, SDSUPPORT)
#include "../gcode/queue.h"
#endif
void MarlinUI::pause_print() { void MarlinUI::pause_print() {
#if HAS_LCD_MENU #if HAS_LCD_MENU
synchronize(PSTR(MSG_PAUSE_PRINT)); synchronize(PSTR(MSG_PAUSE_PRINT));