fix avrdude upload in makefile
This commit is contained in:
parent
46843bd927
commit
5045d17a39
1 changed files with 10 additions and 7 deletions
|
@ -36,11 +36,12 @@
|
|||
# Note that all settings are set with ?=, this means you can override them
|
||||
# from the commandline with "make HARDWARE_MOTHERBOARD=71" for example
|
||||
|
||||
# This defined the board you are compiling for (see Configuration.h for the options)
|
||||
# This defined the board you are compiling for (see boards.h for the options)
|
||||
HARDWARE_MOTHERBOARD ?= 11
|
||||
|
||||
# Arduino source install directory, and version number
|
||||
ARDUINO_INSTALL_DIR ?= /Applications/Arduino.app/Contents/Resources/Java
|
||||
# On most linuxes this will be /usr/share/arduino
|
||||
ARDUINO_INSTALL_DIR ?= /usr/share/arduino
|
||||
ARDUINO_VERSION ?= 105
|
||||
|
||||
# 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 ?=
|
|||
#Programmer configuration
|
||||
UPLOAD_RATE ?= 115200
|
||||
AVRDUDE_PROGRAMMER ?= arduino
|
||||
# on most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1
|
||||
UPLOAD_PORT ?= /dev/arduino
|
||||
|
||||
#Directory used to build files in, contains all the build files, from object files to the final hex file.
|
||||
#Directory used to build files in, contains all the build files, from object files to the final hex file
|
||||
#on linux it is best to put an absolute path like /home/username/tmp .
|
||||
BUILD_DIR ?= applet
|
||||
|
||||
# This defines whether Liquid_TWI2 support will be built
|
||||
|
@ -357,8 +360,8 @@ AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avrdude.conf
|
|||
else
|
||||
AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf
|
||||
endif
|
||||
AVRDUDE_FLAGS = -D -C $(AVRDUDE_CONF) \
|
||||
-p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
|
||||
AVRDUDE_FLAGS = -q -q -D -C$(AVRDUDE_CONF) \
|
||||
-p$(MCU) -P$(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -cwiring\
|
||||
-b$(UPLOAD_RATE)
|
||||
|
||||
# Define all object files.
|
||||
|
|
Reference in a new issue