Manually synching back up with MarlinFirmware/Development.

10 years ago · 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

  /**
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@ -313,8 +313,8 @@ your extruder heater takes 2 minutes to hit the target on heating.
  // #define ENDSTOPPULLUP_XMIN
  // #define ENDSTOPPULLUP_YMIN
  // #define ENDSTOPPULLUP_ZMIN
+  // #define ENDSTOPPULLUP_ZPROBE
 #endif
->>>>>>> MarlinFirmware/Development

 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.