From 34e0a8d848b2fb498275c550cbb044bc777fd1bf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 27 Aug 2015 18:08:09 -0700 Subject: [PATCH] Move Y2 and Z2 pins defines to pins.h --- Marlin/pins.h | 12 ++++++++++++ Marlin/pins_LEAPFROG.h | 8 -------- Marlin/pins_RAMPS_13.h | 12 ------------ 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/Marlin/pins.h b/Marlin/pins.h index de47c6a29..89546b7bc 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -227,6 +227,18 @@ #define Z_MIN_PIN -1 #endif +#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 +#endif + +#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 +#endif + #define SENSITIVE_PINS { 0, 1, \ X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \ Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \ diff --git a/Marlin/pins_LEAPFROG.h b/Marlin/pins_LEAPFROG.h index b25b24455..e42260ffa 100644 --- a/Marlin/pins_LEAPFROG.h +++ b/Marlin/pins_LEAPFROG.h @@ -32,14 +32,6 @@ #define E1_DIR_PIN 40 //40 #define E1_ENABLE_PIN 36 //36 -#define Y2_STEP_PIN 37 -#define Y2_DIR_PIN 40 -#define Y2_ENABLE_PIN 36 - -#define Z2_STEP_PIN 37 -#define Z2_DIR_PIN 40 -#define Z2_ENABLE_PIN 36 - #define SDPOWER -1 #define SDSS 11 #define SD_DETECT_PIN -1 // 10 optional also used as mode pin diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index e6173e5bd..7f651f365 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -42,18 +42,6 @@ #define Z_MAX_PIN 19 #define Z_MIN_PROBE_PIN -1 -#define Y2_STEP_PIN 36 -#define Y2_DIR_PIN 34 -#define Y2_ENABLE_PIN 30 - -#undef Z2_STEP_PIN -#undef Z2_DIR_PIN -#undef Z2_ENABLE_PIN - -#define Z2_STEP_PIN 36 -#define Z2_DIR_PIN 34 -#define Z2_ENABLE_PIN 30 - #define E0_STEP_PIN 26 #define E0_DIR_PIN 28 #define E0_ENABLE_PIN 24