Browse Source

Sanity check Z_DUAL_ENDSTOPS with DELTA

Scott Lahteine 9 years ago
parent
commit
367dad5902
2 changed files with 10 additions and 6 deletions
  1. 1
    1
      Marlin/Marlin_main.cpp
  2. 9
    5
      Marlin/SanityCheck.h

+ 1
- 1
Marlin/Marlin_main.cpp View File

402
   #define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE()
402
   #define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE()
403
 #endif
403
 #endif
404
 
404
 
405
-#if ENABLED(Z_DUAL_ENDSTOPS) && DISABLED(DELTA)
405
+#if ENABLED(Z_DUAL_ENDSTOPS)
406
   float z_endstop_adj = 0;
406
   float z_endstop_adj = 0;
407
 #endif
407
 #endif
408
 
408
 

+ 9
- 5
Marlin/SanityCheck.h View File

728
  * Endstops
728
  * Endstops
729
  */
729
  */
730
 #if DISABLED(USE_XMIN_PLUG) && DISABLED(USE_XMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _XMAX_ && Z2_USE_ENDSTOP <= _XMIN_)
730
 #if DISABLED(USE_XMIN_PLUG) && DISABLED(USE_XMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _XMAX_ && Z2_USE_ENDSTOP <= _XMIN_)
731
- #error "You must enable USE_XMIN_PLUG or USE_XMAX_PLUG"
731
+ #error "You must enable USE_XMIN_PLUG or USE_XMAX_PLUG."
732
 #elif DISABLED(USE_YMIN_PLUG) && DISABLED(USE_YMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _YMAX_ && Z2_USE_ENDSTOP <= _YMIN_)
732
 #elif DISABLED(USE_YMIN_PLUG) && DISABLED(USE_YMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _YMAX_ && Z2_USE_ENDSTOP <= _YMIN_)
733
- #error "You must enable USE_YMIN_PLUG or USE_YMAX_PLUG"
733
+ #error "You must enable USE_YMIN_PLUG or USE_YMAX_PLUG."
734
 #elif DISABLED(USE_ZMIN_PLUG) && DISABLED(USE_ZMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _ZMAX_ && Z2_USE_ENDSTOP <= _ZMIN_)
734
 #elif DISABLED(USE_ZMIN_PLUG) && DISABLED(USE_ZMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _ZMAX_ && Z2_USE_ENDSTOP <= _ZMIN_)
735
- #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG"
736
-#elif ENABLED(Z_DUAL_ENDSTOPS) && !Z2_USE_ENDSTOP
737
- #error "You must set Z2_USE_ENDSTOP with Z_DUAL_ENDSTOPS"
735
+ #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG."
736
+#elif ENABLED(Z_DUAL_ENDSTOPS)
737
+  #if !Z2_USE_ENDSTOP
738
+    #error "You must set Z2_USE_ENDSTOP with Z_DUAL_ENDSTOPS."
739
+  #elif ENABLED(DELTA)
740
+    #error "Z_DUAL_ENDSTOPS is not compatible with DELTA."
741
+  #endif
738
 #endif
742
 #endif
739
 
743
 
740
 /**
744
 /**

Loading…
Cancel
Save