aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2014-06-15 17:56:52 +0200
committerSimon John <git@the-jedi.co.uk>2014-06-15 17:56:52 +0200
commit583a9e49502c6b2190a19e85ae33b2039782b2de (patch)
treeeec743eeb06ab84f2918c549e67db1f00f89c18b
parent05a0c7d37722183390f6c2f8699a569589049006 (diff)
Fixed $MONITOR_PORT detection, thanks choffmann
-rw-r--r--Arduino.mk2
-rw-r--r--HISTORY.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 6439c04..3735b08 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -879,7 +879,7 @@ ifeq ($(CURRENT_OS), WINDOWS)
DEVICE_PATH = /dev/ttyS$(shell awk 'BEGIN{ print $(COM_PORT_ID) - 1 }')
endif
-ifdef ARDUINO_PORT
+ifdef MONITOR_PORT
DEVICE_PATH = $(MONITOR_PORT)
else
# If no port is specified, try to guess it from wildcards.
diff --git a/HISTORY.md b/HISTORY.md
index c838a6b..bf97bdf 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -13,6 +13,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Fix: Add missing newlines at end of some echo's (Issue #207) (https://github.com/sej7278)
- Fix: Add missing/reorder/reword targets in `make help` (https://github.com/sej7278)
- New: Arduino.mk is now compatible with Flymake mode (https://github.com/rbarzic)
+- Fix: MONITOR_PORT detection (Issue #213) (https://github.com/sej7278)
### 1.3.3 (2014-04-12)
- Fix: Make a new manpage for ard-reset-arduino. Fixes issue #188 (https://github.com/sej7278)