From aecf0c9bb96892e7822825e135d7778462a901fb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 4 Feb 2018 16:35:52 -0600 Subject: [PATCH] Allow override of CS pins generally --- Marlin/src/pins/pins_ARCHIM2.h | 20 +++++++++++++----- Marlin/src/pins/pins_RADDS.h | 32 +++++++++++++++++++++-------- Marlin/src/pins/pins_RAMPS_FD_V1.h | 24 ++++++++++++++++------ Marlin/src/pins/pins_RAMPS_RE_ARM.h | 24 ++++++++++++++++------ Marlin/src/pins/pins_RURAMPS4D.h | 15 +++++++------- 5 files changed, 83 insertions(+), 32 deletions(-) diff --git a/Marlin/src/pins/pins_ARCHIM2.h b/Marlin/src/pins/pins_ARCHIM2.h index ef9bc2a71..5dd3a94dc 100644 --- a/Marlin/src/pins/pins_ARCHIM2.h +++ b/Marlin/src/pins/pins_ARCHIM2.h @@ -66,31 +66,41 @@ #define X_STEP_PIN 38 // PC6 X-STEP * #define X_DIR_PIN 37 // PC5 X-DIR * #define X_ENABLE_PIN 41 // PC9 EN1 -#define X_CS_PIN 39 // PC7 X_nCS +#ifndef X_CS_PIN + #define X_CS_PIN 39 // PC7 X_nCS +#endif #define X_DIAG_PIN 59 // PA4 X_DIAG #define Y_STEP_PIN 51 // PC12 Y-STEP * #define Y_DIR_PIN 92 // PC11 Y-DIR -AddOns * #define Y_ENABLE_PIN 49 // PC14 Y-EN * -#define Y_CS_PIN 50 // PC13 Y_nCS +#ifndef Y_CS_PIN + #define Y_CS_PIN 50 // PC13 Y_nCS +#endif #define Y_DIAG_PIN 48 // PC15 Y_DIAG #define Z_STEP_PIN 46 // PC17 Z-STEP * #define Z_DIR_PIN 47 // PC16 Z-DIR * #define Z_ENABLE_PIN 44 // PC19 Z-END * -#define Z_CS_PIN 45 // PC18 Z_nCS +#ifndef Z_CS_PIN + #define Z_CS_PIN 45 // PC18 Z_nCS +#endif #define Z_DIAG_PIN 36 // PC4 Z_DIAG #define E0_STEP_PIN 107 // PB10 E1-STEP -AddOns * #define E0_DIR_PIN 96 // PC10 E1-DIR -AddOns * #define E0_ENABLE_PIN 105 // PB22 E1-EN -AddOns * -#define E0_CS_PIN 104 // PC20 E1_nCS -AddOns * +#ifndef E0_CS_PIN + #define E0_CS_PIN 104 // PC20 E1_nCS -AddOns * +#endif #define E0_DIAG_PIN 78 // PB23 E1_DIAG #define E1_STEP_PIN 22 // PB26 E2_STEP * #define E1_DIR_PIN 97 // PB24 E2_DIR -AddOns * #define E1_ENABLE_PIN 18 // PA11 E2-EN -#define E1_CS_PIN 19 // PA10 E2_nCS +#ifndef E1_CS_PIN + #define E1_CS_PIN 19 // PA10 E2_nCS +#endif #define E1_DIAG_PIN 25 // PD0 E2_DIAG // diff --git a/Marlin/src/pins/pins_RADDS.h b/Marlin/src/pins/pins_RADDS.h index 94b534970..68d8f3cbe 100644 --- a/Marlin/src/pins/pins_RADDS.h +++ b/Marlin/src/pins/pins_RADDS.h @@ -54,44 +54,60 @@ #define X_STEP_PIN 24 #define X_DIR_PIN 23 #define X_ENABLE_PIN 26 -#define X_CS_PIN 25 +#ifndef X_CS_PIN + #define X_CS_PIN 25 +#endif #define Y_STEP_PIN 17 #define Y_DIR_PIN 16 #define Y_ENABLE_PIN 22 -#define Y_CS_PIN 27 +#ifndef Y_CS_PIN + #define Y_CS_PIN 27 +#endif #define Z_STEP_PIN 2 #define Z_DIR_PIN 3 #define Z_ENABLE_PIN 15 -#define Z_CS_PIN 29 +#ifndef Z_CS_PIN + #define Z_CS_PIN 29 +#endif #define E0_STEP_PIN 61 #define E0_DIR_PIN 60 #define E0_ENABLE_PIN 62 -#define E0_CS_PIN 31 +#ifndef E0_CS_PIN + #define E0_CS_PIN 31 +#endif #define E1_STEP_PIN 64 #define E1_DIR_PIN 63 #define E1_ENABLE_PIN 65 -#define E1_CS_PIN 33 +#ifndef E1_CS_PIN + #define E1_CS_PIN 33 +#endif #define E2_STEP_PIN 51 #define E2_DIR_PIN 53 #define E2_ENABLE_PIN 49 -#define E2_CS_PIN 35 +#ifndef E2_CS_PIN + #define E2_CS_PIN 35 +#endif // For Extension Board V2 // http://doku.radds.org/dokumentation/extension-board //#define E3_STEP_PIN 35 //#define E3_DIR_PIN 33 //#define E3_ENABLE_PIN 37 -//#define E3_CS_PIN 6 +//#ifndef E3_CS_PIN +// #define E3_CS_PIN 6 +//#endif //#define Z2_STEP_PIN 29 //#define Z2_DIR_PIN 27 //#define Z2_ENABLE_PIN 31 -//#define Z2_CS_PIN 39 +//#ifndef Z2_CS_PIN +// #define Z2_CS_PIN 39 +//#endif // Microstepping pins - Mapping not from fastio.h (?) //#define E3_MS1_PIN 67 diff --git a/Marlin/src/pins/pins_RAMPS_FD_V1.h b/Marlin/src/pins/pins_RAMPS_FD_V1.h index 9043832e6..31fdbc14c 100644 --- a/Marlin/src/pins/pins_RAMPS_FD_V1.h +++ b/Marlin/src/pins/pins_RAMPS_FD_V1.h @@ -63,32 +63,44 @@ #define X_STEP_PIN 63 #define X_DIR_PIN 62 #define X_ENABLE_PIN 48 -#define X_CS_PIN 68 +#ifdef X_CS_PIN + #define X_CS_PIN 68 +#endif #define Y_STEP_PIN 65 #define Y_DIR_PIN 64 #define Y_ENABLE_PIN 46 -#define Y_CS_PIN 60 +#ifdef Y_CS_PIN + #define Y_CS_PIN 60 +#endif #define Z_STEP_PIN 67 #define Z_DIR_PIN 66 #define Z_ENABLE_PIN 44 -#define Z_CS_PIN 58 +#ifdef Z_CS_PIN + #define Z_CS_PIN 58 +#endif #define E0_STEP_PIN 36 #define E0_DIR_PIN 28 #define E0_ENABLE_PIN 42 -#define E0_CS_PIN 67 +#ifdef E0_CS_PIN + #define E0_CS_PIN 67 +#endif #define E1_STEP_PIN 43 #define E1_DIR_PIN 41 #define E1_ENABLE_PIN 39 -#define E1_CS_PIN 61 +#ifdef E1_CS_PIN + #define E1_CS_PIN 61 +#endif #define E2_STEP_PIN 32 #define E2_DIR_PIN 47 #define E2_ENABLE_PIN 45 -#define E2_CS_PIN 59 +#ifdef E2_CS_PIN + #define E2_CS_PIN 59 +#endif // // Temperature Sensors diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index cf62ea763..93e340968 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -68,32 +68,44 @@ #define X_STEP_PIN P2_01 // (54) #define X_DIR_PIN P0_11 // (55) #define X_ENABLE_PIN P0_10 // (38) -#define X_CS_PIN P1_01 // ETH +#ifndef X_CS_PIN + #define X_CS_PIN P1_01 // ETH +#endif #define Y_STEP_PIN P2_02 // (60) #define Y_DIR_PIN P0_20 // (61) #define Y_ENABLE_PIN P0_19 // (56) -#define Y_CS_PIN P1_04 // ETH +#ifndef Y_CS_PIN + #define Y_CS_PIN P1_04 // ETH +#endif #define Z_STEP_PIN P2_03 // (46) #define Z_DIR_PIN P0_22 // (48) #define Z_ENABLE_PIN P0_21 // (62) -#define Z_CS_PIN P1_10 // ETH +#ifndef Z_CS_PIN + #define Z_CS_PIN P1_10 // ETH +#endif #define E0_STEP_PIN P2_00 // (26) #define E0_DIR_PIN P0_05 // (28) #define E0_ENABLE_PIN P0_04 // (24) -#define E0_CS_PIN P1_14 // ETH +#ifndef E0_CS_PIN + #define E0_CS_PIN P1_14 // ETH +#endif #define E1_STEP_PIN P2_08 // (36) #define E1_DIR_PIN P2_13 // (34) #define E1_ENABLE_PIN P4_29 // (30) -#define E1_CS_PIN -1 +#ifndef E1_CS_PIN + #define E1_CS_PIN -1 +#endif #define E2_STEP_PIN P2_08 // (36) #define E2_DIR_PIN P2_13 // (34) #define E2_ENABLE_PIN P4_29 // (30) -#define E2_CS_PIN -1 +#ifndef E2_CS_PIN + #define E2_CS_PIN -1 +#endif // // Software SPI pins for TMC2130 stepper drivers diff --git a/Marlin/src/pins/pins_RURAMPS4D.h b/Marlin/src/pins/pins_RURAMPS4D.h index ce6e4255e..5d9bd2b38 100644 --- a/Marlin/src/pins/pins_RURAMPS4D.h +++ b/Marlin/src/pins/pins_RURAMPS4D.h @@ -63,37 +63,38 @@ #define X_STEP_PIN 37 // Support Extension Board #define X_DIR_PIN 36 #define X_ENABLE_PIN 38 -#define X_CS_PIN -1 #define Y_STEP_PIN 32 // Support Extension Board #define Y_DIR_PIN 35 #define Y_ENABLE_PIN 34 -#define Y_CS_PIN -1 #define Z_STEP_PIN 30 // Support Extension Board #define Z_DIR_PIN 2 #define Z_ENABLE_PIN 33 -#define Z_CS_PIN -1 #define E0_STEP_PIN 29 #define E0_DIR_PIN 28 #define E0_ENABLE_PIN 31 -#define E0_CS_PIN -1 #define E1_STEP_PIN 22 #define E1_DIR_PIN 24 #define E1_ENABLE_PIN 26 -#define E1_CS_PIN -1 #define E2_STEP_PIN 25 #define E2_DIR_PIN 23 #define E2_ENABLE_PIN 27 -#define E2_CS_PIN -1 #define E3_STEP_PIN 15 // Only For Extension Board #define E3_DIR_PIN 14 #define E3_ENABLE_PIN 61 -#define E3_CS_PIN -1 + +//#define X_CS_PIN -1 +//#define Y_CS_PIN -1 +//#define Z_CS_PIN -1 +//#define E0_CS_PIN -1 +//#define E1_CS_PIN -1 +//#define E2_CS_PIN -1 +//#define E3_CS_PIN -1 // For Future: Microstepping pins - Mapping not from fastio.h (?) //#define E3_MS1_PIN ?