MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants.

Browse Source
This commit is contained in:
Daid 2012-11-24 11:46:31 +01:00
parent dbbf050005
commit 99e9554edd
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Marlin/Makefile
View File

@ -147,6 +147,11 @@ else ifeq ($(HARDWARE_MOTHERBOARD),91)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p MCU ?= atmega644p
#Rambo
else ifeq ($(HARDWARE_MOTHERBOARD),301)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
endif endif
# Be sure to regenerate speed_lookuptable.h with create_speed_lookuptable.py # Be sure to regenerate speed_lookuptable.h with create_speed_lookuptable.py
@ -158,10 +163,8 @@ F_CPU ?= 16000000
# Libraries, the "hardware variant" are for boards # Libraries, the "hardware variant" are for boards
# that derives from that, and their source are present in # that derives from that, and their source are present in
# the main Marlin source directory # the main Marlin source directory
ARDUINO = $(ARDUINO_INSTALL_DIR)/hardware/arduino/cores/arduino ifeq ($(HARDWARE_VARIANT), arduino)
HARDWARE_SRC = $(ARDUINO_INSTALL_DIR)/hardware/arduino/cores/arduino
ifeq (${HARDWARE_VARIANT}, arduino)
HARDWARE_SRC = $(ARDUINO)
else else
HARDWARE_SRC = $(HARDWARE_VARIANT)/cores/arduino HARDWARE_SRC = $(HARDWARE_VARIANT)/cores/arduino
endif endif
@ -175,12 +178,12 @@ TARGET = $(notdir $(CURDIR))
VPATH = . VPATH = .
VPATH += $(BUILD_DIR) VPATH += $(BUILD_DIR)
VPATH += $(HARDWARE_SRC) VPATH += $(HARDWARE_SRC)
VPATH += $(ARDUINO)
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal
#TODO: Add the path to the hardware variant when using Arduino >= 100, and adjust the files required for compilation. VPATH += $(ARDUINO_INSTALL_DIR)/libraries/SPI
#VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/mega ifeq ($(HARDWARE_VARIANT), arduino)
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/mega
SRC = pins_arduino.c main.c wiring.c \ endif
SRC = wiring.c \
wiring_analog.c wiring_digital.c \ wiring_analog.c wiring_digital.c \
wiring_pulse.c \ wiring_pulse.c \
wiring_shift.c WInterrupts.c wiring_shift.c WInterrupts.c
@ -188,8 +191,15 @@ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \ MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \
SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \ SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \
stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp
#CXXSRC += LiquidCrystal.cpp ultralcd.cpp CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp
#CXXSRC += ultralcd.cpp
#Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
CXXSRC += main.cpp
else
SRC += pins_arduino.c main.c
endif
FORMAT = ihex FORMAT = ihex
# Name of this Makefile (used for "make depend"). # Name of this Makefile (used for "make depend").