Remote streamer improvements (#12982)

This commit is contained in:
InsanityAutomation 2019-01-27 23:43:13 -05:00 committed by Scott Lahteine
parent 621fbe99de
commit 48a3502656
78 changed files with 1135 additions and 171 deletions

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -311,6 +311,38 @@ void disable_all_steppers() {
disable_e_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: * Manage several activities:
* - Check for Filament Runout * - Check for Filament Runout
@ -618,7 +650,7 @@ void kill(PGM_P const lcd_msg/*=NULL*/) {
#endif #endif
#ifdef ACTION_ON_KILL #ifdef ACTION_ON_KILL
SERIAL_ECHOLNPGM("//action:" ACTION_ON_KILL); host_action_kill();
#endif #endif
minkill(); minkill();

View file

@ -369,3 +369,27 @@ void protected_pin_err();
#if HAS_SUICIDE #if HAS_SUICIDE
inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); } inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
#endif #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

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1951,9 +1951,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1947,9 +1947,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1953,9 +1953,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1947,9 +1947,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1956,9 +1956,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1951,9 +1951,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1947,9 +1947,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1952,9 +1952,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
#define ACTION_ON_RESUME "resume" #define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1953,9 +1953,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
#define ACTION_ON_RESUME "resume" #define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
#define ACTION_ON_RESUME "resume" #define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1934,9 +1934,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1956,9 +1956,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1961,9 +1961,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1951,9 +1951,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1938,9 +1938,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1950,9 +1950,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1948,9 +1948,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -1949,9 +1949,22 @@
* Specify an action command to send to the host on pause and resume. * 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'. * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
* The host must be configured to handle the action command. * 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_PAUSE "pause"
//#define ACTION_ON_RESUME "resume" //#define ACTION_ON_RESUME "resume"
//#define ACTION_ON_PAUSED "paused"
//#define ACTION_ON_RESUMED "resumed"
//#define ACTION_ON_CANCEL "cancel"
//=========================================================================== //===========================================================================
//====================== I2C Position Encoder Settings ====================== //====================== I2C Position Encoder Settings ======================

View file

@ -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 if (did_pause_print) return false; // already paused
#ifdef ACTION_ON_PAUSE #ifdef ACTION_ON_PAUSED
SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE); host_action_paused();
#elif defined(ACTION_ON_PAUSE)
host_action_pause();
#endif #endif
#if HAS_LCD_MENU #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); lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
#endif #endif
#ifdef ACTION_ON_RESUME #ifdef ACTION_ON_RESUMED
SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME); host_action_resumed();
#elif defined(ACTION_ON_RESUME)
host_action_resume();
#endif #endif
--did_pause_print; --did_pause_print;

View file

@ -99,9 +99,11 @@ class TFilamentMonitor : public FilamentMonitorBase {
#endif #endif
#ifdef ACTION_ON_FILAMENT_RUNOUT #ifdef ACTION_ON_FILAMENT_RUNOUT
#if NUM_RUNOUT_SENSORS > 1 #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 #else
SERIAL_ECHOLNPGM("//action:" ACTION_ON_FILAMENT_RUNOUT); host_action_filament_runout();
#endif #endif
if (!IS_SD_PRINTING()) if (!IS_SD_PRINTING())
reset(); reset();

View file

@ -130,7 +130,7 @@ void GcodeSuite::dwell(millis_t time) {
while (G29()) { // G29 should return true for failed probes ONLY while (G29()) { // G29 should return true for failed probes ONLY
if (retries--) { if (retries--) {
#ifdef G29_ACTION_ON_RECOVER #ifdef G29_ACTION_ON_RECOVER
SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_RECOVER); host_action(PSTR(G29_ACTION_ON_RECOVER));
#endif #endif
#ifdef G29_RECOVER_COMMANDS #ifdef G29_RECOVER_COMMANDS
process_subcommands_now_P(PSTR(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)); process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
#endif #endif
#ifdef G29_ACTION_ON_FAILURE #ifdef G29_ACTION_ON_FAILURE
SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_FAILURE); host_action(PSTR(G29_ACTION_ON_FAILURE));
#endif #endif
#if ENABLED(G29_HALT_ON_FAILURE) #if ENABLED(G29_HALT_ON_FAILURE)
kill(PSTR(MSG_ERR_PROBING_FAILED)); kill(PSTR(MSG_ERR_PROBING_FAILED));

View file

@ -104,7 +104,7 @@ void GcodeSuite::M24() {
} }
#ifdef ACTION_ON_RESUME #ifdef ACTION_ON_RESUME
SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME); host_action_resume();
#endif #endif
ui.reset_status(); ui.reset_status();
@ -127,7 +127,7 @@ void GcodeSuite::M25() {
ui.reset_status(); ui.reset_status();
#ifdef ACTION_ON_PAUSE #ifdef ACTION_ON_PAUSE
SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE); host_action_pause();
#endif #endif
#endif #endif
} }

View file

@ -526,3 +526,5 @@
#define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA)) #define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA) #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
#define IS_CARTESIAN !IS_KINEMATIC #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))

View file

@ -38,6 +38,10 @@
#include "../../feature/power_loss_recovery.h" #include "../../feature/power_loss_recovery.h"
#endif #endif
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
#endif
void lcd_pause() { void lcd_pause() {
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
if (recovery.enabled) recovery.save(true, false); if (recovery.enabled) recovery.save(true, false);
@ -49,7 +53,7 @@ void lcd_pause() {
#elif ENABLED(SDSUPPORT) #elif ENABLED(SDSUPPORT)
enqueue_and_echo_commands_P(PSTR("M25")); enqueue_and_echo_commands_P(PSTR("M25"));
#elif defined(ACTION_ON_PAUSE) #elif defined(ACTION_ON_PAUSE)
SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE); host_action_pause();
#endif #endif
planner.synchronize(); planner.synchronize();
} }
@ -58,29 +62,28 @@ void lcd_resume() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24")); if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
#elif defined(ACTION_ON_RESUME) #elif defined(ACTION_ON_RESUME)
SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME); host_action_resume();
#endif #endif
} }
#if ENABLED(SDSUPPORT) void lcd_stop() {
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
void lcd_sdcard_stop() {
wait_for_heatup = wait_for_user = false; wait_for_heatup = wait_for_user = false;
card.flag.abort_sd_printing = true; card.flag.abort_sd_printing = true;
ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1); #endif
ui.return_to_status(); #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() { void menu_abort_confirm() {
START_MENU(); START_MENU();
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop); MENU_ITEM(function, MSG_STOP_PRINT, lcd_stop);
END_MENU(); END_MENU();
} }
#endif // SDSUPPORT
void menu_tune(); void menu_tune();
void menu_motion(); void menu_motion();
@ -100,9 +103,8 @@ void menu_main() {
if (busy) { if (busy) {
MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause); MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT) || defined(ACTION_ON_CANCEL)
if (card.isFileOpen()) MENU_ITEM(submenu, MSG_STOP_PRINT, menu_abort_confirm);
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm);
#endif #endif
#if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT) #if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT)
if (card.isFileOpen()) if (card.isFileOpen())

View file

@ -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 \ 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 \ 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 \ 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 I2C_SLAVE_ADDRESS 63
opt_set GRID_MAX_POINTS_X 16 opt_set GRID_MAX_POINTS_X 16
exec_test $1 $2 "Teensy3.5 with many features" exec_test $1 $2 "Teensy3.5 with many features"