Skip to content

Commit

Permalink
Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (MarlinFirmware#14831
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Ludy87 authored and thinkyhead committed Aug 8, 2019
1 parent c8e30b6 commit 528c988
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions Marlin/src/lcd/ultralcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ class MarlinUI {
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); }
Expand Down
8 changes: 5 additions & 3 deletions Marlin/src/module/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 528c988

Please sign in to comment.