From 528c9885f204cf9cad8dd77df2c365cb2fab81ac Mon Sep 17 00:00:00 2001 From: Ludy Date: Thu, 8 Aug 2019 08:52:20 +0200 Subject: [PATCH] Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (#14831) --- Marlin/src/lcd/ultralcd.h | 1 + Marlin/src/module/probe.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 0d66e2073..2eb8c79f2 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -395,6 +395,7 @@ public: static inline void init() {} static inline void update() {} 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_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); } diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 4e7436a63..af8fa5109 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -38,9 +38,7 @@ #include "../gcode/gcode.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 -#endif +#include "../Marlin.h" // for stop(), disable_e_steppers, wait_for_user #if HAS_LEVELING #include "../feature/bedlevel/bedlevel.h" @@ -64,6 +62,10 @@ float zprobe_zoffset; // Initialized by settings.load() #include "../feature/bltouch.h" #endif +#if ENABLED(HOST_PROMPT_SUPPORT) + #include "../feature/host_actions.h" // for PROMPT_USER_CONTINUE +#endif + #if HAS_Z_SERVO_PROBE #include "servo.h" #endif