From aef9e036bf5548ad494d23cd4dcde99fa0dee7ac Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 18 Feb 2018 04:43:01 -0600 Subject: [PATCH] More overridable FIL_RUNOUT_PIN --- Marlin/src/pins/pins_CHEAPTRONICv2.h | 4 +++- Marlin/src/pins/pins_CNCONTROLS_12.h | 4 +++- Marlin/src/pins/pins_RAMPS_RE_ARM.h | 12 +++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Marlin/src/pins/pins_CHEAPTRONICv2.h b/Marlin/src/pins/pins_CHEAPTRONICv2.h index 327883898..e6840abeb 100644 --- a/Marlin/src/pins/pins_CHEAPTRONICv2.h +++ b/Marlin/src/pins/pins_CHEAPTRONICv2.h @@ -109,7 +109,9 @@ // // Other board specific pins // -#define FIL_RUNOUT_PIN 37 // board input labeled as F-DET +#ifndef FIL_RUNOUT_PIN + #define FIL_RUNOUT_PIN 37 // board input labeled as F-DET +#endif #define Z_MIN_PROBE_PIN 36 // additional external board input labeled as E-SENS (should be used for Z-probe) #define LED_PIN 13 #define SPINDLE_ENABLE_PIN 4 // additional PWM pin 1 at JP1 connector - should be used for laser control too diff --git a/Marlin/src/pins/pins_CNCONTROLS_12.h b/Marlin/src/pins/pins_CNCONTROLS_12.h index 50c87cda6..5cf462a94 100644 --- a/Marlin/src/pins/pins_CNCONTROLS_12.h +++ b/Marlin/src/pins/pins_CNCONTROLS_12.h @@ -91,7 +91,9 @@ // Common I/O -#define FIL_RUNOUT_PIN 18 +#ifndef FIL_RUNOUT_PIN + #define FIL_RUNOUT_PIN 18 +#endif //#define PWM_1_PIN 12 //#define PWM_2_PIN 13 //#define SPARE_IO 17 diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index 8932ece82..ea6deba01 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -190,19 +190,21 @@ #endif #ifndef FAN_PIN - #define FAN_PIN P1_18 // (4) IO pin. Buffer needed + #define FAN_PIN P1_18 // (4) IO pin. Buffer needed #endif // // Misc. Functions // -#define LED_PIN P4_28 // (13) -#define SDSS P1_23 // (53) +#define LED_PIN P4_28 // (13) +#define SDSS P1_23 // (53) // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector -#define FIL_RUNOUT_PIN P1_18 // (4) +#ifndef FIL_RUNOUT_PIN + #define FIL_RUNOUT_PIN P1_18 // (4) +#endif -#define PS_ON_PIN P2_12 // (12) +#define PS_ON_PIN P2_12 // (12) #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN) #if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // try to use servo connector