Browse Source

Merge pull request #10276 from thinkyhead/bf2_ender_4_cr_8

[2.0.x] Fix Ender 4 compilation, add more AVRs to Makefile
Scott Lahteine 7 years ago
parent
commit
e3bbd70664
No account linked to committer's email address
3 changed files with 166 additions and 2 deletions
  1. 163
    2
      Marlin/src/Makefile
  2. 1
    0
      Marlin/src/core/boards.h
  3. 2
    0
      Marlin/src/pins/pins.h

+ 163
- 2
Marlin/src/Makefile View File

1
-# Sprinter Arduino Project Makefile
1
+# Marlin Firmware Arduino Project Makefile
2
 #
2
 #
3
 # Makefile Based on:
3
 # Makefile Based on:
4
 # Arduino 0011 Makefile
4
 # Arduino 0011 Makefile
149
 HARDWARE_VARIANT ?= arduino
149
 HARDWARE_VARIANT ?= arduino
150
 MCU              ?= atmega2560
150
 MCU              ?= atmega2560
151
 
151
 
152
+#RAMPS equivalents
153
+else ifeq  ($(HARDWARE_MOTHERBOARD),143)
154
+HARDWARE_VARIANT ?= arduino
155
+MCU              ?= atmega2560
156
+else ifeq  ($(HARDWARE_MOTHERBOARD),144)
157
+HARDWARE_VARIANT ?= arduino
158
+MCU              ?= atmega2560
159
+else ifeq  ($(HARDWARE_MOTHERBOARD),145)
160
+HARDWARE_VARIANT ?= arduino
161
+MCU              ?= atmega2560
162
+else ifeq  ($(HARDWARE_MOTHERBOARD),146)
163
+HARDWARE_VARIANT ?= arduino
164
+MCU              ?= atmega2560
165
+else ifeq  ($(HARDWARE_MOTHERBOARD),148)
166
+HARDWARE_VARIANT ?= arduino
167
+MCU              ?= atmega2560
168
+else ifeq  ($(HARDWARE_MOTHERBOARD),77)
169
+HARDWARE_VARIANT ?= arduino
170
+MCU              ?= atmega2560
171
+else ifeq  ($(HARDWARE_MOTHERBOARD),78)
172
+HARDWARE_VARIANT ?= arduino
173
+MCU              ?= atmega2560
174
+else ifeq  ($(HARDWARE_MOTHERBOARD),79)
175
+HARDWARE_VARIANT ?= arduino
176
+MCU              ?= atmega2560
177
+else ifeq  ($(HARDWARE_MOTHERBOARD),401)
178
+HARDWARE_VARIANT ?= arduino
179
+MCU              ?= atmega2560
180
+else ifeq  ($(HARDWARE_MOTHERBOARD),402)
181
+HARDWARE_VARIANT ?= arduino
182
+MCU              ?= atmega2560
183
+else ifeq  ($(HARDWARE_MOTHERBOARD),40)
184
+HARDWARE_VARIANT ?= arduino
185
+MCU              ?= atmega2560
186
+else ifeq  ($(HARDWARE_MOTHERBOARD),41)
187
+HARDWARE_VARIANT ?= arduino
188
+MCU              ?= atmega2560
189
+else ifeq  ($(HARDWARE_MOTHERBOARD),47)
190
+HARDWARE_VARIANT ?= arduino
191
+MCU              ?= atmega2560
192
+else ifeq  ($(HARDWARE_MOTHERBOARD),53)
193
+HARDWARE_VARIANT ?= arduino
194
+MCU              ?= atmega2560
195
+else ifeq  ($(HARDWARE_MOTHERBOARD),504)
196
+HARDWARE_VARIANT ?= arduino
197
+MCU              ?= atmega2560
198
+else ifeq  ($(HARDWARE_MOTHERBOARD),37)
199
+HARDWARE_VARIANT ?= arduino
200
+MCU              ?= atmega2560
201
+else ifeq  ($(HARDWARE_MOTHERBOARD),42)
202
+HARDWARE_VARIANT ?= arduino
203
+MCU              ?= atmega2560
204
+else ifeq  ($(HARDWARE_MOTHERBOARD),52)
205
+HARDWARE_VARIANT ?= arduino
206
+MCU              ?= atmega2560
207
+else ifeq  ($(HARDWARE_MOTHERBOARD),49)
208
+HARDWARE_VARIANT ?= arduino
209
+MCU              ?= atmega2560
210
+else ifeq  ($(HARDWARE_MOTHERBOARD),72)
211
+HARDWARE_VARIANT ?= arduino
212
+MCU              ?= atmega2560
213
+else ifeq  ($(HARDWARE_MOTHERBOARD),80)
214
+HARDWARE_VARIANT ?= arduino
215
+MCU              ?= atmega2560
216
+else ifeq  ($(HARDWARE_MOTHERBOARD),503)
217
+HARDWARE_VARIANT ?= arduino
218
+MCU              ?= atmega2560
219
+else ifeq  ($(HARDWARE_MOTHERBOARD),431)
220
+HARDWARE_VARIANT ?= arduino
221
+MCU              ?= atmega2560
222
+else ifeq  ($(HARDWARE_MOTHERBOARD),343)
223
+HARDWARE_VARIANT ?= arduino
224
+MCU              ?= atmega2560
225
+else ifeq  ($(HARDWARE_MOTHERBOARD),243)
226
+HARDWARE_VARIANT ?= arduino
227
+MCU              ?= atmega2560
228
+
229
+#Other ATmega1280, ATmega2560
230
+else ifeq  ($(HARDWARE_MOTHERBOARD),111)
231
+HARDWARE_VARIANT ?= arduino
232
+MCU              ?= atmega2560
233
+else ifeq  ($(HARDWARE_MOTHERBOARD),112)
234
+HARDWARE_VARIANT ?= arduino
235
+MCU              ?= atmega2560
236
+else ifeq  ($(HARDWARE_MOTHERBOARD),2)
237
+HARDWARE_VARIANT ?= arduino
238
+MCU              ?= atmega2560
239
+else ifeq  ($(HARDWARE_MOTHERBOARD),21)
240
+HARDWARE_VARIANT ?= arduino
241
+MCU              ?= atmega2560
242
+else ifeq  ($(HARDWARE_MOTHERBOARD),200)
243
+HARDWARE_VARIANT ?= arduino
244
+MCU              ?= atmega2560
245
+else ifeq  ($(HARDWARE_MOTHERBOARD),70)
246
+HARDWARE_VARIANT ?= arduino
247
+MCU              ?= atmega2560
248
+else ifeq  ($(HARDWARE_MOTHERBOARD),701)
249
+HARDWARE_VARIANT ?= arduino
250
+MCU              ?= atmega2560
251
+else ifeq  ($(HARDWARE_MOTHERBOARD),703)
252
+HARDWARE_VARIANT ?= arduino
253
+MCU              ?= atmega2560
254
+else ifeq  ($(HARDWARE_MOTHERBOARD),704)
255
+HARDWARE_VARIANT ?= arduino
256
+MCU              ?= atmega2560
257
+else ifeq  ($(HARDWARE_MOTHERBOARD),302)
258
+HARDWARE_VARIANT ?= arduino
259
+MCU              ?= atmega2560
260
+else ifeq  ($(HARDWARE_MOTHERBOARD),303)
261
+HARDWARE_VARIANT ?= arduino
262
+MCU              ?= atmega2560
263
+else ifeq  ($(HARDWARE_MOTHERBOARD),304)
264
+HARDWARE_VARIANT ?= arduino
265
+MCU              ?= atmega2560
266
+else ifeq  ($(HARDWARE_MOTHERBOARD),21)
267
+HARDWARE_VARIANT ?= arduino
268
+MCU              ?= atmega2560
269
+else ifeq  ($(HARDWARE_MOTHERBOARD),999)
270
+HARDWARE_VARIANT ?= arduino
271
+MCU              ?= atmega2560
272
+else ifeq  ($(HARDWARE_MOTHERBOARD),310)
273
+HARDWARE_VARIANT ?= arduino
274
+MCU              ?= atmega2560
275
+else ifeq  ($(HARDWARE_MOTHERBOARD),321)
276
+HARDWARE_VARIANT ?= arduino
277
+MCU              ?= atmega2560
278
+else ifeq  ($(HARDWARE_MOTHERBOARD),74)
279
+HARDWARE_VARIANT ?= arduino
280
+MCU              ?= atmega2560
281
+else ifeq  ($(HARDWARE_MOTHERBOARD),75)
282
+HARDWARE_VARIANT ?= arduino
283
+MCU              ?= atmega2560
284
+
152
 #Gen6
285
 #Gen6
153
 else ifeq  ($(HARDWARE_MOTHERBOARD),5)
286
 else ifeq  ($(HARDWARE_MOTHERBOARD),5)
154
 HARDWARE_VARIANT ?= Gen6
287
 HARDWARE_VARIANT ?= Gen6
167
 else ifeq  ($(HARDWARE_MOTHERBOARD),63)
300
 else ifeq  ($(HARDWARE_MOTHERBOARD),63)
168
 HARDWARE_VARIANT ?= Sanguino
301
 HARDWARE_VARIANT ?= Sanguino
169
 MCU              ?= atmega644p
302
 MCU              ?= atmega644p
303
+else ifeq  ($(HARDWARE_MOTHERBOARD),64)
304
+HARDWARE_VARIANT ?= Sanguino
305
+MCU              ?= atmega1284p
170
 else ifeq  ($(HARDWARE_MOTHERBOARD),65)
306
 else ifeq  ($(HARDWARE_MOTHERBOARD),65)
171
 HARDWARE_VARIANT ?= Sanguino
307
 HARDWARE_VARIANT ?= Sanguino
172
 MCU              ?= atmega1284p
308
 MCU              ?= atmega1284p
176
 else ifeq  ($(HARDWARE_MOTHERBOARD),69)
312
 else ifeq  ($(HARDWARE_MOTHERBOARD),69)
177
 HARDWARE_VARIANT ?= Sanguino
313
 HARDWARE_VARIANT ?= Sanguino
178
 MCU              ?= atmega1284p
314
 MCU              ?= atmega1284p
315
+else ifeq  ($(HARDWARE_MOTHERBOARD),89)
316
+HARDWARE_VARIANT ?= Sanguino
317
+MCU              ?= atmega1284p
318
+else ifeq  ($(HARDWARE_MOTHERBOARD),92)
319
+HARDWARE_VARIANT ?= Sanguino
320
+MCU              ?= atmega1284p
321
+else ifeq  ($(HARDWARE_MOTHERBOARD),505)
322
+HARDWARE_VARIANT ?= Sanguino
323
+MCU              ?= atmega1284p
179
 else ifeq  ($(HARDWARE_MOTHERBOARD),601)
324
 else ifeq  ($(HARDWARE_MOTHERBOARD),601)
180
 HARDWARE_VARIANT ?= Sanguino
325
 HARDWARE_VARIANT ?= Sanguino
181
 MCU              ?= atmega1284p
326
 MCU              ?= atmega1284p
188
 HARDWARE_VARIANT ?= arduino
333
 HARDWARE_VARIANT ?= arduino
189
 MCU              ?= atmega1280
334
 MCU              ?= atmega1280
190
 
335
 
336
+#ATmega1281, ATmega2561
337
+else ifeq  ($(HARDWARE_MOTHERBOARD),702)
338
+HARDWARE_VARIANT ?= arduino
339
+MCU              ?= atmega1281
340
+else ifeq  ($(HARDWARE_MOTHERBOARD),25)
341
+HARDWARE_VARIANT ?= arduino
342
+MCU              ?= atmega1281
343
+
191
 #Teensylu
344
 #Teensylu
192
 else ifeq  ($(HARDWARE_MOTHERBOARD),8)
345
 else ifeq  ($(HARDWARE_MOTHERBOARD),8)
193
 HARDWARE_VARIANT ?= Teensy
346
 HARDWARE_VARIANT ?= Teensy
207
 else ifeq  ($(HARDWARE_MOTHERBOARD),84)
360
 else ifeq  ($(HARDWARE_MOTHERBOARD),84)
208
 HARDWARE_VARIANT ?= Teensy
361
 HARDWARE_VARIANT ?= Teensy
209
 MCU              ?= at90usb1286
362
 MCU              ?= at90usb1286
363
+else ifeq  ($(HARDWARE_MOTHERBOARD),88)
364
+HARDWARE_VARIANT ?= Teensy
365
+MCU              ?= at90usb1286
210
 
366
 
211
 #Gen3+
367
 #Gen3+
212
 else ifeq  ($(HARDWARE_MOTHERBOARD),9)
368
 else ifeq  ($(HARDWARE_MOTHERBOARD),9)
233
 HARDWARE_VARIANT ?= Sanguino
389
 HARDWARE_VARIANT ?= Sanguino
234
 MCU              ?= atmega644p
390
 MCU              ?= atmega644p
235
 
391
 
392
+#Sethi 3D_1
393
+else ifeq  ($(HARDWARE_MOTHERBOARD),20)
394
+HARDWARE_VARIANT ?= Sanguino
395
+MCU              ?= atmega644p
396
+
236
 #Rambo
397
 #Rambo
237
 else ifeq  ($(HARDWARE_MOTHERBOARD),301)
398
 else ifeq  ($(HARDWARE_MOTHERBOARD),301)
238
 HARDWARE_VARIANT ?= arduino
399
 HARDWARE_VARIANT ?= arduino
239
 MCU              ?= atmega2560
400
 MCU              ?= atmega2560
240
 
401
 
241
-# Azteeg
402
+#Azteeg
242
 else ifeq  ($(HARDWARE_MOTHERBOARD),67)
403
 else ifeq  ($(HARDWARE_MOTHERBOARD),67)
243
 HARDWARE_VARIANT ?= arduino
404
 HARDWARE_VARIANT ?= arduino
244
 MCU              ?= atmega2560
405
 MCU              ?= atmega2560

+ 1
- 0
Marlin/src/core/boards.h View File

76
 #define BOARD_BQ_ZUM_MEGA_3D    503   // bq ZUM Mega 3D
76
 #define BOARD_BQ_ZUM_MEGA_3D    503   // bq ZUM Mega 3D
77
 #define BOARD_MAKEBOARD_MINI    431   // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
77
 #define BOARD_MAKEBOARD_MINI    431   // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
78
 #define BOARD_TRIGORILLA        343   // TriGorilla Anycubic version 1.3 based on RAMPS EFB
78
 #define BOARD_TRIGORILLA        343   // TriGorilla Anycubic version 1.3 based on RAMPS EFB
79
+#define BOARD_RAMPS_ENDER_4     243   // Creality: Ender-4, CR-8
79
 
80
 
80
 //
81
 //
81
 // Other ATmega1280, ATmega2560
82
 // Other ATmega1280, ATmega2560

+ 2
- 0
Marlin/src/pins/pins.h View File

175
   #include "pins_GT2560_REV_A.h"      // ATmega1280, ATmega2560
175
   #include "pins_GT2560_REV_A.h"      // ATmega1280, ATmega2560
176
 #elif MB(GT2560_REV_A_PLUS)
176
 #elif MB(GT2560_REV_A_PLUS)
177
   #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
177
   #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
178
+#elif MB(RAMPS_ENDER_4)
179
+  #include "pins_RAMPS_ENDER_4.h"     // ATmega2560
178
 
180
 
179
 //
181
 //
180
 // ATmega1281, ATmega2561
182
 // ATmega1281, ATmega2561

Loading…
Cancel
Save