Browse Source

Handle RAMPS 1.3 as the special case

Scott Lahteine 8 years ago
parent
commit
50e3482e0a
4 changed files with 34 additions and 11 deletions
  1. 3
    5
      Marlin/pins.h
  2. 16
    0
      Marlin/pins_RAMPS_13.h
  3. 9
    0
      Marlin/pins_RAMPS_13_EFB.h
  4. 6
    6
      Marlin/pins_RAMPS_14.h

+ 3
- 5
Marlin/pins.h View File

@@ -38,11 +38,9 @@
38 38
 #elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
39 39
   #include "pins_RAMPS_13.h"
40 40
 #elif MB(RAMPS_14_EFB)
41
-  #define IS_RAMPS_14
42
-  #include "pins_RAMPS_13_EFB.h"
41
+  #include "pins_RAMPS_14_EFB.h"
43 42
 #elif MB(RAMPS_14_EEB) || MB(RAMPS_14_EFF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_SF)
44
-  #define IS_RAMPS_14
45
-  #include "pins_RAMPS_13.h"
43
+  #include "pins_RAMPS_14.h"
46 44
 #elif MB(GEN6)
47 45
   #include "pins_GEN6.h"
48 46
 #elif MB(GEN6_DELUXE)
@@ -114,7 +112,7 @@
114 112
 #elif MB(LEAPFROG)
115 113
   #include "pins_LEAPFROG.h"
116 114
 #elif MB(BAM_DICE)
117
-  #include "pins_RAMPS_13.h"
115
+  #include "pins_RAMPS_14.h"
118 116
 #elif MB(BAM_DICE_DUE)
119 117
   #include "pins_BAM_DICE_DUE.h"
120 118
 #elif MB(FELIX2)

+ 16
- 0
Marlin/pins_RAMPS_13.h View File

@@ -0,0 +1,16 @@
1
+/**
2
+ * Arduino Mega with RAMPS v1.3 pin assignments
3
+ *
4
+ * Applies to the following boards:
5
+ *
6
+ *  RAMPS_13_EFB (Extruder, Fan, Bed)
7
+ *  RAMPS_13_EEB (Extruder, Extruder, Bed)
8
+ *  RAMPS_13_EFF (Extruder, Fan, Fan)
9
+ *  RAMPS_13_EEF (Extruder, Extruder, Fan)
10
+ *  RAMPS_13_SF  (Spindle, Controller Fan)
11
+ * 
12
+ */
13
+
14
+#define IS_RAMPS_13
15
+
16
+#include "pins_RAMPS_14.h"

+ 9
- 0
Marlin/pins_RAMPS_13_EFB.h View File

@@ -0,0 +1,9 @@
1
+/**
2
+ * Arduino Mega with RAMPS v1.3 pin assignments
3
+ *
4
+ *  RAMPS_13_EFB (Extruder, Fan, Bed)
5
+ */
6
+
7
+#define IS_RAMPS_13
8
+
9
+#include "pins_RAMPS_14_EFB.h"

+ 6
- 6
Marlin/pins_RAMPS_14.h View File

@@ -85,12 +85,12 @@
85 85
   #define FILRUNOUT_PIN     4
86 86
 #endif
87 87
 
88
-#if MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
88
+#if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
89 89
   #define FAN_PIN           9 // (Sprinter config)
90
-  #if MB(RAMPS_13_EFF)
90
+  #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF)
91 91
     #define CONTROLLERFAN_PIN  -1 // Pin used for the fan to cool controller
92 92
   #endif
93
-#elif MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
93
+#elif MB(RAMPS_14_EEF) || MB(RAMPS_14_SF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
94 94
   #define FAN_PIN           8
95 95
 #else
96 96
   #define FAN_PIN           4 // IO pin. Buffer needed
@@ -102,13 +102,13 @@
102 102
   #define KILL_PIN         41
103 103
 #endif
104 104
 
105
-#if MB(RAMPS_13_EFF)
105
+#if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF)
106 106
   #define HEATER_0_PIN      8
107 107
 #else
108 108
   #define HEATER_0_PIN     10   // EXTRUDER 1
109 109
 #endif
110 110
 
111
-#if MB(RAMPS_13_SF) || ENABLED(IS_RAMPS_EFB)
111
+#if MB(RAMPS_14_SF) || MB(RAMPS_13_SF) || ENABLED(IS_RAMPS_EFB)
112 112
   #define HEATER_1_PIN     -1
113 113
 #else
114 114
   #define HEATER_1_PIN      9   // EXTRUDER 2 (FAN On Sprinter)
@@ -120,7 +120,7 @@
120 120
 #define TEMP_1_PIN         15   // ANALOG NUMBERING
121 121
 #define TEMP_2_PIN         -1   // ANALOG NUMBERING
122 122
 
123
-#if MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
123
+#if MB(RAMPS_14_EFF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_SF) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
124 124
   #define HEATER_BED_PIN   -1    // NO BED
125 125
 #else
126 126
   #define HEATER_BED_PIN    8    // BED

Loading…
Cancel
Save