thomas
/
marlin
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Laidieni 0 Vikivietne Aktivitāte
Pārlūkot izejas kodu

Replace ENDSTOPS_ONLY_FOR_HOMING with ENDSTOPS_ALWAYS_ON_DEFAULT

Scott Lahteine 9 gadus atpakaļ
vecāks
671634bf11
revīzija
0fcd3706dd
20 mainītis faili ar 62 papildinājumiem un 42 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 3
    2
      Marlin/Configuration_adv.h
  2. 2
    0
      Marlin/SanityCheck.h
  3. 6
    6
      Marlin/endstops.cpp
  4. 3
    2
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  5. 3
    2
      Marlin/example_configurations/Felix/Configuration_adv.h
  6. 3
    2
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  7. 3
    2
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  8. 3
    2
      Marlin/example_configurations/K8200/Configuration_adv.h
  9. 3
    2
      Marlin/example_configurations/K8400/Configuration_adv.h
  10. 3
    2
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  11. 3
    2
      Marlin/example_configurations/SCARA/Configuration_adv.h
  12. 3
    2
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  13. 3
    2
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  14. 3
    2
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  15. 3
    2
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  16. 3
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  17. 3
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  18. 3
    2
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  19. 3
    2
      Marlin/example_configurations/makibox/Configuration_adv.h
  20. 3
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

+ 3
- 2
Marlin/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 2
- 0
Marlin/SanityCheck.h Parādīt failu 

@@ -680,6 +680,8 @@
680 680 
   #error "ABS_PREHEAT_HPB_TEMP is now PREHEAT_2_TEMP_BED. Please update your configuration."
681 681 
 #elif defined(ABS_PREHEAT_FAN_SPEED)
682 682 
   #error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED. Please update your configuration."
683 
+#elif defined(ENDSTOPS_ONLY_FOR_HOMING)
684 
+  #error "ENDSTOPS_ONLY_FOR_HOMING is deprecated. Use (disable) ENDSTOPS_ALWAYS_ON_DEFAULT instead."
683 685 
 #endif
684 686
685 687 
 /**

+ 6
- 6
Marlin/endstops.cpp Parādīt failu 

@@ -40,10 +40,10 @@ Endstops endstops;
40 40
41 41 
 bool  Endstops::enabled = true,
42 42 
       Endstops::enabled_globally =
43 
-        #if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
44 
-          false
43 
+        #if ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
44 
+          (true)
45 45 
         #else
46 
-          true
46 
+          (false)
47 47 
         #endif
48 48 
       ;
49 49 
 volatile char Endstops::endstop_hit_bits; // use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT value
 
@@ -66,10 +66,10 @@ volatile char Endstops::endstop_hit_bits; // use X_MIN, Y_MIN, Z_MIN and Z_MIN_P
66 66
67 67 
 Endstops::Endstops() {
68 68 
   enable_globally(
69 
-    #if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
70 
-      false
69 
+    #if ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
70 
+      (true)
71 71 
     #else
72 
-      true
72 
+      (false)
73 73 
     #endif
74 74 
   );
75 75 
   enable(true);

+ 3
- 2
Marlin/example_configurations/Cartesio/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/Felix/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/Hephestos/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-//#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/Hephestos_2/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/K8200/Configuration_adv.h Parādīt failu 

@@ -229,7 +229,9 @@
229 229
230 230 
 // @section homing
231 231
232 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
232 
+// If you want endstops to stay on (by default) even when not homing
233 
+// enable this option. Override at any time with M120, M121.
234 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
233 235
234 236 
 // @section extras
235 237 
 
@@ -445,7 +447,6 @@
445 447 
   // This option allows you to abort SD printing when any endstop is triggered.
446 448 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
447 449 
   // To have any effect, endstops must be enabled during SD printing.
448 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
449 450 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
450 451
451 452 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/K8400/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/TAZ4/Configuration_adv.h Parādīt failu 

@@ -231,7 +231,9 @@
231 231
232 232 
 // @section homing
233 233
234 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
234 
+// If you want endstops to stay on (by default) even when not homing
235 
+// enable this option. Override at any time with M120, M121.
236 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
235 237
236 238 
 // @section extras
237 239 
 
@@ -447,7 +449,6 @@
447 449 
   // This option allows you to abort SD printing when any endstop is triggered.
448 450 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
449 451 
   // To have any effect, endstops must be enabled during SD printing.
450 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
451 452 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
452 453
453 454 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/WITBOX/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-//#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -441,7 +443,6 @@
441 443 
   // This option allows you to abort SD printing when any endstop is triggered.
442 444 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
443 445 
   // To have any effect, endstops must be enabled during SD printing.
444 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
445 446 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
446 447
447 448 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -441,7 +443,6 @@
441 443 
   // This option allows you to abort SD printing when any endstop is triggered.
442 444 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
443 445 
   // To have any effect, endstops must be enabled during SD printing.
444 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
445 446 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
446 447
447 448 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -440,7 +442,6 @@
440 442 
   // This option allows you to abort SD printing when any endstop is triggered.
441 443 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
442 444 
   // To have any effect, endstops must be enabled during SD printing.
443 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
444 445 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
445 446
446 447 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Parādīt failu 

@@ -228,7 +228,9 @@
228 228
229 229 
 // @section homing
230 230
231 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
231 
+// If you want endstops to stay on (by default) even when not homing
232 
+// enable this option. Override at any time with M120, M121.
233 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
232 234
233 235 
 // @section extras
234 236 
 
@@ -445,7 +447,6 @@
445 447 
   // This option allows you to abort SD printing when any endstop is triggered.
446 448 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
447 449 
   // To have any effect, endstops must be enabled during SD printing.
448 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
449 450 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
450 451
451 452 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -441,7 +443,6 @@
441 443 
   // This option allows you to abort SD printing when any endstop is triggered.
442 444 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
443 445 
   // To have any effect, endstops must be enabled during SD printing.
444 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
445 446 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
446 447
447 448 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/makibox/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

+ 3
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Parādīt failu 

@@ -223,7 +223,9 @@
223 223
224 224 
 // @section homing
225 225
226 
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
226 
+// If you want endstops to stay on (by default) even when not homing
227 
+// enable this option. Override at any time with M120, M121.
228 
+//#define ENDSTOPS_ALWAYS_ON_DEFAULT
227 229
228 230 
 // @section extras
229 231 
 
@@ -439,7 +441,6 @@
439 441 
   // This option allows you to abort SD printing when any endstop is triggered.
440 442 
   // This feature must be enabled with "M540 S1" or from the LCD menu.
441 443 
   // To have any effect, endstops must be enabled during SD printing.
442 
-  // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops.
443 444 
   //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
444 445
445 446 
 #endif // SDSUPPORT

Rakstīt Priekšskatītījums
Notiek ielāde…
Atcelt
Saglabāt