0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3365 from thinkyhead/fix_fancy_new_endstop_config

Browse source 
Fix bug in new endstop pullups handling
This commit is contained in:
Scott Lahteine 2016-04-03 20:58:52 -07:00
parent de39056f68 c0e7257932
commit 1d6f90b0b1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/Conditionals.h
View file

@ -278,25 +278,25 @@
* Set ENDSTOPPULLUPS for unused endstop switches * Set ENDSTOPPULLUPS for unused endstop switches
*/ */
#if ENABLED(ENDSTOPPULLUPS) #if ENABLED(ENDSTOPPULLUPS)
#if DISABLED(USE_XMAX_PLUG) #if ENABLED(USE_XMAX_PLUG)
#define ENDSTOPPULLUP_XMAX #define ENDSTOPPULLUP_XMAX
#endif #endif
#if DISABLED(USE_YMAX_PLUG) #if ENABLED(USE_YMAX_PLUG)
#define ENDSTOPPULLUP_YMAX #define ENDSTOPPULLUP_YMAX
#endif #endif
#if DISABLED(USE_ZMAX_PLUG) #if ENABLED(USE_ZMAX_PLUG)
#define ENDSTOPPULLUP_ZMAX #define ENDSTOPPULLUP_ZMAX
#endif #endif
#if DISABLED(USE_XMIN_PLUG) #if ENABLED(USE_XMIN_PLUG)
#define ENDSTOPPULLUP_XMIN #define ENDSTOPPULLUP_XMIN
#endif #endif
#if DISABLED(USE_YMIN_PLUG) #if ENABLED(USE_YMIN_PLUG)
#define ENDSTOPPULLUP_YMIN #define ENDSTOPPULLUP_YMIN
#endif #endif
#if DISABLED(USE_ZMIN_PLUG) #if ENABLED(USE_ZMIN_PLUG)
#define ENDSTOPPULLUP_ZMIN #define ENDSTOPPULLUP_ZMIN
#endif #endif
#if DISABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) #if ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)
#define ENDSTOPPULLUP_ZMIN_PROBE #define ENDSTOPPULLUP_ZMIN_PROBE
#endif #endif
#endif #endif