dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed $MONITOR_PORT detection, thanks choffmann

Browse source
This commit is contained in:
Simon John 2014-06-15 17:56:52 +02:00
parent 05a0c7d377
commit 583a9e4950
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino.mk
View file

@ -879,7 +879,7 @@ ifeq ($(CURRENT_OS), WINDOWS)
DEVICE_PATH = /dev/ttyS$(shell awk 'BEGIN{ print $(COM_PORT_ID) - 1 }') DEVICE_PATH = /dev/ttyS$(shell awk 'BEGIN{ print $(COM_PORT_ID) - 1 }')
endif endif
ifdef ARDUINO_PORT ifdef MONITOR_PORT
DEVICE_PATH = $(MONITOR_PORT) DEVICE_PATH = $(MONITOR_PORT)
else else
# If no port is specified, try to guess it from wildcards. # If no port is specified, try to guess it from wildcards.

1
HISTORY.md
View file

@ -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 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) - 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) - 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) ### 1.3.3 (2014-04-12)
- Fix: Make a new manpage for ard-reset-arduino. Fixes issue #188 (https://github.com/sej7278) - Fix: Make a new manpage for ard-reset-arduino. Fixes issue #188 (https://github.com/sej7278)