From 68457ee9034fdd4f6b01ba317ae26d99256d4e55 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Tue, 9 Feb 2016 20:04:07 -0800
Subject: [PATCH] For Dual Y/Z use the next available extruder pins
---
Marlin/Conditionals.h | 3 +++
Marlin/pins.h | 22 ++++++++++++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 979ddb791f..bf96f0f210 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -462,6 +462,7 @@
#define HAS_E1_ENABLE (PIN_EXISTS(E1_ENABLE))
#define HAS_E2_ENABLE (PIN_EXISTS(E2_ENABLE))
#define HAS_E3_ENABLE (PIN_EXISTS(E3_ENABLE))
+ #define HAS_E4_ENABLE (PIN_EXISTS(E4_ENABLE))
#define HAS_X_DIR (PIN_EXISTS(X_DIR))
#define HAS_X2_DIR (PIN_EXISTS(X2_DIR))
#define HAS_Y_DIR (PIN_EXISTS(Y_DIR))
@@ -472,6 +473,7 @@
#define HAS_E1_DIR (PIN_EXISTS(E1_DIR))
#define HAS_E2_DIR (PIN_EXISTS(E2_DIR))
#define HAS_E3_DIR (PIN_EXISTS(E3_DIR))
+ #define HAS_E4_DIR (PIN_EXISTS(E4_DIR))
#define HAS_X_STEP (PIN_EXISTS(X_STEP))
#define HAS_X2_STEP (PIN_EXISTS(X2_STEP))
#define HAS_Y_STEP (PIN_EXISTS(Y_STEP))
@@ -482,6 +484,7 @@
#define HAS_E1_STEP (PIN_EXISTS(E1_STEP))
#define HAS_E2_STEP (PIN_EXISTS(E2_STEP))
#define HAS_E3_STEP (PIN_EXISTS(E3_STEP))
+ #define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
/**
* Helper Macros for heaters and extruder fan
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 8846b428f0..bbb7df8a57 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -236,16 +236,26 @@
#define Z_MIN_PIN -1
#endif
+//
+// Dual Y and Dual Z support
+// These options are mutually-exclusive
+//
+
+#define __EPIN(p,q) E##p##_##q##_PIN
+#define _EPIN(p,q) __EPIN(p,q)
+
+// The Y2 axis, if any, should be the next open extruder port
#ifndef Y2_STEP_PIN
- #define Y2_STEP_PIN E1_STEP_PIN
- #define Y2_DIR_PIN E1_DIR_PIN
- #define Y2_ENABLE_PIN E1_ENABLE_PIN
+ #define Y2_STEP_PIN _EPIN(EXTRUDERS, STEP)
+ #define Y2_DIR_PIN _EPIN(EXTRUDERS, DIR)
+ #define Y2_ENABLE_PIN _EPIN(EXTRUDERS, ENABLE)
#endif
+// The Z2 axis, if any, should be the next open extruder port
#ifndef Z2_STEP_PIN
- #define Z2_STEP_PIN E1_STEP_PIN
- #define Z2_DIR_PIN E1_DIR_PIN
- #define Z2_ENABLE_PIN E1_ENABLE_PIN
+ #define Z2_STEP_PIN _EPIN(EXTRUDERS, STEP)
+ #define Z2_DIR_PIN _EPIN(EXTRUDERS, DIR)
+ #define Z2_ENABLE_PIN _EPIN(EXTRUDERS, ENABLE)
#endif
#define SENSITIVE_PINS { 0, 1, \