SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix host action / G-code ordering in event_probe_failure (#13207)

Browse source 
Observing from the console, it makes the most sense to do `//action:probe_retry` before executing commands.
This commit is contained in:
Marcio Teixeira 2019-02-19 13:45:03 -07:00 committed by Scott Lahteine
parent 33a6d52965
commit 992cdc8d14
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/src/Marlin.cpp
View file

@ -386,12 +386,12 @@ void disable_all_steppers() {
#if ENABLED(G29_RETRY_AND_RECOVER) #if ENABLED(G29_RETRY_AND_RECOVER)
void event_probe_failure() { void event_probe_failure() {
#ifdef ACTION_ON_G29_FAILURE
host_action(PSTR(ACTION_ON_G29_FAILURE));
#endif
#ifdef G29_FAILURE_COMMANDS #ifdef G29_FAILURE_COMMANDS
gcode.process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS)); gcode.process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
#endif #endif
#ifdef ACTION_ON_G29_FAILURE
host_action(PSTR(ACTION_ON_G29_FAILURE)); }
#endif
#if ENABLED(G29_HALT_ON_FAILURE) #if ENABLED(G29_HALT_ON_FAILURE)
#ifdef ACTION_ON_CANCEL #ifdef ACTION_ON_CANCEL
host_action_cancel(); host_action_cancel();
@ -404,12 +404,12 @@ void disable_all_steppers() {
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying")); host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"));
#endif #endif
#ifdef G29_RECOVER_COMMANDS
gcode.process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
#endif
#ifdef ACTION_ON_G29_RECOVER #ifdef ACTION_ON_G29_RECOVER
host_action(PSTR(ACTION_ON_G29_RECOVER)); host_action(PSTR(ACTION_ON_G29_RECOVER));
#endif #endif
#ifdef G29_RECOVER_COMMANDS
gcode.process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
#endif
} }
#endif #endif