aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2014-11-23 18:56:08 +0530
committerSudar <sudar@sudarmuthu.com>2014-11-23 18:56:08 +0530
commite99deb2079960641b147508613a61907b24ac810 (patch)
treeaa4c8f44e27307946f53b8c85fea5a590d0972c1 /Arduino.mk
parent4b7d99907308ea416d1a295e38411ce06813c9cc (diff)
parent78452da702aef594272e7c515eb3b5b451bf5d46 (diff)
Merge pull request #298 from PeterMosmans/puttywindows
Added support for PuTTY on Windows
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index c42c2dd..e007b19 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1419,7 +1419,15 @@ show_boards:
@$(CAT) "$(BOARDS_TXT)" | grep -E "^[a-zA-Z0-9_]+.name" | sort -uf | sed 's/.name=/:/' | column -s: -t
monitor:
- $(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
+ifneq ("$(MONITOR_CMD)", "putty")
+ $(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
+else
+ ifneq ($(strip $(MONITOR_PARMS)),)
+ $(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARMS) $(call get_monitor_port)
+ else
+ $(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
+ endif
+endif
disasm: $(OBJDIR)/$(TARGET).lss
@$(ECHO) "The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss\n\n"