From 346c8b339b87491c027f914be04e0e9ecc882230 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 14 Jun 2015 23:17:00 -0700 Subject: [PATCH] Remove a test from pins_RAMPS_13.h - Add 3 new lines to `pins.h` to remove 2 redundant tests in `pins_RAMPS_13.h` --- Marlin/pins.h | 5 ++++- Marlin/pins_RAMPS_13.h | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Marlin/pins.h b/Marlin/pins.h index 297dc867a0..d899da8bdf 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -34,7 +34,10 @@ #include "pins_SETHI.h" #elif MB(RAMPS_OLD) #include "pins_RAMPS_OLD.h" -#elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) +#elif MB(RAMPS_13_EFB) + #define IS_RAMPS_EFB + #include "pins_RAMPS_13.h" +#elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #include "pins_RAMPS_13.h" #elif MB(GEN6) #include "pins_GEN6.h" diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index a99be9c3d3..9f4313ffd8 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -77,7 +77,7 @@ #define FILRUNOUT_PIN 4 #endif -#if MB(RAMPS_13_EFB) || MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB) +#if MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB) #define FAN_PIN 9 // (Sprinter config) #if MB(RAMPS_13_EFF) #define CONTROLLERFAN_PIN -1 // Pin used for the fan to cool controller @@ -102,7 +102,7 @@ #define HEATER_0_PIN 10 // EXTRUDER 1 #endif -#if MB(RAMPS_13_EFB) || MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB) +#if MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB) #define HEATER_1_PIN -1 #else #define HEATER_1_PIN 9 // EXTRUDER 2 (FAN On Sprinter)