Browse Source

Make pins for EFF a consistent order

Scott Lahteine 9 years ago
parent
commit
de951c64f1
1 changed files with 7 additions and 8 deletions
  1. 7
    8
      Marlin/pins_RAMPS.h

+ 7
- 8
Marlin/pins_RAMPS.h View File

151
   #define HI_VOLT_PIN_A 10
151
   #define HI_VOLT_PIN_A 10
152
 #endif
152
 #endif
153
 
153
 
154
+#define HEATER_0_PIN     HI_VOLT_PIN_A
155
+
154
 #if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
156
 #if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
155
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
156
   #define FAN_PIN        HI_VOLT_PIN_B
157
   #define FAN_PIN        HI_VOLT_PIN_B
157
   #define HEATER_BED_PIN HI_VOLT_PIN_C
158
   #define HEATER_BED_PIN HI_VOLT_PIN_C
159
+  #define FAN1_PIN 4     // IO pin. Buffer needed
158
 #elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
160
 #elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
159
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
160
   #define HEATER_1_PIN   HI_VOLT_PIN_B
161
   #define HEATER_1_PIN   HI_VOLT_PIN_B
161
   #define FAN_PIN        HI_VOLT_PIN_C
162
   #define FAN_PIN        HI_VOLT_PIN_C
163
+  #define FAN1_PIN 4     // IO pin. Buffer needed
162
 #elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
164
 #elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
163
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
164
   #define HEATER_1_PIN   HI_VOLT_PIN_B
165
   #define HEATER_1_PIN   HI_VOLT_PIN_B
165
   #define HEATER_BED_PIN HI_VOLT_PIN_C
166
   #define HEATER_BED_PIN HI_VOLT_PIN_C
166
-  #define FAN_PIN 4 // IO pin. Buffer needed
167
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan (EFF is reversed?)
168
-  #define HEATER_0_PIN   HI_VOLT_PIN_C
167
+  #define FAN_PIN 4      // IO pin. Buffer needed
168
+#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
169
   #define FAN_PIN        HI_VOLT_PIN_B
169
   #define FAN_PIN        HI_VOLT_PIN_B
170
-  #define FAN1_PIN       HI_VOLT_PIN_A
170
+  #define FAN1_PIN       HI_VOLT_PIN_C
171
   #define CONTROLLERFAN_PIN  -1
171
   #define CONTROLLERFAN_PIN  -1
172
 #elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
172
 #elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
173
   #define FAN_PIN        HI_VOLT_PIN_C
173
   #define FAN_PIN        HI_VOLT_PIN_C
174
 #else                                          // Non-specific are "EFB" by legacy
174
 #else                                          // Non-specific are "EFB" by legacy
175
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
176
   #define FAN_PIN        HI_VOLT_PIN_B
175
   #define FAN_PIN        HI_VOLT_PIN_B
177
   #define HEATER_BED_PIN HI_VOLT_PIN_C
176
   #define HEATER_BED_PIN HI_VOLT_PIN_C
178
   #if HOTENDS == 1
177
   #if HOTENDS == 1

Loading…
Cancel
Save