sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8143 from thinkyhead/bf1_dual_xyz_endstops

Browse Source 
Followup to #8123 - to match 2.0.x changes
This commit is contained in:
Scott Lahteine
2017-10-29 19:04:33 -05:00
committed by GitHub
parent daa85f71e1 e792c2b234
commit a6f7cda23e
1 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Conditionals_post.h
View File

@@ -404,7 +404,9 @@
#else #else
#define X2_MAX_ENDSTOP_INVERTING false #define X2_MAX_ENDSTOP_INVERTING false
#endif #endif
#elif X2_USE_ENDSTOP == _XMIN_ #define X2_MIN_ENDSTOP_INVERTING false
#else
#if X2_USE_ENDSTOP == _XMIN_
#define X2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING #define X2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
#define X2_MIN_PIN X_MIN_PIN #define X2_MIN_PIN X_MIN_PIN
#elif X2_USE_ENDSTOP == _XMAX_ #elif X2_USE_ENDSTOP == _XMAX_
@@ -425,6 +427,8 @@
#else #else
#define X2_MIN_ENDSTOP_INVERTING false #define X2_MIN_ENDSTOP_INVERTING false
#endif #endif
#define X2_MAX_ENDSTOP_INVERTING false
#endif
#endif #endif
// Is an endstop plug used for the X2 endstop? // Is an endstop plug used for the X2 endstop?
@@ -456,7 +460,9 @@
#else #else
#define Y2_MAX_ENDSTOP_INVERTING false #define Y2_MAX_ENDSTOP_INVERTING false
#endif #endif
#elif Y2_USE_ENDSTOP == _XMIN_ #define Y2_MIN_ENDSTOP_INVERTING false
#else
#if Y2_USE_ENDSTOP == _XMIN_
#define Y2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING #define Y2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
#define Y2_MIN_PIN X_MIN_PIN #define Y2_MIN_PIN X_MIN_PIN
#elif Y2_USE_ENDSTOP == _XMAX_ #elif Y2_USE_ENDSTOP == _XMAX_
@@ -477,6 +483,8 @@
#else #else
#define Y2_MIN_ENDSTOP_INVERTING false #define Y2_MIN_ENDSTOP_INVERTING false
#endif #endif
#define Y2_MAX_ENDSTOP_INVERTING false
#endif
#endif #endif
// Is an endstop plug used for the Y2 endstop or the bed probe? // Is an endstop plug used for the Y2 endstop or the bed probe?
@@ -508,7 +516,9 @@
#else #else
#define Z2_MAX_ENDSTOP_INVERTING false #define Z2_MAX_ENDSTOP_INVERTING false
#endif #endif
#elif Z2_USE_ENDSTOP == _XMIN_ #define Z2_MIN_ENDSTOP_INVERTING false
#else
#if Z2_USE_ENDSTOP == _XMIN_
#define Z2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING #define Z2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
#define Z2_MIN_PIN X_MIN_PIN #define Z2_MIN_PIN X_MIN_PIN
#elif Z2_USE_ENDSTOP == _XMAX_ #elif Z2_USE_ENDSTOP == _XMAX_
@@ -529,6 +539,8 @@
#else #else
#define Z2_MIN_ENDSTOP_INVERTING false #define Z2_MIN_ENDSTOP_INVERTING false
#endif #endif
#define Z2_MAX_ENDSTOP_INVERTING false
#endif
#endif #endif
// Is an endstop plug used for the Z2 endstop or the bed probe? // Is an endstop plug used for the Z2 endstop or the bed probe?