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

Merge pull request #360 from biesiad/master

Browse source 
Add support for picocom terminal emulator and  /dev/tty.wchusbserial
This commit is contained in:
Sudar Muthu 2015-06-12 10:32:17 +05:30
commit ed6fb91bf0
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Arduino.mk
View file

@ -1060,7 +1060,7 @@ else
# If no port is specified, try to guess it from wildcards.
# Will only work if the Arduino is the only/first device matched.
DEVICE_PATH = $(firstword $(wildcard \
/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem*))
/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem* /dev/tty.wchusbserial*))
$(call show_config_variable,DEVICE_PATH,[AUTODETECTED])
endif
@ -1488,14 +1488,16 @@ show_boards:
@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
monitor:
ifneq ($(MONITOR_CMD), 'putty')
$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
ifeq ($(MONITOR_CMD), 'putty')
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
else ifeq ($(MONITOR_CMD), picocom)
$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
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
$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
endif
disasm: $(OBJDIR)/$(TARGET).lss

2
HISTORY.md
View file

@ -6,6 +6,8 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
### In Development
- New: Add support for /dev/tty.wchusbserial* (comes with cheap clones - DCCduino) (https://github.com/biesiad)
- New: Add support for picocom as serial monitor(https://github.com/biesiad)
- Tweak: Looks for submenu items first when parsing BOARDS_TXT (Issue #347) (https://github.com/sej7278)
- Tweak: Various spelling/grammar/typo fixes (https://github.com/dcousens)
- Tweak: Clarified some 1.5+ issues in docs (Issue #352) (https://github.com/sej7278)