From 1062f9d879c6c6a1ca77c315b7a9bc39a31cd9bd Mon Sep 17 00:00:00 2001
From: maniacbug <maniacbug@ymail.com>
Date: Wed, 25 May 2011 20:47:16 -0700
Subject: [PATCH] Environment-specific changes for me.  Testing out latest
 arduino from git, and added a 3rd upload option

---
 examples/starping_relay/makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/examples/starping_relay/makefile b/examples/starping_relay/makefile
index 2ea7538..15cb43b 100644
--- a/examples/starping_relay/makefile
+++ b/examples/starping_relay/makefile
@@ -64,8 +64,9 @@ ARDUINO_VERSION	= 21
 ARDUINO_DIR 	= /opt/arduino-00$(ARDUINO_VERSION)
 AVR_TOOLS_PATH 	= $(ARDUINO_DIR)/hardware/tools/avr/bin
 AVRDUDECONFIG_PATH = $(ARDUINO_DIR)/hardware/tools/avr/etc
-PORT                    = /dev/tty.usbserial-A600eHIs 
+PORT                    = /dev/tty.usbserial-A600eHIs
 PORT2                   = /dev/tty.usbserial-A9007LmI
+PORT3                   = /dev/tty.usbserial-A40081RP
 else
 ARDUINO_VERSION	= 22
 ARDUINO_DIR 	= /opt/arduino-00$(ARDUINO_VERSION)
@@ -75,6 +76,12 @@ PORT 			= /dev/ttyUSB0
 PORT2 			= /dev/ttyUSB1
 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_DIR 	= . 
 ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino
@@ -217,6 +224,9 @@ upload1: output/$(PROJECT_NAME).hex
 upload2: output/$(PROJECT_NAME).hex
 	$(AVRDUDE) $(AVRDUDE_FLAGS) -P $(PORT2) $(AVRDUDE_WRITE_FLASH)
 
+upload3: output/$(PROJECT_NAME).hex
+	$(AVRDUDE) $(AVRDUDE_FLAGS) -P $(PORT3) $(AVRDUDE_WRITE_FLASH)
+
 sym:
 	$(NM) -n -C --format=posix output/$(PROJECT_NAME).elf > output/$(PROJECT_NAME).sym