Skip to content

Commit ed6fb91

Browse files
committed
Merge pull request #360 from biesiad/master
Add support for picocom terminal emulator and /dev/tty.wchusbserial
2 parents 9629867 + 6d56ac2 commit ed6fb91

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Arduino.mk

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ else
10601060
# If no port is specified, try to guess it from wildcards.
10611061
# Will only work if the Arduino is the only/first device matched.
10621062
DEVICE_PATH = $(firstword $(wildcard \
1063-
/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem*))
1063+
/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem* /dev/tty.wchusbserial*))
10641064
$(call show_config_variable,DEVICE_PATH,[AUTODETECTED])
10651065
endif
10661066

@@ -1488,14 +1488,16 @@ show_boards:
14881488
@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
14891489

14901490
monitor:
1491-
ifneq ($(MONITOR_CMD), 'putty')
1492-
$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
1491+
ifeq ($(MONITOR_CMD), 'putty')
1492+
ifneq ($(strip $(MONITOR_PARMS)),)
1493+
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARMS) $(call get_monitor_port)
1494+
else
1495+
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
1496+
endif
1497+
else ifeq ($(MONITOR_CMD), picocom)
1498+
$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
14931499
else
1494-
ifneq ($(strip $(MONITOR_PARMS)),)
1495-
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARMS) $(call get_monitor_port)
1496-
else
1497-
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
1498-
endif
1500+
$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
14991501
endif
15001502

15011503
disasm: $(OBJDIR)/$(TARGET).lss

HISTORY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
66

77
### In Development
88

9+
- New: Add support for /dev/tty.wchusbserial* (comes with cheap clones - DCCduino) (https://github.com/biesiad)
10+
- New: Add support for picocom as serial monitor(https://github.com/biesiad)
911
- Tweak: Looks for submenu items first when parsing BOARDS_TXT (Issue #347) (https://github.com/sej7278)
1012
- Tweak: Various spelling/grammar/typo fixes (https://github.com/dcousens)
1113
- Tweak: Clarified some 1.5+ issues in docs (Issue #352) (https://github.com/sej7278)

0 commit comments

Comments
 (0)