Selaa lähdekoodia

Board definition and PIN assignments for Mini RAMBo1.0a

jkur 6 vuotta sitten
vanhempi
commit
f4c31565bc
3 muutettua tiedostoa jossa 56 lisäystä ja 25 poistoa
  1. 2
    1
      Marlin/boards.h
  2. 1
    1
      Marlin/pins.h
  3. 53
    23
      Marlin/pins_MINIRAMBO.h

+ 2
- 1
Marlin/boards.h Näytä tiedosto

@@ -90,10 +90,11 @@
90 90
 #define BOARD_MEGATRONICS_31    704   // Megatronics v3.1
91 91
 #define BOARD_RAMBO             301   // Rambo
92 92
 #define BOARD_MINIRAMBO         302   // Mini-Rambo
93
+#define BOARD_MINIRAMBO_10A     303   // Mini-Rambo 1.0a
93 94
 #define BOARD_ELEFU_3           21    // Elefu Ra Board (v3)
94 95
 #define BOARD_LEAPFROG          999   // Leapfrog
95 96
 #define BOARD_MEGACONTROLLER    310   // Mega controller
96
-#define BOARD_SCOOVO_X9H        303   // abee Scoovo X9H
97
+#define BOARD_SCOOVO_X9H        321   // abee Scoovo X9H
97 98
 #define BOARD_GT2560_REV_A      74    // Geeetech GT2560 Rev. A
98 99
 #define BOARD_GT2560_REV_A_PLUS 75    // Geeetech GT2560 Rev. A+ (with auto level probe)
99 100
 

+ 1
- 1
Marlin/pins.h Näytä tiedosto

@@ -156,7 +156,7 @@
156 156
   #include "pins_MEGATRONICS_3.h"     // ATmega2560
157 157
 #elif MB(RAMBO)
158 158
   #include "pins_RAMBO.h"             // ATmega2560
159
-#elif MB(MINIRAMBO)
159
+#elif MB(MINIRAMBO) || MB(MINIRAMBO_10A)
160 160
   #include "pins_MINIRAMBO.h"         // ATmega2560
161 161
 #elif MB(ELEFU_3)
162 162
   #include "pins_ELEFU_3.h"           // ATmega2560

+ 53
- 23
Marlin/pins_MINIRAMBO.h Näytä tiedosto

@@ -25,10 +25,14 @@
25 25
  */
26 26
 
27 27
 #ifndef __AVR_ATmega2560__
28
-  #error "Oops!  Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu."
28
+  #error "Oops!  Make sure you have 'Rambo' selected from the 'Tools -> Boards' menu."
29 29
 #endif
30 30
 
31
-#define BOARD_NAME          "Mini Rambo"
31
+#if MB(MINIRAMBO_10A)
32
+  #define BOARD_NAME "Mini Rambo 1.0a"
33
+#else
34
+  #define BOARD_NAME "Mini Rambo"
35
+#endif
32 36
 
33 37
 //
34 38
 // Limit Switches
@@ -66,10 +70,6 @@
66 70
 #define E0_DIR_PIN         43
67 71
 #define E0_ENABLE_PIN      26
68 72
 
69
-#define E1_STEP_PIN        -1
70
-#define E1_DIR_PIN         -1
71
-#define E1_ENABLE_PIN      -1
72
-
73 73
 // Microstepping pins - Mapping not from fastio.h (?)
74 74
 #define X_MS1_PIN          40
75 75
 #define X_MS2_PIN          41
@@ -101,7 +101,9 @@
101 101
 //
102 102
 #define HEATER_0_PIN        3
103 103
 #define HEATER_1_PIN        7
104
-#define HEATER_2_PIN        6
104
+#if !MB(MINIRAMBO_10A)
105
+  #define HEATER_2_PIN      6
106
+#endif
105 107
 #define HEATER_BED_PIN      4
106 108
 
107 109
 #define FAN_PIN             8
@@ -112,7 +114,9 @@
112 114
 //
113 115
 #define SDSS               53
114 116
 #define LED_PIN            13
115
-#define CASE_LIGHT_PIN      9
117
+#if !MB(MINIRAMBO_10A)
118
+  #define CASE_LIGHT_PIN    9
119
+#endif
116 120
 
117 121
 //
118 122
 // M3/M4/M5 - Spindle/Laser Control
@@ -127,33 +131,59 @@
127 131
 //
128 132
 #define E_MUX0_PIN         17
129 133
 #define E_MUX1_PIN         16
130
-#define E_MUX2_PIN         78 // 84 in MK2 Firmware, with BEEPER as 78
134
+#if !MB(MINIRAMBO_10A)
135
+  #define E_MUX2_PIN       78   // 84 in MK2 Firmware, with BEEPER as 78
136
+#endif
131 137
 
132 138
 //
133 139
 // LCD / Controller
134 140
 //
135 141
 #if ENABLED(ULTRA_LCD)
136 142
 
137
-  #define KILL_PIN         32
143
+  #if !MB(MINIRAMBO_10A)
144
+    #define KILL_PIN       32
145
+  #endif
138 146
 
139 147
   #if ENABLED(NEWPANEL)
140 148
 
141
-    // Beeper on AUX-4
142
-    #define BEEPER_PIN     84
149
+    #if MB(MINIRAMBO_10A)
150
+
151
+      #define BEEPER_PIN   78
152
+
153
+      #define BTN_EN1      80
154
+      #define BTN_EN2      73
155
+      #define BTN_ENC      21
143 156
 
144
-    #define LCD_PINS_RS    82
145
-    #define LCD_PINS_ENABLE 18
146
-    #define LCD_PINS_D4    19
147
-    #define LCD_PINS_D5    70
148
-    #define LCD_PINS_D6    85
149
-    #define LCD_PINS_D7    71
157
+      #define LCD_PINS_RS  38
158
+      #define LCD_PINS_ENABLE 5
159
+      #define LCD_PINS_D4  14
160
+      #define LCD_PINS_D5  15
161
+      #define LCD_PINS_D6  32
162
+      #define LCD_PINS_D7  31
150 163
 
151
-    // buttons are directly attached using AUX-2
152
-    #define BTN_EN1        14
153
-    #define BTN_EN2        72
154
-    #define BTN_ENC         9  // the click
164
+      #define SD_DETECT_PIN  72
155 165
 
156
-    #define SD_DETECT_PIN  15
166
+    #else // !MINIRAMBO_10A
167
+
168
+      // AUX-4
169
+      #define BEEPER_PIN   84
170
+
171
+      // AUX-2
172
+      #define BTN_EN1      14
173
+      #define BTN_EN2      72
174
+      #define BTN_ENC       9
175
+
176
+      #define LCD_PINS_RS  82
177
+      #define LCD_PINS_ENABLE 18
178
+      #define LCD_PINS_D4  19
179
+      #define LCD_PINS_D5  70
180
+      #define LCD_PINS_D6  85
181
+      #define LCD_PINS_D7  71
182
+
183
+      #define SD_DETECT_PIN  15
184
+
185
+    #endif // !MINIRAMBO_10A
157 186
 
158 187
   #endif // NEWPANEL
188
+
159 189
 #endif // ULTRA_LCD

Loading…
Peruuta
Tallenna