Manually synching back up with MarlinFirmware/Development.

2015-03-31 00:11:11 -05:00
parent faac2af4af
commit 3175c70c79
2 changed files with 4 additions and 1 deletions
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@ -185,6 +185,9 @@
      #define ENDSTOPPULLUP_YMIN
      #define ENDSTOPPULLUP_ZMIN
    #endif
+    #ifndef DISABLE_Z_PROBE_ENDSTOP
+      #define ENDSTOPPULL_ZPROBE
+    #endif
  #endif

  /**