Merge branch 'Development' into fixup_probing

Latest upstream commits
2015-04-03 18:05:17 -07:00
parent 92119d0f7d 5c1f08a35f
commit c0ca26cd50
11 changed files with 176 additions and 19 deletions
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@ -191,6 +191,9 @@
      #define ENDSTOPPULLUP_YMIN
      #define ENDSTOPPULLUP_ZMIN
    #endif
+    #ifndef DISABLE_Z_PROBE_ENDSTOP
+      #define ENDSTOPPULLUP_ZPROBE
+    #endif
  #endif

  /**