|
@@ -347,8 +347,10 @@ void disable_all_steppers() {
|
347
|
347
|
host_action_prompt_show();
|
348
|
348
|
#endif
|
349
|
349
|
|
|
350
|
+ const bool run_runout_script = !runout.host_handling;
|
|
351
|
+
|
350
|
352
|
#if ENABLED(HOST_ACTION_COMMANDS)
|
351
|
|
- if (!runout.host_handling
|
|
353
|
+ if (run_runout_script
|
352
|
354
|
&& ( strstr(FILAMENT_RUNOUT_SCRIPT, "M600")
|
353
|
355
|
|| strstr(FILAMENT_RUNOUT_SCRIPT, "M125")
|
354
|
356
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
@@ -372,10 +374,9 @@ void disable_all_steppers() {
|
372
|
374
|
SERIAL_ECHOPGM(" " ACTION_REASON_ON_FILAMENT_RUNOUT " ");
|
373
|
375
|
SERIAL_CHAR(tool);
|
374
|
376
|
SERIAL_EOL();
|
375
|
|
-
|
376
|
377
|
#endif // HOST_ACTION_COMMANDS
|
377
|
378
|
|
378
|
|
- if (!runout.host_handling)
|
|
379
|
+ if (run_runout_script)
|
379
|
380
|
enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
|
380
|
381
|
}
|
381
|
382
|
|
|
@@ -385,7 +386,7 @@ void disable_all_steppers() {
|
385
|
386
|
|
386
|
387
|
void event_probe_failure() {
|
387
|
388
|
#ifdef G29_FAILURE_COMMANDS
|
388
|
|
- process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
|
|
389
|
+ gcode.process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
|
389
|
390
|
#endif
|
390
|
391
|
#ifdef ACTION_ON_G29_FAILURE
|
391
|
392
|
host_action(PSTR(ACTION_ON_G29_FAILURE)); }
|
|
@@ -403,7 +404,7 @@ void disable_all_steppers() {
|
403
|
404
|
host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"));
|
404
|
405
|
#endif
|
405
|
406
|
#ifdef G29_RECOVER_COMMANDS
|
406
|
|
- process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
|
|
407
|
+ gcode.process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
|
407
|
408
|
#endif
|
408
|
409
|
#ifdef ACTION_ON_G29_RECOVER
|
409
|
410
|
host_action(PSTR(ACTION_ON_G29_RECOVER));
|