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

Fix G29_RETRY_AND_RECOVER dependency (#21907)

Browse Source 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
This commit is contained in:
ondrada 2021-05-15 05:29:17 +02:00 committed by Scott Lahteine
parent 121f3b1096
commit 908caba735
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/gcode/gcode.cpp
View File

@ -211,7 +211,7 @@ void GcodeSuite::dwell(millis_t time) {
* When G29_RETRY_AND_RECOVER is enabled, call G29() in * When G29_RETRY_AND_RECOVER is enabled, call G29() in
* a loop with recovery and retry handling. * a loop with recovery and retry handling.
*/ */
#if BOTH(HAS_LEVELING, G29_RETRY_AND_RECOVER) #if ENABLED(G29_RETRY_AND_RECOVER)
void GcodeSuite::event_probe_recover() { void GcodeSuite::event_probe_recover() {
TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR)); TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR));
@ -223,6 +223,10 @@ void GcodeSuite::dwell(millis_t time) {
#endif #endif
} }
#if ENABLED(G29_HALT_ON_FAILURE)
#include "../lcd/marlinui.h"
#endif
void GcodeSuite::event_probe_failure() { void GcodeSuite::event_probe_failure() {
#ifdef ACTION_ON_G29_FAILURE #ifdef ACTION_ON_G29_FAILURE
host_action(PSTR(ACTION_ON_G29_FAILURE)); host_action(PSTR(ACTION_ON_G29_FAILURE));
@ -262,7 +266,7 @@ void GcodeSuite::dwell(millis_t time) {
#endif #endif
} }
#endif // HAS_LEVELING && G29_RETRY_AND_RECOVER #endif // G29_RETRY_AND_RECOVER
/** /**
* Process the parsed command and dispatch it to its handler * Process the parsed command and dispatch it to its handler

1
Marlin/src/inc/Conditionals_LCD.h
View File

@ -870,6 +870,7 @@
#if !HAS_LEVELING #if !HAS_LEVELING
#undef RESTORE_LEVELING_AFTER_G28 #undef RESTORE_LEVELING_AFTER_G28
#undef ENABLE_LEVELING_AFTER_G28 #undef ENABLE_LEVELING_AFTER_G28
#undef G29_RETRY_AND_RECOVER
#endif #endif
#if !HAS_LEVELING || EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) #if !HAS_LEVELING || EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
#undef PROBE_MANUALLY #undef PROBE_MANUALLY