Parcourir la source

Remote streamer improvements (#12982)

InsanityAutomation il y a 5 ans
Parent
révision
48a3502656
78 fichiers modifiés avec 1135 ajouts et 171 suppressions
  1. 15
    2
      Marlin/Configuration_adv.h
  2. 33
    1
      Marlin/src/Marlin.cpp
  3. 24
    0
      Marlin/src/Marlin.h
  4. 15
    2
      Marlin/src/config/default/Configuration_adv.h
  5. 15
    2
      Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
  6. 15
    2
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  7. 15
    2
      Marlin/src/config/examples/Anet/A2/Configuration_adv.h
  8. 15
    2
      Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
  9. 15
    2
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  10. 15
    2
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  11. 15
    2
      Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h
  12. 15
    2
      Marlin/src/config/examples/ArmEd/Configuration_adv.h
  13. 15
    2
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  14. 15
    2
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
  15. 15
    2
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  16. 15
    2
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  17. 15
    2
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  18. 15
    2
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  19. 15
    2
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  20. 15
    2
      Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
  21. 15
    2
      Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
  22. 15
    2
      Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
  23. 15
    2
      Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
  24. 15
    2
      Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
  25. 15
    2
      Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
  26. 15
    2
      Marlin/src/config/examples/Einstart-S/Configuration_adv.h
  27. 15
    2
      Marlin/src/config/examples/Felix/Configuration_adv.h
  28. 15
    2
      Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h
  29. 15
    2
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  30. 15
    2
      Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
  31. 15
    2
      Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
  32. 15
    2
      Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
  33. 15
    2
      Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
  34. 15
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  35. 15
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  36. 15
    2
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  37. 15
    2
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  38. 15
    2
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  39. 15
    2
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  40. 15
    2
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  41. 15
    2
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  42. 15
    2
      Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
  43. 15
    2
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  44. 15
    2
      Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h
  45. 15
    2
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  46. 15
    2
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  47. 15
    2
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  48. 15
    2
      Marlin/src/config/examples/TheBorg/Configuration_adv.h
  49. 15
    2
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  50. 15
    2
      Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
  51. 15
    2
      Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
  52. 15
    2
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  53. 15
    2
      Marlin/src/config/examples/VORONDesign/Configuration_adv.h
  54. 15
    2
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  55. 15
    2
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  56. 15
    2
      Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h
  57. 15
    2
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  58. 15
    2
      Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
  59. 15
    2
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  60. 15
    2
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
  61. 15
    2
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  62. 15
    2
      Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
  63. 15
    2
      Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
  64. 15
    2
      Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
  65. 15
    2
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  66. 15
    2
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  67. 15
    2
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  68. 15
    2
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  69. 15
    2
      Marlin/src/config/examples/makibox/Configuration_adv.h
  70. 15
    2
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  71. 15
    2
      Marlin/src/config/examples/wt150/Configuration_adv.h
  72. 8
    4
      Marlin/src/feature/pause.cpp
  73. 4
    2
      Marlin/src/feature/runout.h
  74. 2
    2
      Marlin/src/gcode/gcode.cpp
  75. 2
    2
      Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
  76. 2
    0
      Marlin/src/inc/Conditionals_LCD.h
  77. 23
    21
      Marlin/src/lcd/menu/menu_main.cpp
  78. 2
    1
      buildroot/share/tests/teensy35_tests

+ 15
- 2
Marlin/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 33
- 1
Marlin/src/Marlin.cpp Voir le fichier

@@ -311,6 +311,38 @@ void disable_all_steppers() {
311 311
   disable_e_steppers();
312 312
 }
313 313
 
314
+#if HAS_ACTION_COMMANDS
315
+
316
+  void host_action(const char * const pstr, const bool eol=true) {
317
+    SERIAL_ECHOPGM("//action:");
318
+    serialprintPGM(pstr);
319
+    if (eol) SERIAL_EOL();
320
+  }
321
+
322
+  #ifdef ACTION_ON_KILL
323
+    void host_action_kill() { host_action(PSTR(ACTION_ON_KILL)); }
324
+  #endif
325
+  #ifdef ACTION_ON_PAUSE
326
+    void host_action_pause() { host_action(PSTR(ACTION_ON_PAUSE)); }
327
+  #endif
328
+  #ifdef ACTION_ON_PAUSED
329
+    void host_action_paused() { host_action(PSTR(ACTION_ON_PAUSED)); }
330
+  #endif
331
+  #ifdef ACTION_ON_RESUME
332
+    void host_action_resume() { host_action(PSTR(ACTION_ON_RESUME)); }
333
+  #endif
334
+  #ifdef ACTION_ON_RESUMED
335
+    void host_action_resumed() { host_action(PSTR(ACTION_ON_RESUMED)); }
336
+  #endif
337
+  #ifdef ACTION_ON_CANCEL
338
+    void host_action_cancel() { host_action(PSTR(ACTION_ON_CANCEL)); }
339
+  #endif
340
+  #ifdef ACTION_ON_FILAMENT_RUNOUT
341
+    void host_action_filament_runout(const bool eol/*=true*/) { host_action(PSTR(ACTION_ON_FILAMENT_RUNOUT), eol); }
342
+  #endif
343
+
344
+#endif // HAS_ACTION_COMMANDS
345
+
314 346
 /**
315 347
  * Manage several activities:
316 348
  *  - Check for Filament Runout
@@ -618,7 +650,7 @@ void kill(PGM_P const lcd_msg/*=NULL*/) {
618 650
   #endif
619 651
 
620 652
   #ifdef ACTION_ON_KILL
621
-    SERIAL_ECHOLNPGM("//action:" ACTION_ON_KILL);
653
+    host_action_kill();
622 654
   #endif
623 655
 
624 656
   minkill();

+ 24
- 0
Marlin/src/Marlin.h Voir le fichier

@@ -369,3 +369,27 @@ void protected_pin_err();
369 369
 #if HAS_SUICIDE
370 370
   inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
371 371
 #endif
372
+
373
+#if HAS_ACTION_COMMANDS
374
+  #ifdef ACTION_ON_KILL
375
+    void host_action_kill();
376
+  #endif
377
+  #ifdef ACTION_ON_PAUSE
378
+    void host_action_pause();
379
+  #endif
380
+  #ifdef ACTION_ON_PAUSED
381
+    void host_action_paused();
382
+  #endif
383
+  #ifdef ACTION_ON_RESUME
384
+    void host_action_resume();
385
+  #endif
386
+  #ifdef ACTION_ON_RESUMED
387
+    void host_action_resumed();
388
+  #endif
389
+  #ifdef ACTION_ON_CANCEL
390
+    void host_action_cancel();
391
+  #endif
392
+  #ifdef ACTION_ON_FILAMENT_RUNOUT
393
+    void host_action_filament_runout(const bool eol=true);
394
+  #endif
395
+#endif

+ 15
- 2
Marlin/src/config/default/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h Voir le fichier

@@ -1951,9 +1951,22 @@
1951 1951
  * Specify an action command to send to the host on pause and resume.
1952 1952
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1953 1953
  * The host must be configured to handle the action command.
1954
+ * 
1955
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1956
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1957
+ * 
1958
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1959
+ *                    change actions and the host needs to stop sending commands
1960
+ *                    until the machine is ready to resume. (M125/M600)
1961
+ * 
1962
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1963
+ *                    print is canceled from the LCD menu.
1954 1964
  */
1955
-//#define ACTION_ON_PAUSE "pause"
1956
-//#define ACTION_ON_RESUME "resume"
1965
+//#define ACTION_ON_PAUSE   "pause"
1966
+//#define ACTION_ON_RESUME  "resume"
1967
+//#define ACTION_ON_PAUSED  "paused"
1968
+//#define ACTION_ON_RESUMED "resumed"
1969
+//#define ACTION_ON_CANCEL  "cancel"
1957 1970
 
1958 1971
 //===========================================================================
1959 1972
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Anet/A2/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Anet/A6/Configuration_adv.h Voir le fichier

@@ -1947,9 +1947,22 @@
1947 1947
  * Specify an action command to send to the host on pause and resume.
1948 1948
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1949 1949
  * The host must be configured to handle the action command.
1950
+ * 
1951
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1952
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1953
+ * 
1954
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1955
+ *                    change actions and the host needs to stop sending commands
1956
+ *                    until the machine is ready to resume. (M125/M600)
1957
+ * 
1958
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1959
+ *                    print is canceled from the LCD menu.
1950 1960
  */
1951
-//#define ACTION_ON_PAUSE "pause"
1952
-//#define ACTION_ON_RESUME "resume"
1961
+//#define ACTION_ON_PAUSE   "pause"
1962
+//#define ACTION_ON_RESUME  "resume"
1963
+//#define ACTION_ON_PAUSED  "paused"
1964
+//#define ACTION_ON_RESUMED "resumed"
1965
+//#define ACTION_ON_CANCEL  "cancel"
1953 1966
 
1954 1967
 //===========================================================================
1955 1968
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Anet/A8/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/ArmEd/Configuration_adv.h Voir le fichier

@@ -1953,9 +1953,22 @@
1953 1953
  * Specify an action command to send to the host on pause and resume.
1954 1954
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1955 1955
  * The host must be configured to handle the action command.
1956
+ * 
1957
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1958
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1959
+ * 
1960
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1961
+ *                    change actions and the host needs to stop sending commands
1962
+ *                    until the machine is ready to resume. (M125/M600)
1963
+ * 
1964
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1965
+ *                    print is canceled from the LCD menu.
1956 1966
  */
1957
-//#define ACTION_ON_PAUSE "pause"
1958
-//#define ACTION_ON_RESUME "resume"
1967
+//#define ACTION_ON_PAUSE   "pause"
1968
+//#define ACTION_ON_RESUME  "resume"
1969
+//#define ACTION_ON_PAUSED  "paused"
1970
+//#define ACTION_ON_RESUMED "resumed"
1971
+//#define ACTION_ON_CANCEL  "cancel"
1959 1972
 
1960 1973
 //===========================================================================
1961 1974
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h Voir le fichier

@@ -1947,9 +1947,22 @@
1947 1947
  * Specify an action command to send to the host on pause and resume.
1948 1948
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1949 1949
  * The host must be configured to handle the action command.
1950
+ * 
1951
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1952
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1953
+ * 
1954
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1955
+ *                    change actions and the host needs to stop sending commands
1956
+ *                    until the machine is ready to resume. (M125/M600)
1957
+ * 
1958
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1959
+ *                    print is canceled from the LCD menu.
1950 1960
  */
1951
-//#define ACTION_ON_PAUSE "pause"
1952
-//#define ACTION_ON_RESUME "resume"
1961
+//#define ACTION_ON_PAUSE   "pause"
1962
+//#define ACTION_ON_RESUME  "resume"
1963
+//#define ACTION_ON_PAUSED  "paused"
1964
+//#define ACTION_ON_RESUMED "resumed"
1965
+//#define ACTION_ON_CANCEL  "cancel"
1953 1966
 
1954 1967
 //===========================================================================
1955 1968
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h Voir le fichier

@@ -1956,9 +1956,22 @@
1956 1956
  * Specify an action command to send to the host on pause and resume.
1957 1957
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1958 1958
  * The host must be configured to handle the action command.
1959
+ * 
1960
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1961
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1962
+ * 
1963
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1964
+ *                    change actions and the host needs to stop sending commands
1965
+ *                    until the machine is ready to resume. (M125/M600)
1966
+ * 
1967
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1968
+ *                    print is canceled from the LCD menu.
1959 1969
  */
1960
-//#define ACTION_ON_PAUSE "pause"
1961
-//#define ACTION_ON_RESUME "resume"
1970
+//#define ACTION_ON_PAUSE   "pause"
1971
+//#define ACTION_ON_RESUME  "resume"
1972
+//#define ACTION_ON_PAUSED  "paused"
1973
+//#define ACTION_ON_RESUMED "resumed"
1974
+//#define ACTION_ON_CANCEL  "cancel"
1962 1975
 
1963 1976
 //===========================================================================
1964 1977
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Cartesio/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h Voir le fichier

@@ -1951,9 +1951,22 @@
1951 1951
  * Specify an action command to send to the host on pause and resume.
1952 1952
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1953 1953
  * The host must be configured to handle the action command.
1954
+ * 
1955
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1956
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1957
+ * 
1958
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1959
+ *                    change actions and the host needs to stop sending commands
1960
+ *                    until the machine is ready to resume. (M125/M600)
1961
+ * 
1962
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1963
+ *                    print is canceled from the LCD menu.
1954 1964
  */
1955
-//#define ACTION_ON_PAUSE "pause"
1956
-//#define ACTION_ON_RESUME "resume"
1965
+//#define ACTION_ON_PAUSE   "pause"
1966
+//#define ACTION_ON_RESUME  "resume"
1967
+//#define ACTION_ON_PAUSED  "paused"
1968
+//#define ACTION_ON_RESUMED "resumed"
1969
+//#define ACTION_ON_CANCEL  "cancel"
1957 1970
 
1958 1971
 //===========================================================================
1959 1972
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Einstart-S/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Felix/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h Voir le fichier

@@ -1947,9 +1947,22 @@
1947 1947
  * Specify an action command to send to the host on pause and resume.
1948 1948
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1949 1949
  * The host must be configured to handle the action command.
1950
+ * 
1951
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1952
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1953
+ * 
1954
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1955
+ *                    change actions and the host needs to stop sending commands
1956
+ *                    until the machine is ready to resume. (M125/M600)
1957
+ * 
1958
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1959
+ *                    print is canceled from the LCD menu.
1950 1960
  */
1951
-//#define ACTION_ON_PAUSE "pause"
1952
-//#define ACTION_ON_RESUME "resume"
1961
+//#define ACTION_ON_PAUSE   "pause"
1962
+//#define ACTION_ON_RESUME  "resume"
1963
+//#define ACTION_ON_PAUSED  "paused"
1964
+//#define ACTION_ON_RESUMED "resumed"
1965
+//#define ACTION_ON_CANCEL  "cancel"
1953 1966
 
1954 1967
 //===========================================================================
1955 1968
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h Voir le fichier

@@ -1952,9 +1952,22 @@
1952 1952
  * Specify an action command to send to the host on pause and resume.
1953 1953
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1954 1954
  * The host must be configured to handle the action command.
1955
+ * 
1956
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1957
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1958
+ * 
1959
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1960
+ *                    change actions and the host needs to stop sending commands
1961
+ *                    until the machine is ready to resume. (M125/M600)
1962
+ * 
1963
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1964
+ *                    print is canceled from the LCD menu.
1955 1965
  */
1956
-#define ACTION_ON_PAUSE "pause"
1957
-#define ACTION_ON_RESUME "resume"
1966
+#define ACTION_ON_PAUSE   "pause"
1967
+#define ACTION_ON_RESUME  "resume"
1968
+//#define ACTION_ON_PAUSED  "paused"
1969
+//#define ACTION_ON_RESUMED "resumed"
1970
+//#define ACTION_ON_CANCEL  "cancel"
1958 1971
 
1959 1972
 //===========================================================================
1960 1973
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h Voir le fichier

@@ -1953,9 +1953,22 @@
1953 1953
  * Specify an action command to send to the host on pause and resume.
1954 1954
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1955 1955
  * The host must be configured to handle the action command.
1956
+ * 
1957
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1958
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1959
+ * 
1960
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1961
+ *                    change actions and the host needs to stop sending commands
1962
+ *                    until the machine is ready to resume. (M125/M600)
1963
+ * 
1964
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1965
+ *                    print is canceled from the LCD menu.
1956 1966
  */
1957
-#define ACTION_ON_PAUSE "pause"
1958
-#define ACTION_ON_RESUME "resume"
1967
+#define ACTION_ON_PAUSE   "pause"
1968
+#define ACTION_ON_RESUME  "resume"
1969
+//#define ACTION_ON_PAUSED  "paused"
1970
+//#define ACTION_ON_RESUMED "resumed"
1971
+//#define ACTION_ON_CANCEL  "cancel"
1959 1972
 
1960 1973
 //===========================================================================
1961 1974
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-#define ACTION_ON_PAUSE "pause"
1953
-#define ACTION_ON_RESUME "resume"
1962
+#define ACTION_ON_PAUSE   "pause"
1963
+#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h Voir le fichier

@@ -1934,9 +1934,22 @@
1934 1934
  * Specify an action command to send to the host on pause and resume.
1935 1935
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1936 1936
  * The host must be configured to handle the action command.
1937
+ * 
1938
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1939
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1940
+ * 
1941
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1942
+ *                    change actions and the host needs to stop sending commands
1943
+ *                    until the machine is ready to resume. (M125/M600)
1944
+ * 
1945
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1946
+ *                    print is canceled from the LCD menu.
1937 1947
  */
1938
-//#define ACTION_ON_PAUSE "pause"
1939
-//#define ACTION_ON_RESUME "resume"
1948
+//#define ACTION_ON_PAUSE   "pause"
1949
+//#define ACTION_ON_RESUME  "resume"
1950
+//#define ACTION_ON_PAUSED  "paused"
1951
+//#define ACTION_ON_RESUMED "resumed"
1952
+//#define ACTION_ON_CANCEL  "cancel"
1940 1953
 
1941 1954
 //===========================================================================
1942 1955
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/MakerParts/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Mks/Robin/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h Voir le fichier

@@ -1956,9 +1956,22 @@
1956 1956
  * Specify an action command to send to the host on pause and resume.
1957 1957
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1958 1958
  * The host must be configured to handle the action command.
1959
+ * 
1960
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1961
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1962
+ * 
1963
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1964
+ *                    change actions and the host needs to stop sending commands
1965
+ *                    until the machine is ready to resume. (M125/M600)
1966
+ * 
1967
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1968
+ *                    print is canceled from the LCD menu.
1959 1969
  */
1960
-//#define ACTION_ON_PAUSE "pause"
1961
-//#define ACTION_ON_RESUME "resume"
1970
+//#define ACTION_ON_PAUSE   "pause"
1971
+//#define ACTION_ON_RESUME  "resume"
1972
+//#define ACTION_ON_PAUSED  "paused"
1973
+//#define ACTION_ON_RESUMED "resumed"
1974
+//#define ACTION_ON_CANCEL  "cancel"
1962 1975
 
1963 1976
 //===========================================================================
1964 1977
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/RigidBot/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/SCARA/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/TheBorg/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/VORONDesign/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h Voir le fichier

@@ -1961,9 +1961,22 @@
1961 1961
  * Specify an action command to send to the host on pause and resume.
1962 1962
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1963 1963
  * The host must be configured to handle the action command.
1964
+ * 
1965
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1966
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1967
+ * 
1968
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1969
+ *                    change actions and the host needs to stop sending commands
1970
+ *                    until the machine is ready to resume. (M125/M600)
1971
+ * 
1972
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1973
+ *                    print is canceled from the LCD menu.
1964 1974
  */
1965
-//#define ACTION_ON_PAUSE "pause"
1966
-//#define ACTION_ON_RESUME "resume"
1975
+//#define ACTION_ON_PAUSE   "pause"
1976
+//#define ACTION_ON_RESUME  "resume"
1977
+//#define ACTION_ON_PAUSED  "paused"
1978
+//#define ACTION_ON_RESUMED "resumed"
1979
+//#define ACTION_ON_CANCEL  "cancel"
1967 1980
 
1968 1981
 //===========================================================================
1969 1982
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h Voir le fichier

@@ -1951,9 +1951,22 @@
1951 1951
  * Specify an action command to send to the host on pause and resume.
1952 1952
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1953 1953
  * The host must be configured to handle the action command.
1954
+ * 
1955
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1956
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1957
+ * 
1958
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1959
+ *                    change actions and the host needs to stop sending commands
1960
+ *                    until the machine is ready to resume. (M125/M600)
1961
+ * 
1962
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1963
+ *                    print is canceled from the LCD menu.
1954 1964
  */
1955
-//#define ACTION_ON_PAUSE "pause"
1956
-//#define ACTION_ON_RESUME "resume"
1965
+//#define ACTION_ON_PAUSE   "pause"
1966
+//#define ACTION_ON_RESUME  "resume"
1967
+//#define ACTION_ON_PAUSED  "paused"
1968
+//#define ACTION_ON_RESUMED "resumed"
1969
+//#define ACTION_ON_CANCEL  "cancel"
1957 1970
 
1958 1971
 //===========================================================================
1959 1972
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h Voir le fichier

@@ -1938,9 +1938,22 @@
1938 1938
  * Specify an action command to send to the host on pause and resume.
1939 1939
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1940 1940
  * The host must be configured to handle the action command.
1941
+ * 
1942
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1943
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1944
+ * 
1945
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1946
+ *                    change actions and the host needs to stop sending commands
1947
+ *                    until the machine is ready to resume. (M125/M600)
1948
+ * 
1949
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1950
+ *                    print is canceled from the LCD menu.
1941 1951
  */
1942
-//#define ACTION_ON_PAUSE "pause"
1943
-//#define ACTION_ON_RESUME "resume"
1952
+//#define ACTION_ON_PAUSE   "pause"
1953
+//#define ACTION_ON_RESUME  "resume"
1954
+//#define ACTION_ON_PAUSED  "paused"
1955
+//#define ACTION_ON_RESUMED "resumed"
1956
+//#define ACTION_ON_CANCEL  "cancel"
1944 1957
 
1945 1958
 //===========================================================================
1946 1959
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/generic/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h Voir le fichier

@@ -1950,9 +1950,22 @@
1950 1950
  * Specify an action command to send to the host on pause and resume.
1951 1951
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1952 1952
  * The host must be configured to handle the action command.
1953
+ * 
1954
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1955
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1956
+ * 
1957
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1958
+ *                    change actions and the host needs to stop sending commands
1959
+ *                    until the machine is ready to resume. (M125/M600)
1960
+ * 
1961
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1962
+ *                    print is canceled from the LCD menu.
1953 1963
  */
1954
-//#define ACTION_ON_PAUSE "pause"
1955
-//#define ACTION_ON_RESUME "resume"
1964
+//#define ACTION_ON_PAUSE   "pause"
1965
+//#define ACTION_ON_RESUME  "resume"
1966
+//#define ACTION_ON_PAUSED  "paused"
1967
+//#define ACTION_ON_RESUMED "resumed"
1968
+//#define ACTION_ON_CANCEL  "cancel"
1956 1969
 
1957 1970
 //===========================================================================
1958 1971
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/makibox/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h Voir le fichier

@@ -1948,9 +1948,22 @@
1948 1948
  * Specify an action command to send to the host on pause and resume.
1949 1949
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1950 1950
  * The host must be configured to handle the action command.
1951
+ * 
1952
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1953
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1954
+ * 
1955
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1956
+ *                    change actions and the host needs to stop sending commands
1957
+ *                    until the machine is ready to resume. (M125/M600)
1958
+ * 
1959
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1960
+ *                    print is canceled from the LCD menu.
1951 1961
  */
1952
-//#define ACTION_ON_PAUSE "pause"
1953
-//#define ACTION_ON_RESUME "resume"
1962
+//#define ACTION_ON_PAUSE   "pause"
1963
+//#define ACTION_ON_RESUME  "resume"
1964
+//#define ACTION_ON_PAUSED  "paused"
1965
+//#define ACTION_ON_RESUMED "resumed"
1966
+//#define ACTION_ON_CANCEL  "cancel"
1954 1967
 
1955 1968
 //===========================================================================
1956 1969
 //====================== I2C Position Encoder Settings ======================

+ 15
- 2
Marlin/src/config/examples/wt150/Configuration_adv.h Voir le fichier

@@ -1949,9 +1949,22 @@
1949 1949
  * Specify an action command to send to the host on pause and resume.
1950 1950
  * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
1951 1951
  * The host must be configured to handle the action command.
1952
+ * 
1953
+ *   PAUSE / RESUME : Used in non-parking scenarios where the host handles the
1954
+ *                    action while Marlin continues to process G-Code. (M24/M25)
1955
+ * 
1956
+ * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament-
1957
+ *                    change actions and the host needs to stop sending commands
1958
+ *                    until the machine is ready to resume. (M125/M600)
1959
+ * 
1960
+ *           CANCEL : Instructs the host to abort the print job. Used when the
1961
+ *                    print is canceled from the LCD menu.
1952 1962
  */
1953
-//#define ACTION_ON_PAUSE "pause"
1954
-//#define ACTION_ON_RESUME "resume"
1963
+//#define ACTION_ON_PAUSE   "pause"
1964
+//#define ACTION_ON_RESUME  "resume"
1965
+//#define ACTION_ON_PAUSED  "paused"
1966
+//#define ACTION_ON_RESUMED "resumed"
1967
+//#define ACTION_ON_CANCEL  "cancel"
1955 1968
 
1956 1969
 //===========================================================================
1957 1970
 //====================== I2C Position Encoder Settings ======================

+ 8
- 4
Marlin/src/feature/pause.cpp Voir le fichier

@@ -323,8 +323,10 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
323 323
 
324 324
   if (did_pause_print) return false; // already paused
325 325
 
326
-  #ifdef ACTION_ON_PAUSE
327
-    SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
326
+  #ifdef ACTION_ON_PAUSED
327
+    host_action_paused();
328
+  #elif defined(ACTION_ON_PAUSE)
329
+    host_action_pause();
328 330
   #endif
329 331
 
330 332
   #if HAS_LCD_MENU
@@ -570,8 +572,10 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
570 572
     lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
571 573
   #endif
572 574
 
573
-  #ifdef ACTION_ON_RESUME
574
-    SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
575
+  #ifdef ACTION_ON_RESUMED
576
+    host_action_resumed();
577
+  #elif defined(ACTION_ON_RESUME)
578
+    host_action_resume();
575 579
   #endif
576 580
 
577 581
   --did_pause_print;

+ 4
- 2
Marlin/src/feature/runout.h Voir le fichier

@@ -99,9 +99,11 @@ class TFilamentMonitor : public FilamentMonitorBase {
99 99
           #endif
100 100
           #ifdef ACTION_ON_FILAMENT_RUNOUT
101 101
             #if NUM_RUNOUT_SENSORS > 1
102
-              SERIAL_ECHOLNPAIR("//action:" ACTION_ON_FILAMENT_RUNOUT " ", int(active_extruder));
102
+              host_action_filament_runout(false);
103
+              SERIAL_CHAR(' ');
104
+              SERIAL_ECHO(int(active_extruder));
103 105
             #else
104
-              SERIAL_ECHOLNPGM("//action:" ACTION_ON_FILAMENT_RUNOUT);
106
+              host_action_filament_runout();
105 107
             #endif
106 108
             if (!IS_SD_PRINTING())
107 109
               reset();

+ 2
- 2
Marlin/src/gcode/gcode.cpp Voir le fichier

@@ -130,7 +130,7 @@ void GcodeSuite::dwell(millis_t time) {
130 130
     while (G29()) { // G29 should return true for failed probes ONLY
131 131
       if (retries--) {
132 132
         #ifdef G29_ACTION_ON_RECOVER
133
-          SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_RECOVER);
133
+          host_action(PSTR(G29_ACTION_ON_RECOVER));
134 134
         #endif
135 135
         #ifdef G29_RECOVER_COMMANDS
136 136
           process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
@@ -141,7 +141,7 @@ void GcodeSuite::dwell(millis_t time) {
141 141
           process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
142 142
         #endif
143 143
         #ifdef G29_ACTION_ON_FAILURE
144
-          SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_FAILURE);
144
+          host_action(PSTR(G29_ACTION_ON_FAILURE));
145 145
         #endif
146 146
         #if ENABLED(G29_HALT_ON_FAILURE)
147 147
           kill(PSTR(MSG_ERR_PROBING_FAILED));

+ 2
- 2
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp Voir le fichier

@@ -104,7 +104,7 @@ void GcodeSuite::M24() {
104 104
   }
105 105
 
106 106
   #ifdef ACTION_ON_RESUME
107
-    SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
107
+    host_action_resume();
108 108
   #endif
109 109
 
110 110
   ui.reset_status();
@@ -127,7 +127,7 @@ void GcodeSuite::M25() {
127 127
     ui.reset_status();
128 128
 
129 129
     #ifdef ACTION_ON_PAUSE
130
-      SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
130
+      host_action_pause();
131 131
     #endif
132 132
   #endif
133 133
 }

+ 2
- 0
Marlin/src/inc/Conditionals_LCD.h Voir le fichier

@@ -526,3 +526,5 @@
526 526
 #define IS_SCARA     (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
527 527
 #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
528 528
 #define IS_CARTESIAN !IS_KINEMATIC
529
+
530
+#define HAS_ACTION_COMMANDS (defined(ACTION_ON_KILL) || defined(ACTION_ON_PAUSE) || defined(ACTION_ON_PAUSED) || defined(ACTION_ON_RESUME) || defined(ACTION_ON_RESUMED) || defined(ACTION_ON_CANCEL) || defined(G29_ACTION_ON_RECOVER) || defined(G29_ACTION_ON_FAILURE) || defined(ACTION_ON_FILAMENT_RUNOUT))

+ 23
- 21
Marlin/src/lcd/menu/menu_main.cpp Voir le fichier

@@ -38,6 +38,10 @@
38 38
   #include "../../feature/power_loss_recovery.h"
39 39
 #endif
40 40
 
41
+#if ENABLED(SDSUPPORT)
42
+  #include "../../sd/cardreader.h"
43
+#endif
44
+
41 45
 void lcd_pause() {
42 46
   #if ENABLED(POWER_LOSS_RECOVERY)
43 47
     if (recovery.enabled) recovery.save(true, false);
@@ -49,7 +53,7 @@ void lcd_pause() {
49 53
   #elif ENABLED(SDSUPPORT)
50 54
     enqueue_and_echo_commands_P(PSTR("M25"));
51 55
   #elif defined(ACTION_ON_PAUSE)
52
-    SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
56
+    host_action_pause();
53 57
   #endif
54 58
   planner.synchronize();
55 59
 }
@@ -58,29 +62,28 @@ void lcd_resume() {
58 62
   #if ENABLED(SDSUPPORT)
59 63
     if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
60 64
   #elif defined(ACTION_ON_RESUME)
61
-    SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
65
+    host_action_resume();
62 66
   #endif
63 67
 }
64 68
 
65
-#if ENABLED(SDSUPPORT)
66
-
67
-  #include "../../sd/cardreader.h"
68
-
69
-  void lcd_sdcard_stop() {
69
+void lcd_stop() {
70
+  #if ENABLED(SDSUPPORT)
70 71
     wait_for_heatup = wait_for_user = false;
71 72
     card.flag.abort_sd_printing = true;
72
-    ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1);
73
-    ui.return_to_status();
74
-  }
75
-
76
-  void menu_sdcard_abort_confirm() {
77
-    START_MENU();
78
-    MENU_BACK(MSG_MAIN);
79
-    MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop);
80
-    END_MENU();
81
-  }
73
+  #endif
74
+  #ifdef ACTION_ON_CANCEL
75
+    host_action_cancel();
76
+  #endif
77
+  ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1);
78
+  ui.return_to_status();
79
+}
82 80
 
83
-#endif // SDSUPPORT
81
+void menu_abort_confirm() {
82
+  START_MENU();
83
+  MENU_BACK(MSG_MAIN);
84
+  MENU_ITEM(function, MSG_STOP_PRINT, lcd_stop);
85
+  END_MENU();
86
+}
84 87
 
85 88
 void menu_tune();
86 89
 void menu_motion();
@@ -100,9 +103,8 @@ void menu_main() {
100 103
 
101 104
   if (busy) {
102 105
     MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
103
-    #if ENABLED(SDSUPPORT)
104
-      if (card.isFileOpen())
105
-        MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm);
106
+    #if ENABLED(SDSUPPORT) || defined(ACTION_ON_CANCEL)
107
+      MENU_ITEM(submenu, MSG_STOP_PRINT, menu_abort_confirm);
106 108
     #endif
107 109
     #if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT)
108 110
       if (card.isFileOpen())

+ 2
- 1
buildroot/share/tests/teensy35_tests Voir le fichier

@@ -24,7 +24,8 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT \
24 24
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
25 25
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
26 26
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
27
-           ADVANCED_PAUSE_FEATURE LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA PARK_HEAD_ON_PAUSE
27
+           ADVANCED_PAUSE_FEATURE LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA PARK_HEAD_ON_PAUSE \
28
+           ACTION_ON_KILL ACTION_ON_PAUSE ACTION_ON_PAUSED ACTION_ON_RESUME ACTION_ON_RESUMED ACTION_ON_CANCEL
28 29
 opt_set I2C_SLAVE_ADDRESS 63
29 30
 opt_set GRID_MAX_POINTS_X 16
30 31
 exec_test $1 $2 "Teensy3.5 with many features"

Chargement…
Annuler
Enregistrer