CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manually synching back up with MarlinFirmware/Development.

Browse Source
This commit is contained in:
Chris Roadfeldt 2015-03-31 00:11:11 -05:00
parent faac2af4af
commit 3175c70c79
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Conditionals.h
View File

@ -185,6 +185,9 @@
#define ENDSTOPPULLUP_YMIN
#define ENDSTOPPULLUP_ZMIN
#endif
#ifndef DISABLE_Z_PROBE_ENDSTOP
#define ENDSTOPPULL_ZPROBE
#endif
#endif
/**

2
Marlin/Configuration.h
View File

@ -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.