diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2017-09-29 09:59:16 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 09:59:16 +0530 |
| commit | bc5092f25bd330051b377c13b317a25870413a24 (patch) | |
| tree | c6f4e72ab8519e3d44ab95d4d14426bdb7780a9c | |
| parent | 9708e8265d02ec4bc89533a06ec74c0aedec03c3 (diff) | |
| parent | c49af21700b413b6efdc3d75193b885896b56dd9 (diff) | |
Merge pull request #529 from szeder/monitor-cmd-with-path
Recognize serial monitors with full path in MONITOR_CMD
| -rw-r--r-- | Arduino.mk | 6 | ||||
| -rw-r--r-- | HISTORY.md | 1 |
2 files changed, 4 insertions, 3 deletions
@@ -1566,15 +1566,15 @@ show_submenu: @$(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 monitor: -ifeq ($(MONITOR_CMD), 'putty') +ifeq ($(notdir $(MONITOR_CMD)), putty) ifneq ($(strip $(MONITOR_PARAMS)),) $(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARAMS) $(call get_monitor_port) else $(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port) endif -else ifeq ($(MONITOR_CMD), picocom) +else ifeq ($(notdir $(MONITOR_CMD)), picocom) $(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port) -else ifeq ($(MONITOR_CMD), cu) +else ifeq ($(notdir $(MONITOR_CMD)), cu) $(MONITOR_CMD) -l $(call get_monitor_port) -s $(MONITOR_BAUDRATE) else $(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE) @@ -7,6 +7,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it ### In Development - Fix: Add -fno-devirtualize flag to workaround g++ segfault bug (issue #486). (https://github.com/sej7278) - Fix: Quote the prefix tag in the space_pad_to function +- Fix: recognize serial monitors with full path in MONITOR_CMD - Tweak: Set ARDMK_VERSION to 1.6 (https://github.com/sej7278) - Tweak: Move non-standard-related items from CxxFLAGS_STD to CxxFLAGS (issue #523) (https://github.com/sej7278) - Tweak: Update Windows usage documentation and allow non-relative paths (issue #519) (https://github.com/tuna-f1sh) |