Browse Source

Dont use Z_MIN_PROBE_ENDSTOP for DELTA

Scott Lahteine 7 years ago
parent
commit
b5c5b175f1

+ 3
- 1
Marlin/SanityCheck.h View File

569
  * Delta requirements
569
  * Delta requirements
570
  */
570
  */
571
 #if ENABLED(DELTA)
571
 #if ENABLED(DELTA)
572
-  #if DISABLED(USE_XMAX_PLUG) && DISABLED(USE_YMAX_PLUG) && DISABLED(USE_ZMAX_PLUG)
572
+  #if HAS_BED_PROBE && ENABLED(Z_MIN_PROBE_ENDSTOP)
573
+    #error "Delta probably shouldn't use Z_MIN_PROBE_ENDSTOP. Comment out this line to continue."
574
+  #elif DISABLED(USE_XMAX_PLUG) && DISABLED(USE_YMAX_PLUG) && DISABLED(USE_ZMAX_PLUG)
573
     #error "You probably want to use Max Endstops for DELTA!"
575
     #error "You probably want to use Max Endstops for DELTA!"
574
   #elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_DELTA
576
   #elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_DELTA
575
     #error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
577
     #error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."

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

655
  *
655
  *
656
  * Enable this option for a probe connected to the Z Min endstop pin.
656
  * Enable this option for a probe connected to the Z Min endstop pin.
657
  */
657
  */
658
-//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
658
+#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
659
 
659
 
660
 /**
660
 /**
661
  * Z_MIN_PROBE_ENDSTOP
661
  * Z_MIN_PROBE_ENDSTOP
676
  * disastrous consequences. Use with caution and do your homework.
676
  * disastrous consequences. Use with caution and do your homework.
677
  *
677
  *
678
  */
678
  */
679
-#define Z_MIN_PROBE_ENDSTOP
679
+//#define Z_MIN_PROBE_ENDSTOP
680
 
680
 
681
 /**
681
 /**
682
  * Probe Type
682
  * Probe Type

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

667
  *
667
  *
668
  * Enable this option for a probe connected to the Z Min endstop pin.
668
  * Enable this option for a probe connected to the Z Min endstop pin.
669
  */
669
  */
670
-//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
670
+#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
671
 
671
 
672
 /**
672
 /**
673
  * Z_MIN_PROBE_ENDSTOP
673
  * Z_MIN_PROBE_ENDSTOP
688
  * disastrous consequences. Use with caution and do your homework.
688
  * disastrous consequences. Use with caution and do your homework.
689
  *
689
  *
690
  */
690
  */
691
-#define Z_MIN_PROBE_ENDSTOP
691
+//#define Z_MIN_PROBE_ENDSTOP
692
 
692
 
693
 /**
693
 /**
694
  * Probe Type
694
  * Probe Type

Loading…
Cancel
Save