Browse Source

Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (#14831)

Ludy 5 years ago
parent
commit
528c9885f2
2 changed files with 6 additions and 3 deletions
  1. 1
    0
      Marlin/src/lcd/ultralcd.h
  2. 5
    3
      Marlin/src/module/probe.cpp

+ 1
- 0
Marlin/src/lcd/ultralcd.h View File

395
     static inline void init() {}
395
     static inline void init() {}
396
     static inline void update() {}
396
     static inline void update() {}
397
     static inline void refresh() {}
397
     static inline void refresh() {}
398
+    static inline void return_to_status() {}
398
     static inline void set_alert_status_P(PGM_P message) { UNUSED(message); }
399
     static inline void set_alert_status_P(PGM_P message) { UNUSED(message); }
399
     static inline void set_status(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); }
400
     static inline void set_status(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); }
400
     static inline void set_status_P(PGM_P const message, const int8_t level=0) { UNUSED(message); UNUSED(level); }
401
     static inline void set_status_P(PGM_P const message, const int8_t level=0) { UNUSED(message); UNUSED(level); }

+ 5
- 3
Marlin/src/module/probe.cpp View File

38
 #include "../gcode/gcode.h"
38
 #include "../gcode/gcode.h"
39
 #include "../lcd/ultralcd.h"
39
 #include "../lcd/ultralcd.h"
40
 
40
 
41
-#if ANY(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY, PROBE_TRIGGERED_WHEN_STOWED_TEST) || (QUIET_PROBING && ENABLED(PROBING_STEPPERS_OFF))
42
-  #include "../Marlin.h" // for stop(), disable_e_steppers
43
-#endif
41
+#include "../Marlin.h" // for stop(), disable_e_steppers, wait_for_user
44
 
42
 
45
 #if HAS_LEVELING
43
 #if HAS_LEVELING
46
   #include "../feature/bedlevel/bedlevel.h"
44
   #include "../feature/bedlevel/bedlevel.h"
64
   #include "../feature/bltouch.h"
62
   #include "../feature/bltouch.h"
65
 #endif
63
 #endif
66
 
64
 
65
+#if ENABLED(HOST_PROMPT_SUPPORT)
66
+  #include "../feature/host_actions.h" // for PROMPT_USER_CONTINUE
67
+#endif
68
+
67
 #if HAS_Z_SERVO_PROBE
69
 #if HAS_Z_SERVO_PROBE
68
   #include "servo.h"
70
   #include "servo.h"
69
 #endif
71
 #endif

Loading…
Cancel
Save