|
@@ -36,11 +36,12 @@
|
36
|
36
|
# Note that all settings are set with ?=, this means you can override them
|
37
|
37
|
# from the commandline with "make HARDWARE_MOTHERBOARD=71" for example
|
38
|
38
|
|
39
|
|
-# This defined the board you are compiling for (see Configuration.h for the options)
|
|
39
|
+# This defined the board you are compiling for (see boards.h for the options)
|
40
|
40
|
HARDWARE_MOTHERBOARD ?= 11
|
41
|
41
|
|
42
|
42
|
# Arduino source install directory, and version number
|
43
|
|
-ARDUINO_INSTALL_DIR ?= /Applications/Arduino.app/Contents/Resources/Java
|
|
43
|
+# On most linuxes this will be /usr/share/arduino
|
|
44
|
+ARDUINO_INSTALL_DIR ?= /usr/share/arduino
|
44
|
45
|
ARDUINO_VERSION ?= 105
|
45
|
46
|
|
46
|
47
|
# You can optionally set a path to the avr-gcc tools. Requires a trailing slash. (ex: /usr/local/avr-gcc/bin)
|
|
@@ -49,9 +50,11 @@ AVR_TOOLS_PATH ?=
|
49
|
50
|
#Programmer configuration
|
50
|
51
|
UPLOAD_RATE ?= 115200
|
51
|
52
|
AVRDUDE_PROGRAMMER ?= arduino
|
|
53
|
+# on most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1
|
52
|
54
|
UPLOAD_PORT ?= /dev/arduino
|
53
|
55
|
|
54
|
|
-#Directory used to build files in, contains all the build files, from object files to the final hex file.
|
|
56
|
+#Directory used to build files in, contains all the build files, from object files to the final hex file
|
|
57
|
+#on linux it is best to put an absolute path like /home/username/tmp .
|
55
|
58
|
BUILD_DIR ?= applet
|
56
|
59
|
|
57
|
60
|
# This defines whether Liquid_TWI2 support will be built
|
|
@@ -351,15 +354,15 @@ LDFLAGS = -lm
|
351
|
354
|
|
352
|
355
|
# Programming support using avrdude. Settings and variables.
|
353
|
356
|
AVRDUDE_PORT = $(UPLOAD_PORT)
|
354
|
|
-AVRDUDE_WRITE_FLASH = -U flash:w:$(BUILD_DIR)/$(TARGET).hex:i
|
|
357
|
+AVRDUDE_WRITE_FLASH = -Uflash:w:$(BUILD_DIR)/$(TARGET).hex:i
|
355
|
358
|
ifeq ($(shell uname -s), Linux)
|
356
|
359
|
AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avrdude.conf
|
357
|
360
|
else
|
358
|
361
|
AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf
|
359
|
362
|
endif
|
360
|
|
-AVRDUDE_FLAGS = -D -C $(AVRDUDE_CONF) \
|
361
|
|
- -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
|
362
|
|
- -b $(UPLOAD_RATE)
|
|
363
|
+AVRDUDE_FLAGS = -q -q -D -C$(AVRDUDE_CONF) \
|
|
364
|
+ -p$(MCU) -P$(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -cwiring\
|
|
365
|
+ -b$(UPLOAD_RATE)
|
363
|
366
|
|
364
|
367
|
# Define all object files.
|
365
|
368
|
OBJ = ${patsubst %.c, $(BUILD_DIR)/%.o, ${SRC}}
|