From 4a23069de915996d195f853fc97945f3772c095a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 1 Apr 2018 18:18:36 -0500 Subject: [PATCH 1/2] Fix Ender 4 / CR-8 compilation - Assign 243 (like EFB) as Ender-4/CR-8 board ID - Add to `Makefile` - Add to `pins.h` --- Marlin/src/Makefile | 3 +++ Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Marlin/src/Makefile b/Marlin/src/Makefile index e5a74cbbf0..6d40e2ab37 100644 --- a/Marlin/src/Makefile +++ b/Marlin/src/Makefile @@ -148,6 +148,9 @@ MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),48) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),243) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 #Gen6 else ifeq ($(HARDWARE_MOTHERBOARD),5) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 9d68569fca..236895642e 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -76,6 +76,7 @@ #define BOARD_BQ_ZUM_MEGA_3D 503 // bq ZUM Mega 3D #define BOARD_MAKEBOARD_MINI 431 // MakeBoard Mini v2.1.2 is a control board sold by MicroMake #define BOARD_TRIGORILLA 343 // TriGorilla Anycubic version 1.3 based on RAMPS EFB +#define BOARD_RAMPS_ENDER_4 243 // Creality: Ender-4, CR-8 // // Other ATmega1280, ATmega2560 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index bd8f66c635..ff154d620e 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -175,6 +175,8 @@ #include "pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 #elif MB(GT2560_REV_A_PLUS) #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 +#elif MB(RAMPS_ENDER_4) + #include "pins_RAMPS_ENDER_4.h" // ATmega2560 // // ATmega1281, ATmega2561 From 4f0eafce8f7d5c61251d6edb37b04af0ec20b227 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 1 Apr 2018 18:21:33 -0500 Subject: [PATCH 2/2] Add more AVR boards to Makefile --- Marlin/src/Makefile | 162 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 2 deletions(-) diff --git a/Marlin/src/Makefile b/Marlin/src/Makefile index 6d40e2ab37..9a86bd1687 100644 --- a/Marlin/src/Makefile +++ b/Marlin/src/Makefile @@ -1,4 +1,4 @@ -# Sprinter Arduino Project Makefile +# Marlin Firmware Arduino Project Makefile # # Makefile Based on: # Arduino 0011 Makefile @@ -148,10 +148,140 @@ MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),48) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560 + +#RAMPS equivalents +else ifeq ($(HARDWARE_MOTHERBOARD),143) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),144) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),145) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),146) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),148) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),77) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),78) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),79) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),401) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),402) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),40) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),41) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),47) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),53) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),504) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),37) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),42) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),52) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),49) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),72) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),80) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),503) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),431) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),343) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),243) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560 +#Other ATmega1280, ATmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),111) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),112) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),2) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),21) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),200) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),70) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),701) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),703) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),704) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),302) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),303) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),304) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),21) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),999) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),310) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),321) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),74) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 +else ifeq ($(HARDWARE_MOTHERBOARD),75) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega2560 + #Gen6 else ifeq ($(HARDWARE_MOTHERBOARD),5) HARDWARE_VARIANT ?= Gen6 @@ -170,6 +300,9 @@ MCU ?= atmega644p else ifeq ($(HARDWARE_MOTHERBOARD),63) HARDWARE_VARIANT ?= Sanguino MCU ?= atmega644p +else ifeq ($(HARDWARE_MOTHERBOARD),64) +HARDWARE_VARIANT ?= Sanguino +MCU ?= atmega1284p else ifeq ($(HARDWARE_MOTHERBOARD),65) HARDWARE_VARIANT ?= Sanguino MCU ?= atmega1284p @@ -179,6 +312,15 @@ MCU ?= atmega1284p else ifeq ($(HARDWARE_MOTHERBOARD),69) HARDWARE_VARIANT ?= Sanguino MCU ?= atmega1284p +else ifeq ($(HARDWARE_MOTHERBOARD),89) +HARDWARE_VARIANT ?= Sanguino +MCU ?= atmega1284p +else ifeq ($(HARDWARE_MOTHERBOARD),92) +HARDWARE_VARIANT ?= Sanguino +MCU ?= atmega1284p +else ifeq ($(HARDWARE_MOTHERBOARD),505) +HARDWARE_VARIANT ?= Sanguino +MCU ?= atmega1284p else ifeq ($(HARDWARE_MOTHERBOARD),601) HARDWARE_VARIANT ?= Sanguino MCU ?= atmega1284p @@ -191,6 +333,14 @@ else ifeq ($(HARDWARE_MOTHERBOARD),71) HARDWARE_VARIANT ?= arduino MCU ?= atmega1280 +#ATmega1281, ATmega2561 +else ifeq ($(HARDWARE_MOTHERBOARD),702) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega1281 +else ifeq ($(HARDWARE_MOTHERBOARD),25) +HARDWARE_VARIANT ?= arduino +MCU ?= atmega1281 + #Teensylu else ifeq ($(HARDWARE_MOTHERBOARD),8) HARDWARE_VARIANT ?= Teensy @@ -210,6 +360,9 @@ MCU ?= at90usb1286 else ifeq ($(HARDWARE_MOTHERBOARD),84) HARDWARE_VARIANT ?= Teensy MCU ?= at90usb1286 +else ifeq ($(HARDWARE_MOTHERBOARD),88) +HARDWARE_VARIANT ?= Teensy +MCU ?= at90usb1286 #Gen3+ else ifeq ($(HARDWARE_MOTHERBOARD),9) @@ -236,12 +389,17 @@ else ifeq ($(HARDWARE_MOTHERBOARD),91) HARDWARE_VARIANT ?= Sanguino MCU ?= atmega644p +#Sethi 3D_1 +else ifeq ($(HARDWARE_MOTHERBOARD),20) +HARDWARE_VARIANT ?= Sanguino +MCU ?= atmega644p + #Rambo else ifeq ($(HARDWARE_MOTHERBOARD),301) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560 -# Azteeg +#Azteeg else ifeq ($(HARDWARE_MOTHERBOARD),67) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560