From e5b81254690bb82562bac329d5c52a185e4064f4 Mon Sep 17 00:00:00 2001
From: Simon John <git@the-jedi.co.uk>
Date: Sat, 21 Jun 2014 12:32:34 +0200
Subject: Really fix $MONITOR_PORT detection

Fixes issue #215
---
 Arduino.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Arduino.mk')

diff --git a/Arduino.mk b/Arduino.mk
index 3735b08..183f633 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -866,6 +866,7 @@ LDFLAGS       += -$(MCU_FLAG_NAME)=$(MCU) -Wl,--gc-sections -O$(OPTIMIZATION_LEV
 SIZEFLAGS     ?= --mcu=$(MCU) -C
 
 # for backwards compatibility, grab ARDUINO_PORT if the user has it set
+# instead of MONITOR_PORT
 MONITOR_PORT ?= $(ARDUINO_PORT)
 
 ifeq ($(CURRENT_OS), WINDOWS)
@@ -879,12 +880,16 @@ ifeq ($(CURRENT_OS), WINDOWS)
     DEVICE_PATH = /dev/ttyS$(shell awk 'BEGIN{ print $(COM_PORT_ID) - 1 }')
 endif
 
-ifdef MONITOR_PORT
+ifneq ($(strip $(MONITOR_PORT)),)
+    # set DEVICE_PATH based on user-defined MONITOR_PORT or ARDUINO_PORT
     DEVICE_PATH = $(MONITOR_PORT)
+    $(call show_config_variable,DEVICE_PATH,[COMPUTED],(from MONITOR_PORT))
 else
     # If no port is specified, try to guess it from wildcards.
+    # Will only work if the Arduino is the only/first device matched.
     DEVICE_PATH = $(firstword $(wildcard \
 			/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem*))
+    $(call show_config_variable,DEVICE_PATH,[AUTODETECTED])
 endif
 
 # Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors.
-- 
cgit v1.2.3