Browse Source

Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})

David Forrest 10 years ago
parent
commit
75f39fadfc
1 changed files with 13 additions and 3 deletions
  1. 13
    3
      Marlin/Makefile

+ 13
- 3
Marlin/Makefile View File

@@ -14,7 +14,7 @@
14 14
 #
15 15
 #  1. Modify the line containg "ARDUINO_INSTALL_DIR" to point to the directory that
16 16
 #     contains the Arduino installation (for example, under Mac OS X, this
17
-#     might be /Applications/arduino-0012).
17
+#     might be /Applications/Arduino.app/Contents/Resources/Java).
18 18
 #
19 19
 #  2. Modify the line containing "UPLOAD_PORT" to refer to the filename
20 20
 #     representing the USB or serial connection to your Arduino board
@@ -40,8 +40,8 @@
40 40
 HARDWARE_MOTHERBOARD ?= 11
41 41
 
42 42
 # Arduino source install directory, and version number
43
-ARDUINO_INSTALL_DIR  ?= ../../arduino-0022
44
-ARDUINO_VERSION      ?= 22
43
+ARDUINO_INSTALL_DIR  ?= /Applications/Arduino.app/Contents/Resources/Java
44
+ARDUINO_VERSION      ?= 105
45 45
 
46 46
 # You can optionally set a path to the avr-gcc tools. Requires a trailing slash. (ex: /usr/local/avr-gcc/bin)
47 47
 AVR_TOOLS_PATH ?=
@@ -142,6 +142,12 @@ MCU              ?= at90usb1286
142 142
 else ifeq  ($(HARDWARE_MOTHERBOARD),82)
143 143
 HARDWARE_VARIANT ?= Teensy
144 144
 MCU              ?= at90usb646
145
+else ifeq  ($(HARDWARE_MOTHERBOARD),83)
146
+HARDWARE_VARIANT ?= Teensy
147
+MCU              ?= at90usb1286
148
+else ifeq  ($(HARDWARE_MOTHERBOARD),84)
149
+HARDWARE_VARIANT ?= Teensy
150
+MCU              ?= at90usb1286
145 151
 
146 152
 #Gen3+
147 153
 else ifeq  ($(HARDWARE_MOTHERBOARD),9)
@@ -227,6 +233,10 @@ SRC = wiring.c \
227 233
 	wiring_analog.c wiring_digital.c \
228 234
 	wiring_pulse.c \
229 235
 	wiring_shift.c WInterrupts.c
236
+ifeq ($(HARDWARE_VARIANT), Teensy)
237
+SRC = wiring.c
238
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/teensy/cores/teensy
239
+endif
230 240
 CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp	\
231 241
 	MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp	\
232 242
 	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\

Loading…
Cancel
Save