Browse Source

Sanity-check inverting and pullups for Z probe and Z endstop

`Z_MIN_ENDSTOP_INVERTING` must match `Z_MIN_PROBE_ENDSTOP_INVERTING`
when using `Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN`.
This is easy to overlook.
Scott Lahteine 8 years ago
parent
commit
da6a094424

+ 1
- 1
Marlin/Configuration.h View File

@@ -459,7 +459,7 @@
459 459
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
460 460
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
461 461
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
463 463
 
464 464
 // Enable this feature if all enabled endstop pins are interrupt-capable.
465 465
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 2
- 0
Marlin/SanityCheck.h View File

@@ -454,6 +454,8 @@
454 454
       #error "Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN requires USE_ZMIN_PLUG to be enabled."
455 455
     #elif !HAS_Z_MIN
456 456
       #error "Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN requires the Z_MIN_PIN to be defined."
457
+    #elif ENABLED(Z_MIN_PROBE_ENDSTOP_INVERTING) != ENABLED(Z_MIN_ENDSTOP_INVERTING)
458
+      #error "Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN requires Z_MIN_ENDSTOP_INVERTING to match Z_MIN_PROBE_ENDSTOP_INVERTING."
457 459
     #endif
458 460
   #elif ENABLED(Z_MIN_PROBE_ENDSTOP)
459 461
     #if !HAS_Z_MIN_PROBE_PIN

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration.h View File

@@ -459,7 +459,7 @@
459 459
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
460 460
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
461 461
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
463 463
 
464 464
 // Enable this feature if all enabled endstop pins are interrupt-capable.
465 465
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h View File

@@ -441,7 +441,7 @@
441 441
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
442 442
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
443 443
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
444
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
444
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
445 445
 
446 446
 // Enable this feature if all enabled endstop pins are interrupt-capable.
447 447
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

@@ -441,7 +441,7 @@
441 441
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
442 442
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
443 443
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
444
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
444
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
445 445
 
446 446
 // Enable this feature if all enabled endstop pins are interrupt-capable.
447 447
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -451,7 +451,7 @@
451 451
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
452 452
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
453 453
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
454
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
454
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
455 455
 
456 456
 // Enable this feature if all enabled endstop pins are interrupt-capable.
457 457
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -453,7 +453,7 @@
453 453
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
454 454
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
455 455
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
456
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
456
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
457 457
 
458 458
 // Enable this feature if all enabled endstop pins are interrupt-capable.
459 459
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h View File

@@ -489,7 +489,7 @@
489 489
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
490 490
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
491 491
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
492
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
492
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
493 493
 
494 494
 // Enable this feature if all enabled endstop pins are interrupt-capable.
495 495
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/K8400/Configuration.h View File

@@ -459,7 +459,7 @@
459 459
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
460 460
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
461 461
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
462
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
462
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
463 463
 
464 464
 // Enable this feature if all enabled endstop pins are interrupt-capable.
465 465
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File

@@ -459,7 +459,7 @@
459 459
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
460 460
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
461 461
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
462
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
462
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
463 463
 
464 464
 // Enable this feature if all enabled endstop pins are interrupt-capable.
465 465
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -459,7 +459,7 @@
459 459
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
460 460
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
461 461
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
462
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
463 463
 
464 464
 // Enable this feature if all enabled endstop pins are interrupt-capable.
465 465
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -456,7 +456,7 @@
456 456
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
457 457
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
458 458
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
459
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
459
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
460 460
 
461 461
 // Enable this feature if all enabled endstop pins are interrupt-capable.
462 462
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -474,7 +474,7 @@
474 474
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
475 475
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
476 476
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
477
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
477
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
478 478
 
479 479
 // Enable this feature if all enabled endstop pins are interrupt-capable.
480 480
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -480,7 +480,7 @@
480 480
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
481 481
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
482 482
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
483
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
483
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
484 484
 
485 485
 // Enable this feature if all enabled endstop pins are interrupt-capable.
486 486
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -451,7 +451,7 @@
451 451
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
452 452
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
453 453
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
454
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
454
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
455 455
 
456 456
 // Enable this feature if all enabled endstop pins are interrupt-capable.
457 457
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -459,7 +459,7 @@
459 459
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
460 460
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
461 461
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
463 463
 
464 464
 // Enable this feature if all enabled endstop pins are interrupt-capable.
465 465
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -506,7 +506,7 @@
506 506
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
507 507
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
508 508
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
509
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
509
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false  // set to true to invert the logic of the probe.
510 510
 
511 511
 // Enable this feature if all enabled endstop pins are interrupt-capable.
512 512
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -506,7 +506,7 @@
506 506
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
507 507
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
508 508
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
509
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
509
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
510 510
 
511 511
 // Enable this feature if all enabled endstop pins are interrupt-capable.
512 512
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -506,7 +506,7 @@
506 506
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
507 507
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
508 508
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
509
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
509
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
510 510
 
511 511
 // Enable this feature if all enabled endstop pins are interrupt-capable.
512 512
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -493,7 +493,7 @@
493 493
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
494 494
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
495 495
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
496
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
496
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
497 497
 
498 498
 // Enable this feature if all enabled endstop pins are interrupt-capable.
499 499
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -504,7 +504,7 @@
504 504
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
505 505
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
506 506
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
507
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
507
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
508 508
 
509 509
 // Enable this feature if all enabled endstop pins are interrupt-capable.
510 510
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h View File

@@ -462,7 +462,7 @@
462 462
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
463 463
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
464 464
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
465
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
465
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
466 466
 
467 467
 // Enable this feature if all enabled endstop pins are interrupt-capable.
468 468
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -449,7 +449,7 @@
449 449
 #define X_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
450 450
 #define Y_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
451 451
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
452
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
452
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
453 453
 
454 454
 // Enable this feature if all enabled endstop pins are interrupt-capable.
455 455
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.

Loading…
Cancel
Save