Environment-specific changes for me. Testing out latest arduino from git, and added a 3rd upload option

This commit is contained in:
maniacbug 2011-05-25 20:47:16 -07:00
parent 40eea86ffe
commit 1062f9d879
1 changed files with 11 additions and 1 deletions

View File

@ -64,8 +64,9 @@ ARDUINO_VERSION = 21
ARDUINO_DIR = /opt/arduino-00$(ARDUINO_VERSION) ARDUINO_DIR = /opt/arduino-00$(ARDUINO_VERSION)
AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools/avr/bin AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools/avr/bin
AVRDUDECONFIG_PATH = $(ARDUINO_DIR)/hardware/tools/avr/etc AVRDUDECONFIG_PATH = $(ARDUINO_DIR)/hardware/tools/avr/etc
PORT = /dev/tty.usbserial-A600eHIs PORT = /dev/tty.usbserial-A600eHIs
PORT2 = /dev/tty.usbserial-A9007LmI PORT2 = /dev/tty.usbserial-A9007LmI
PORT3 = /dev/tty.usbserial-A40081RP
else else
ARDUINO_VERSION = 22 ARDUINO_VERSION = 22
ARDUINO_DIR = /opt/arduino-00$(ARDUINO_VERSION) ARDUINO_DIR = /opt/arduino-00$(ARDUINO_VERSION)
@ -75,6 +76,12 @@ PORT = /dev/ttyUSB0
PORT2 = /dev/ttyUSB1 PORT2 = /dev/ttyUSB1
endif endif
# Temporary testing of github Arduino environment
OLD_DIR = /opt/arduino-00$(ARDUINO_VERSION)
AVR_TOOLS_PATH = $(OLD_DIR)/hardware/tools/avr/bin
AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc
ARDUINO_DIR = /opt/Arduino
PROJECT_NAME = $(notdir $(PWD)) PROJECT_NAME = $(notdir $(PWD))
PROJECT_DIR = . PROJECT_DIR = .
ARDUINO_CORE = $(ARDUINO_DIR)/hardware/arduino/cores/arduino ARDUINO_CORE = $(ARDUINO_DIR)/hardware/arduino/cores/arduino
@ -217,6 +224,9 @@ upload1: output/$(PROJECT_NAME).hex
upload2: output/$(PROJECT_NAME).hex upload2: output/$(PROJECT_NAME).hex
$(AVRDUDE) $(AVRDUDE_FLAGS) -P $(PORT2) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(PORT2) $(AVRDUDE_WRITE_FLASH)
upload3: output/$(PROJECT_NAME).hex
$(AVRDUDE) $(AVRDUDE_FLAGS) -P $(PORT3) $(AVRDUDE_WRITE_FLASH)
sym: sym:
$(NM) -n -C --format=posix output/$(PROJECT_NAME).elf > output/$(PROJECT_NAME).sym $(NM) -n -C --format=posix output/$(PROJECT_NAME).elf > output/$(PROJECT_NAME).sym