From ab6f1fdf8b6ffe24367c88ba3d80eab6ae296f5a Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sun, 26 Jul 2015 15:58:33 -0700 Subject: [PATCH] Move & document ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED (PR#2528) As suggested in #2521 - Move `ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED` because `SDSUPPORT` is also required. - Add a note that endstops must be enabled for the feature to have any effect --- Marlin/Configuration_adv.h | 9 ++++++--- Marlin/configurator/config/Configuration_adv.h | 9 ++++++--- Marlin/example_configurations/Felix/Configuration_adv.h | 9 ++++++--- .../example_configurations/Hephestos/Configuration_adv.h | 9 ++++++--- Marlin/example_configurations/K8200/Configuration_adv.h | 9 ++++++--- .../example_configurations/RigidBot/Configuration_adv.h | 9 ++++++--- Marlin/example_configurations/SCARA/Configuration_adv.h | 9 ++++++--- Marlin/example_configurations/WITBOX/Configuration_adv.h | 9 ++++++--- .../delta/biv2.5/Configuration_adv.h | 9 ++++++--- .../delta/generic/Configuration_adv.h | 9 ++++++--- .../delta/kossel_mini/Configuration_adv.h | 9 ++++++--- .../delta/kossel_pro/Configuration_adv.h | 9 ++++++--- .../example_configurations/makibox/Configuration_adv.h | 9 ++++++--- .../tvrrug/Round2/Configuration_adv.h | 9 ++++++--- Marlin/stepper.h | 2 +- 15 files changed, 85 insertions(+), 43 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f00f1ebb45..e6c954d587 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -324,6 +324,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -349,9 +355,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index a04dba8478..67d422b922 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -317,6 +317,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -342,9 +348,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index ec101fb278..29a2cf7e2e 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index e1bf689892..d513b2aa49 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 3be446fad4..dd98c6342b 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 86721094b0..d1e9b6fd7b 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -324,6 +324,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -349,9 +355,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index ced7113901..399c65ca5a 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index dc77b22e70..88ea6d4805 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index 9f2908e7e4..5813f705f5 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -331,6 +331,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 5a89463dd0..23d5aa9682 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -331,6 +331,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -357,9 +363,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index b43f71f369..fee2406084 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 15cc75c797..a1665ed2bc 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -371,6 +371,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -396,9 +402,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index dcf45ea053..9fc87aaa6b 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index e238b45082..ac96c9216d 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -330,6 +330,12 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: @@ -356,9 +362,6 @@ //#define WATCHDOG_RESET_MANUAL #endif -// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. -//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - // @section lcd // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process diff --git a/Marlin/stepper.h b/Marlin/stepper.h index 3fd2e4c25e..4df5bedc11 100644 --- a/Marlin/stepper.h +++ b/Marlin/stepper.h @@ -50,7 +50,7 @@ #endif #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED -extern bool abort_on_endstop_hit; + extern bool abort_on_endstop_hit; #endif // Initialize and start the stepper motor subsystem -- GitLab