Merge branch 'Merge_cleanup' into Development

b84db7ff · Chris Roadfeldt · fb74995f · 2966ae20 · b84db7ff
Commit b84db7ff authored Apr 1, 2015 by Chris Roadfeldt
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -187,7 +187,7 @@
  #define Z_MIN_PIN          -1
 #endif

-#ifdef DISABLE_Z_PROBE_ENDSTOP
+#if defined (DISABLE_Z_PROBE_ENDSTOP) || ! defined (Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
  #define Z_PROBE_PIN        -1
 #endif