diff options
| author | Sudar <sudar@sudarmuthu.com> | 2014-11-23 18:56:08 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-11-23 18:56:08 +0530 |
| commit | e99deb2079960641b147508613a61907b24ac810 (patch) | |
| tree | aa4c8f44e27307946f53b8c85fea5a590d0972c1 | |
| parent | 4b7d99907308ea416d1a295e38411ce06813c9cc (diff) | |
| parent | 78452da702aef594272e7c515eb3b5b451bf5d46 (diff) | |
Merge pull request #298 from PeterMosmans/puttywindows
Added support for PuTTY on Windows
| -rw-r--r-- | Arduino.mk | 10 | ||||
| -rw-r--r-- | HISTORY.md | 1 | ||||
| -rw-r--r-- | README.md | 5 |
3 files changed, 15 insertions, 1 deletions
@@ -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" @@ -5,6 +5,7 @@ The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list. ### In development +- New: Support for PuTTY under Windows (https://github.com/PeterMosmans) - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e) - New: Add support for 1.5.x vendor/hardware architecture library location (Issue #276) (https://github.com/lukasz-e) - New: Added test suite and integration with travis CI. (https://github.com/peplin) @@ -102,6 +102,11 @@ On Windows (using cygwin), you might want to set: MONITOR_PORT = com3 BOARD_TAG = mega2560 +On Windows (using MSYS and PuTTY), you might want to set the following extra parameters: + + MONITOR_CMD = putty + MONITOR_PARMS = 8,1,n,N + On Arduino 1.5.x installs, you should set the architecture to either `avr` or `sam` and if using a submenu CPU, then also set that: ARCHITECTURE = avr |