Sfoglia il codice sorgente

Followup to #13039 (#13163)

- Fix compile error when accessing `process_subcommands_now_P`.
- Use `const` var eliminating double-negative (to make code more understandable).
Marcio Teixeira 6 anni fa
parent
commit
9f0e1834ec
1 ha cambiato i file con 6 aggiunte e 5 eliminazioni
  1. 6
    5
      Marlin/src/Marlin.cpp

+ 6
- 5
Marlin/src/Marlin.cpp Vedi File

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

Loading…
Annulla
Salva