CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (#14831)

Browse Source
This commit is contained in:
Ludy 2019-08-08 08:52:20 +02:00 committed by Scott Lahteine
parent c8e30b6639
commit 528c9885f2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/lcd/ultralcd.h
View File

@ -395,6 +395,7 @@ public:
static inline void init() {} static inline void init() {}
static inline void update() {} static inline void update() {}
static inline void refresh() {} static inline void refresh() {}
static inline void return_to_status() {}
static inline void set_alert_status_P(PGM_P message) { UNUSED(message); } static inline void set_alert_status_P(PGM_P message) { UNUSED(message); }
static inline void set_status(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); } static inline void set_status(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); }
static inline void set_status_P(PGM_P const message, const int8_t level=0) { UNUSED(message); UNUSED(level); } static inline void set_status_P(PGM_P const message, const int8_t level=0) { UNUSED(message); UNUSED(level); }

8
Marlin/src/module/probe.cpp
View File

@ -38,9 +38,7 @@
#include "../gcode/gcode.h" #include "../gcode/gcode.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"
#if ANY(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY, PROBE_TRIGGERED_WHEN_STOWED_TEST) || (QUIET_PROBING && ENABLED(PROBING_STEPPERS_OFF)) #include "../Marlin.h" // for stop(), disable_e_steppers, wait_for_user
#include "../Marlin.h" // for stop(), disable_e_steppers
#endif
#if HAS_LEVELING #if HAS_LEVELING
#include "../feature/bedlevel/bedlevel.h" #include "../feature/bedlevel/bedlevel.h"
@ -64,6 +62,10 @@ float zprobe_zoffset; // Initialized by settings.load()
#include "../feature/bltouch.h" #include "../feature/bltouch.h"
#endif #endif
#if ENABLED(HOST_PROMPT_SUPPORT)
#include "../feature/host_actions.h" // for PROMPT_USER_CONTINUE
#endif
#if HAS_Z_SERVO_PROBE #if HAS_Z_SERVO_PROBE
#include "servo.h" #include "servo.h"
#endif #endif