Browse Source

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`
Scott Lahteine 9 years ago
parent
commit
346c8b339b
2 changed files with 6 additions and 3 deletions
  1. 4
    1
      Marlin/pins.h
  2. 2
    2
      Marlin/pins_RAMPS_13.h

+ 4
- 1
Marlin/pins.h View File

34
   #include "pins_SETHI.h"
34
   #include "pins_SETHI.h"
35
 #elif MB(RAMPS_OLD)
35
 #elif MB(RAMPS_OLD)
36
   #include "pins_RAMPS_OLD.h"
36
   #include "pins_RAMPS_OLD.h"
37
-#elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
37
+#elif MB(RAMPS_13_EFB)
38
+  #define IS_RAMPS_EFB
39
+  #include "pins_RAMPS_13.h"
40
+#elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
38
   #include "pins_RAMPS_13.h"
41
   #include "pins_RAMPS_13.h"
39
 #elif MB(GEN6)
42
 #elif MB(GEN6)
40
   #include "pins_GEN6.h"
43
   #include "pins_GEN6.h"

+ 2
- 2
Marlin/pins_RAMPS_13.h View File

77
   #define FILRUNOUT_PIN        4
77
   #define FILRUNOUT_PIN        4
78
 #endif
78
 #endif
79
 
79
 
80
-#if MB(RAMPS_13_EFB) || MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB)
80
+#if MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB)
81
   #define FAN_PIN            9 // (Sprinter config)
81
   #define FAN_PIN            9 // (Sprinter config)
82
   #if MB(RAMPS_13_EFF)
82
   #if MB(RAMPS_13_EFF)
83
     #define CONTROLLERFAN_PIN  -1 // Pin used for the fan to cool controller
83
     #define CONTROLLERFAN_PIN  -1 // Pin used for the fan to cool controller
102
   #define HEATER_0_PIN       10   // EXTRUDER 1
102
   #define HEATER_0_PIN       10   // EXTRUDER 1
103
 #endif
103
 #endif
104
 
104
 
105
-#if MB(RAMPS_13_EFB) || MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB)
105
+#if MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB)
106
   #define HEATER_1_PIN       -1
106
   #define HEATER_1_PIN       -1
107
 #else
107
 #else
108
   #define HEATER_1_PIN       9    // EXTRUDER 2 (FAN On Sprinter)
108
   #define HEATER_1_PIN       9    // EXTRUDER 2 (FAN On Sprinter)

Loading…
Cancel
Save