aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Arduino.mk18
-rw-r--r--HISTORY.md2
2 files changed, 12 insertions, 8 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 936645a..aabe8e7 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -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
diff --git a/HISTORY.md b/HISTORY.md
index cc16346..462bf6e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -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)