Browse Source

Fixed Makefile to work with Melzi2 boards on arduino-1.6.x

- also by default use ${HOME}/Arduino as install directory which may be more
sane, especially with arduino packages provided by distributions
- bump arduino version to 106 (this seems to be useless)
- program firmware through the USB serial which is more comfortable way how
to program the firmware
- use 57600 programing speed by default which seems to be more reliable
with arduino bootloaders (at least with those shipped with the Melzi2 boards)

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
Jaroslav Škarvada 9 years ago
parent
commit
d229c58df6
1 changed files with 18 additions and 11 deletions
  1. 18
    11
      Marlin/Makefile

+ 18
- 11
Marlin/Makefile View File

@@ -41,17 +41,17 @@ HARDWARE_MOTHERBOARD ?= 11
41 41
 
42 42
 # Arduino source install directory, and version number
43 43
 # On most linuxes this will be /usr/share/arduino
44
-ARDUINO_INSTALL_DIR  ?= /usr/share/arduino
45
-ARDUINO_VERSION      ?= 105
44
+ARDUINO_INSTALL_DIR  ?= ${HOME}/Arduino
45
+ARDUINO_VERSION      ?= 106
46 46
 
47 47
 # You can optionally set a path to the avr-gcc tools. Requires a trailing slash. (ex: /usr/local/avr-gcc/bin)
48 48
 AVR_TOOLS_PATH ?=
49 49
 
50 50
 #Programmer configuration
51
-UPLOAD_RATE        ?= 115200
52
-AVRDUDE_PROGRAMMER ?= wiring
51
+UPLOAD_RATE        ?= 57600
52
+AVRDUDE_PROGRAMMER ?= arduino
53 53
 # on most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1 
54
-UPLOAD_PORT        ?= /dev/arduino
54
+UPLOAD_PORT        ?= /dev/ttyUSB0
55 55
 
56 56
 #Directory used to build files in, contains all the build files, from object files to the final hex file
57 57
 #on linux it is best to put an absolute path like /home/username/tmp .
@@ -147,6 +147,9 @@ MCU              ?= atmega1284p
147 147
 else ifeq  ($(HARDWARE_MOTHERBOARD),66)
148 148
 HARDWARE_VARIANT ?= Sanguino
149 149
 MCU              ?= atmega1284p
150
+else ifeq  ($(HARDWARE_MOTHERBOARD),69)
151
+HARDWARE_VARIANT ?= Sanguino
152
+MCU              ?= atmega1284p
150 153
 
151 154
 #Ultimaker
152 155
 else ifeq  ($(HARDWARE_MOTHERBOARD),7)
@@ -222,7 +225,7 @@ F_CPU ?= 16000000
222 225
 # Libraries, the "hardware variant" are for boards
223 226
 # that derives from that, and their source are present in
224 227
 # the main Marlin source directory
225
-ifeq ($(HARDWARE_VARIANT), arduino)
228
+ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Sanguino))
226 229
 HARDWARE_DIR = $(ARDUINO_INSTALL_DIR)/hardware
227 230
 else
228 231
 ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
@@ -231,7 +234,7 @@ else
231 234
 HARDWARE_DIR = ../ArduinoAddons/Arduino_0.xx
232 235
 endif
233 236
 endif
234
-HARDWARE_SRC = $(HARDWARE_DIR)/$(HARDWARE_VARIANT)/cores/arduino
237
+HARDWARE_SRC = $(HARDWARE_DIR)/marlin/avr/cores/arduino
235 238
 
236 239
 TARGET = $(notdir $(CURDIR))
237 240
 
@@ -242,9 +245,9 @@ TARGET = $(notdir $(CURDIR))
242 245
 VPATH = .
243 246
 VPATH += $(BUILD_DIR)
244 247
 VPATH += $(HARDWARE_SRC)
245
-ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Teensy))
246
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal
247
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/SPI
248
+ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Teensy Sanguino))
249
+VPATH += $(HARDWARE_DIR)/marlin/avr/libraries/LiquidCrystal/src
250
+VPATH += $(HARDWARE_DIR)/marlin/avr/libraries/SPI
248 251
 ifeq ($(LIQUID_TWI2), 1)
249 252
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire
250 253
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire/utility
@@ -271,13 +274,17 @@ ifeq ($(HARDWARE_VARIANT), arduino)
271 274
 HARDWARE_SUB_VARIANT ?= mega
272 275
 VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/$(HARDWARE_SUB_VARIANT)
273 276
 else
277
+ifeq ($(HARDWARE_VARIANT), Sanguino)
278
+VPATH += $(HARDWARE_DIR)/marlin/avr/variants/sanguino
279
+else
274 280
 HARDWARE_SUB_VARIANT ?= standard
275 281
 VPATH += $(HARDWARE_DIR)/$(HARDWARE_VARIANT)/variants/$(HARDWARE_SUB_VARIANT)
276 282
 endif
283
+endif
277 284
 SRC = wiring.c \
278 285
 	wiring_analog.c wiring_digital.c \
279 286
 	wiring_pulse.c \
280
-	wiring_shift.c WInterrupts.c
287
+	wiring_shift.c WInterrupts.c hooks.c
281 288
 ifeq ($(HARDWARE_VARIANT), Teensy)
282 289
 SRC = wiring.c
283 290
 VPATH += $(ARDUINO_INSTALL_DIR)/hardware/teensy/cores/teensy

Loading…
Cancel
Save