From 48a3502656b29439ae7172d24259353dc3183dd9 Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Sun, 27 Jan 2019 23:43:13 -0500 Subject: [PATCH] Remote streamer improvements (#12982) --- Marlin/Configuration_adv.h | 17 ++++++- Marlin/src/Marlin.cpp | 34 +++++++++++++- Marlin/src/Marlin.h | 24 ++++++++++ Marlin/src/config/default/Configuration_adv.h | 17 ++++++- .../3DFabXYZ/Migbot/Configuration_adv.h | 17 ++++++- .../AlephObjects/TAZ4/Configuration_adv.h | 17 ++++++- .../examples/Anet/A2/Configuration_adv.h | 17 ++++++- .../examples/Anet/A2plus/Configuration_adv.h | 17 ++++++- .../examples/Anet/A6/Configuration_adv.h | 17 ++++++- .../examples/Anet/A8/Configuration_adv.h | 17 ++++++- .../examples/AnyCubic/i3/Configuration_adv.h | 17 ++++++- .../config/examples/ArmEd/Configuration_adv.h | 17 ++++++- .../BIBO/TouchX/cyclops/Configuration_adv.h | 17 ++++++- .../BIBO/TouchX/default/Configuration_adv.h | 17 ++++++- .../examples/BQ/Hephestos/Configuration_adv.h | 17 ++++++- .../BQ/Hephestos_2/Configuration_adv.h | 17 ++++++- .../examples/BQ/WITBOX/Configuration_adv.h | 17 ++++++- .../examples/Cartesio/Configuration_adv.h | 17 ++++++- .../Creality/CR-10/Configuration_adv.h | 17 ++++++- .../Creality/CR-10S/Configuration_adv.h | 17 ++++++- .../Creality/CR-10mini/Configuration_adv.h | 17 ++++++- .../Creality/CR-8/Configuration_adv.h | 17 ++++++- .../Creality/Ender-2/Configuration_adv.h | 17 ++++++- .../Creality/Ender-3/Configuration_adv.h | 17 ++++++- .../Creality/Ender-4/Configuration_adv.h | 17 ++++++- .../examples/Einstart-S/Configuration_adv.h | 17 ++++++- .../config/examples/Felix/Configuration_adv.h | 17 ++++++- .../FlashForge/CreatorPro/Configuration_adv.h | 17 ++++++- .../FolgerTech/i3-2020/Configuration_adv.h | 17 ++++++- .../Formbot/Raptor/Configuration_adv.h | 17 ++++++- .../Formbot/T_Rex_2+/Configuration_adv.h | 17 ++++++- .../Formbot/T_Rex_3/Configuration_adv.h | 17 ++++++- .../Geeetech/MeCreator2/Configuration_adv.h | 17 ++++++- .../Prusa i3 Pro C/Configuration_adv.h | 17 ++++++- .../Prusa i3 Pro W/Configuration_adv.h | 17 ++++++- .../Infitary/i3-M508/Configuration_adv.h | 17 ++++++- .../examples/JGAurora/A5/Configuration_adv.h | 17 ++++++- .../examples/MakerParts/Configuration_adv.h | 17 ++++++- .../examples/Malyan/M150/Configuration_adv.h | 17 ++++++- .../examples/Malyan/M200/Configuration_adv.h | 17 ++++++- .../Micromake/C1/enhanced/Configuration_adv.h | 17 ++++++- .../examples/Mks/Robin/Configuration_adv.h | 17 ++++++- .../examples/Mks/Sbase/Configuration_adv.h | 17 ++++++- .../RapideLite/RL200/Configuration_adv.h | 17 ++++++- .../examples/RigidBot/Configuration_adv.h | 17 ++++++- .../config/examples/SCARA/Configuration_adv.h | 17 ++++++- .../examples/Sanguinololu/Configuration_adv.h | 17 ++++++- .../examples/TheBorg/Configuration_adv.h | 17 ++++++- .../examples/TinyBoy2/Configuration_adv.h | 17 ++++++- .../examples/Tronxy/X3A/Configuration_adv.h | 17 ++++++- .../UltiMachine/Archim1/Configuration_adv.h | 17 ++++++- .../UltiMachine/Archim2/Configuration_adv.h | 17 ++++++- .../examples/VORONDesign/Configuration_adv.h | 17 ++++++- .../Velleman/K8200/Configuration_adv.h | 17 ++++++- .../Velleman/K8400/Configuration_adv.h | 17 ++++++- .../WASP/PowerWASP/Configuration_adv.h | 17 ++++++- .../Wanhao/Duplicator 6/Configuration_adv.h | 17 ++++++- .../delta/Anycubic/Kossel/Configuration_adv.h | 17 ++++++- .../FLSUN/auto_calibrate/Configuration_adv.h | 17 ++++++- .../delta/FLSUN/kossel/Configuration_adv.h | 17 ++++++- .../FLSUN/kossel_mini/Configuration_adv.h | 17 ++++++- .../Geeetech/Rostock 301/Configuration_adv.h | 17 ++++++- .../delta/MKS/SBASE/Configuration_adv.h | 17 ++++++- .../Tevo Little Monster/Configuration_adv.h | 17 ++++++- .../delta/generic/Configuration_adv.h | 17 ++++++- .../delta/kossel_mini/Configuration_adv.h | 17 ++++++- .../delta/kossel_xl/Configuration_adv.h | 17 ++++++- .../gCreate/gMax1.5+/Configuration_adv.h | 17 ++++++- .../examples/makibox/Configuration_adv.h | 17 ++++++- .../tvrrug/Round2/Configuration_adv.h | 17 ++++++- .../config/examples/wt150/Configuration_adv.h | 17 ++++++- Marlin/src/feature/pause.cpp | 12 +++-- Marlin/src/feature/runout.h | 6 ++- Marlin/src/gcode/gcode.cpp | 4 +- .../sdcard/M20-M30_M32-M34_M524_M928.cpp | 4 +- Marlin/src/inc/Conditionals_LCD.h | 2 + Marlin/src/lcd/menu/menu_main.cpp | 44 ++++++++++--------- buildroot/share/tests/teensy35_tests | 3 +- 78 files changed, 1135 insertions(+), 171 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 888646f00..80b2006c4 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index 0f5b4bf37..b72c0b037 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -311,6 +311,38 @@ void disable_all_steppers() { disable_e_steppers(); } +#if HAS_ACTION_COMMANDS + + void host_action(const char * const pstr, const bool eol=true) { + SERIAL_ECHOPGM("//action:"); + serialprintPGM(pstr); + if (eol) SERIAL_EOL(); + } + + #ifdef ACTION_ON_KILL + void host_action_kill() { host_action(PSTR(ACTION_ON_KILL)); } + #endif + #ifdef ACTION_ON_PAUSE + void host_action_pause() { host_action(PSTR(ACTION_ON_PAUSE)); } + #endif + #ifdef ACTION_ON_PAUSED + void host_action_paused() { host_action(PSTR(ACTION_ON_PAUSED)); } + #endif + #ifdef ACTION_ON_RESUME + void host_action_resume() { host_action(PSTR(ACTION_ON_RESUME)); } + #endif + #ifdef ACTION_ON_RESUMED + void host_action_resumed() { host_action(PSTR(ACTION_ON_RESUMED)); } + #endif + #ifdef ACTION_ON_CANCEL + void host_action_cancel() { host_action(PSTR(ACTION_ON_CANCEL)); } + #endif + #ifdef ACTION_ON_FILAMENT_RUNOUT + void host_action_filament_runout(const bool eol/*=true*/) { host_action(PSTR(ACTION_ON_FILAMENT_RUNOUT), eol); } + #endif + +#endif // HAS_ACTION_COMMANDS + /** * Manage several activities: * - Check for Filament Runout @@ -618,7 +650,7 @@ void kill(PGM_P const lcd_msg/*=NULL*/) { #endif #ifdef ACTION_ON_KILL - SERIAL_ECHOLNPGM("//action:" ACTION_ON_KILL); + host_action_kill(); #endif minkill(); diff --git a/Marlin/src/Marlin.h b/Marlin/src/Marlin.h index b85410a40..cbd3df484 100644 --- a/Marlin/src/Marlin.h +++ b/Marlin/src/Marlin.h @@ -369,3 +369,27 @@ void protected_pin_err(); #if HAS_SUICIDE inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); } #endif + +#if HAS_ACTION_COMMANDS + #ifdef ACTION_ON_KILL + void host_action_kill(); + #endif + #ifdef ACTION_ON_PAUSE + void host_action_pause(); + #endif + #ifdef ACTION_ON_PAUSED + void host_action_paused(); + #endif + #ifdef ACTION_ON_RESUME + void host_action_resume(); + #endif + #ifdef ACTION_ON_RESUMED + void host_action_resumed(); + #endif + #ifdef ACTION_ON_CANCEL + void host_action_cancel(); + #endif + #ifdef ACTION_ON_FILAMENT_RUNOUT + void host_action_filament_runout(const bool eol=true); + #endif +#endif diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 888646f00..80b2006c4 100755 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h index 0f7445941..dda2aa821 100644 --- a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h +++ b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h @@ -1951,9 +1951,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 2c7bd6a00..6f106364a 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index d88f16205..8900f2bbc 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index d88f16205..8900f2bbc 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index e20c2976a..59f9649d6 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -1947,9 +1947,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 16bbafd57..3b802f4ef 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h index 25639d084..b32233cb9 100644 --- a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h +++ b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h index 7a59a6b72..c59a102de 100644 --- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h +++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h @@ -1953,9 +1953,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index 8150ed82e..34953d5c5 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -1947,9 +1947,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index ebff2aa81..49bdded98 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index 821427c36..e2f8e2c12 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 993cc2e51..7aba4c7a6 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -1956,9 +1956,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index 821427c36..e2f8e2c12 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 0639a8ac5..6079609f7 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index e18695391..e74e60f53 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -1951,9 +1951,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index 385e6f4b4..85e0cacb1 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index c9dd161f5..abec3fcd3 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index 51912cc64..6db478d3f 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 6b6a90350..7a9d291a1 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index cc876b82a..acb2a9e99 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index da31f348b..d419ce13a 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index e6c04ed30..861c078fd 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 5235a0099..7156f7ec2 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h index 04f8067be..b0b190422 100644 --- a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h +++ b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h @@ -1947,9 +1947,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 7612b2a86..50f5e1197 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index 9b0ddec2c..69463ec89 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -1952,9 +1952,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -#define ACTION_ON_PAUSE "pause" -#define ACTION_ON_RESUME "resume" +#define ACTION_ON_PAUSE "pause" +#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index 17e21cf71..e7514a379 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -1953,9 +1953,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -#define ACTION_ON_PAUSE "pause" -#define ACTION_ON_RESUME "resume" +#define ACTION_ON_PAUSE "pause" +#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h index 96fadb276..b739d6bb3 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -#define ACTION_ON_PAUSE "pause" -#define ACTION_ON_RESUME "resume" +#define ACTION_ON_PAUSE "pause" +#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h index 7e7ea3471..17372dc45 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -1934,9 +1934,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 3bce38855..bfc65c5ff 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 3bce38855..bfc65c5ff 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index d72ee85f1..2b7aa34b2 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index ee0bf3fc4..e2ca2430b 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 8c7cf4c22..49cc93961 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index 7746e354c..0b66f3fad 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 63cbfa5c8..1fef965e5 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index 2bf590f5d..6d5edc63f 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h index d78c7fb21..4b2c0945f 100644 --- a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index e98ef70c8..21df66119 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -1956,9 +1956,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h index cca3e3c3e..5cb89f0dd 100644 --- a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h +++ b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index 5e2b7c8ed..15776f2de 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index f83961f3b..89d81c653 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 7acdd42d1..6351d98fd 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 0da3efa11..2e64d0517 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index d69745dfb..a02c2a132 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index f360fdee1..008c73435 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h index bbc0c70f6..e90f2774a 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 37eefa95f..3ecb84f51 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h index 1cb0a31e8..a6c55b794 100644 --- a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h +++ b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index 213a6a8d6..b53168130 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -1961,9 +1961,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 6f4eb3ebd..f4635934f 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h index 4549c4d95..618dc94d8 100644 --- a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h +++ b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 63bfdf815..f43a80514 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 8e16c4663..d5e25c7ad 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index b203fa40c..32435d9cf 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index b203fa40c..32435d9cf 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 3528a170f..ccac889a1 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h index 172a24622..985d7869a 100644 --- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h @@ -1951,9 +1951,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h index 7d7c6a17b..f66f9bf3f 100644 --- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h index 815238556..40ab4efde 100644 --- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h @@ -1938,9 +1938,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index 3528a170f..ccac889a1 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index 3528a170f..ccac889a1 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index a0d739686..c7276b878 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -1950,9 +1950,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 8922064ea..0c2cd280e 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 8f1cbd193..233a5b682 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index db8a20282..c8740b376 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -1948,9 +1948,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index ea87df5c6..b719ec780 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -1949,9 +1949,22 @@ * Specify an action command to send to the host on pause and resume. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'. * The host must be configured to handle the action command. + * + * PAUSE / RESUME : Used in non-parking scenarios where the host handles the + * action while Marlin continues to process G-Code. (M24/M25) + * + * PAUSED / RESUMED : Used in scenarios where Marlin handles pause and filament- + * change actions and the host needs to stop sending commands + * until the machine is ready to resume. (M125/M600) + * + * CANCEL : Instructs the host to abort the print job. Used when the + * print is canceled from the LCD menu. */ -//#define ACTION_ON_PAUSE "pause" -//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSE "pause" +//#define ACTION_ON_RESUME "resume" +//#define ACTION_ON_PAUSED "paused" +//#define ACTION_ON_RESUMED "resumed" +//#define ACTION_ON_CANCEL "cancel" //=========================================================================== //====================== I2C Position Encoder Settings ====================== diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 7857bcff3..043c211ee 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -323,8 +323,10 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u if (did_pause_print) return false; // already paused - #ifdef ACTION_ON_PAUSE - SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE); + #ifdef ACTION_ON_PAUSED + host_action_paused(); + #elif defined(ACTION_ON_PAUSE) + host_action_pause(); #endif #if HAS_LCD_MENU @@ -570,8 +572,10 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS); #endif - #ifdef ACTION_ON_RESUME - SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME); + #ifdef ACTION_ON_RESUMED + host_action_resumed(); + #elif defined(ACTION_ON_RESUME) + host_action_resume(); #endif --did_pause_print; diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h index 199c70f93..48470e6c2 100644 --- a/Marlin/src/feature/runout.h +++ b/Marlin/src/feature/runout.h @@ -99,9 +99,11 @@ class TFilamentMonitor : public FilamentMonitorBase { #endif #ifdef ACTION_ON_FILAMENT_RUNOUT #if NUM_RUNOUT_SENSORS > 1 - SERIAL_ECHOLNPAIR("//action:" ACTION_ON_FILAMENT_RUNOUT " ", int(active_extruder)); + host_action_filament_runout(false); + SERIAL_CHAR(' '); + SERIAL_ECHO(int(active_extruder)); #else - SERIAL_ECHOLNPGM("//action:" ACTION_ON_FILAMENT_RUNOUT); + host_action_filament_runout(); #endif if (!IS_SD_PRINTING()) reset(); diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 45ebbe381..7e4369349 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -130,7 +130,7 @@ void GcodeSuite::dwell(millis_t time) { while (G29()) { // G29 should return true for failed probes ONLY if (retries--) { #ifdef G29_ACTION_ON_RECOVER - SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_RECOVER); + host_action(PSTR(G29_ACTION_ON_RECOVER)); #endif #ifdef G29_RECOVER_COMMANDS process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS)); @@ -141,7 +141,7 @@ void GcodeSuite::dwell(millis_t time) { process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS)); #endif #ifdef G29_ACTION_ON_FAILURE - SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_FAILURE); + host_action(PSTR(G29_ACTION_ON_FAILURE)); #endif #if ENABLED(G29_HALT_ON_FAILURE) kill(PSTR(MSG_ERR_PROBING_FAILED)); diff --git a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp index 495cd2c62..1bc8917a8 100644 --- a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp +++ b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp @@ -104,7 +104,7 @@ void GcodeSuite::M24() { } #ifdef ACTION_ON_RESUME - SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME); + host_action_resume(); #endif ui.reset_status(); @@ -127,7 +127,7 @@ void GcodeSuite::M25() { ui.reset_status(); #ifdef ACTION_ON_PAUSE - SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE); + host_action_pause(); #endif #endif } diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 84345a2f0..e60609ce1 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -526,3 +526,5 @@ #define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA)) #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA) #define IS_CARTESIAN !IS_KINEMATIC + +#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)) diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 077685ef4..6af8da662 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -38,6 +38,10 @@ #include "../../feature/power_loss_recovery.h" #endif +#if ENABLED(SDSUPPORT) + #include "../../sd/cardreader.h" +#endif + void lcd_pause() { #if ENABLED(POWER_LOSS_RECOVERY) if (recovery.enabled) recovery.save(true, false); @@ -49,7 +53,7 @@ void lcd_pause() { #elif ENABLED(SDSUPPORT) enqueue_and_echo_commands_P(PSTR("M25")); #elif defined(ACTION_ON_PAUSE) - SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE); + host_action_pause(); #endif planner.synchronize(); } @@ -58,29 +62,28 @@ void lcd_resume() { #if ENABLED(SDSUPPORT) if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24")); #elif defined(ACTION_ON_RESUME) - SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME); + host_action_resume(); #endif } -#if ENABLED(SDSUPPORT) - - #include "../../sd/cardreader.h" - - void lcd_sdcard_stop() { +void lcd_stop() { + #if ENABLED(SDSUPPORT) wait_for_heatup = wait_for_user = false; card.flag.abort_sd_printing = true; - ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1); - ui.return_to_status(); - } + #endif + #ifdef ACTION_ON_CANCEL + host_action_cancel(); + #endif + ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1); + ui.return_to_status(); +} - void menu_sdcard_abort_confirm() { - START_MENU(); - MENU_BACK(MSG_MAIN); - MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop); - END_MENU(); - } - -#endif // SDSUPPORT +void menu_abort_confirm() { + START_MENU(); + MENU_BACK(MSG_MAIN); + MENU_ITEM(function, MSG_STOP_PRINT, lcd_stop); + END_MENU(); +} void menu_tune(); void menu_motion(); @@ -100,9 +103,8 @@ void menu_main() { if (busy) { MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause); - #if ENABLED(SDSUPPORT) - if (card.isFileOpen()) - MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm); + #if ENABLED(SDSUPPORT) || defined(ACTION_ON_CANCEL) + MENU_ITEM(submenu, MSG_STOP_PRINT, menu_abort_confirm); #endif #if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT) if (card.isFileOpen()) diff --git a/buildroot/share/tests/teensy35_tests b/buildroot/share/tests/teensy35_tests index 053ad97a4..acbe3ba43 100755 --- a/buildroot/share/tests/teensy35_tests +++ b/buildroot/share/tests/teensy35_tests @@ -24,7 +24,8 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT \ FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \ BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \ PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \ - 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 + 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 \ + ACTION_ON_KILL ACTION_ON_PAUSE ACTION_ON_PAUSED ACTION_ON_RESUME ACTION_ON_RESUMED ACTION_ON_CANCEL opt_set I2C_SLAVE_ADDRESS 63 opt_set GRID_MAX_POINTS_X 16 exec_test $1 $2 "Teensy3.5 with many features"