Skip to content

Commit bc5092f

Browse files
authored
Merge pull request #529 from szeder/monitor-cmd-with-path
Recognize serial monitors with full path in MONITOR_CMD
2 parents 9708e82 + c49af21 commit bc5092f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Arduino.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,15 +1566,15 @@ show_submenu:
15661566
@$(CAT) $(BOARDS_TXT) | grep -E '[a-zA-Z0-9_\-]+.menu.(cpu|chip).[a-zA-Z0-9_\-]+=' | sort -uf | sed 's/.menu.\(cpu\|chip\)./:/' | sed 's/=/:/' | column -s: -t
15671567

15681568
monitor:
1569-
ifeq ($(MONITOR_CMD), 'putty')
1569+
ifeq ($(notdir $(MONITOR_CMD)), putty)
15701570
ifneq ($(strip $(MONITOR_PARAMS)),)
15711571
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARAMS) $(call get_monitor_port)
15721572
else
15731573
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
15741574
endif
1575-
else ifeq ($(MONITOR_CMD), picocom)
1575+
else ifeq ($(notdir $(MONITOR_CMD)), picocom)
15761576
$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
1577-
else ifeq ($(MONITOR_CMD), cu)
1577+
else ifeq ($(notdir $(MONITOR_CMD)), cu)
15781578
$(MONITOR_CMD) -l $(call get_monitor_port) -s $(MONITOR_BAUDRATE)
15791579
else
15801580
$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
77
### In Development
88
- Fix: Add -fno-devirtualize flag to workaround g++ segfault bug (issue #486). (https://github.com/sej7278)
99
- Fix: Quote the prefix tag in the space_pad_to function
10+
- Fix: recognize serial monitors with full path in MONITOR_CMD
1011
- Tweak: Set ARDMK_VERSION to 1.6 (https://github.com/sej7278)
1112
- Tweak: Move non-standard-related items from CxxFLAGS_STD to CxxFLAGS (issue #523) (https://github.com/sej7278)
1213
- Tweak: Update Windows usage documentation and allow non-relative paths (issue #519) (https://github.com/tuna-f1sh)

0 commit comments

Comments
 (0)