@@ -1060,7 +1060,7 @@ else
1060
1060
# If no port is specified, try to guess it from wildcards.
1061
1061
# Will only work if the Arduino is the only/first device matched.
1062
1062
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 * ) )
1064
1064
$(call show_config_variable,DEVICE_PATH,[AUTODETECTED])
1065
1065
endif
1066
1066
@@ -1488,14 +1488,16 @@ show_boards:
1488
1488
@$(CAT ) $(BOARDS_TXT ) | grep -E ' ^[a-zA-Z0-9_]+.name' | sort -uf | sed ' s/.name=/:/' | column -s: -t
1489
1489
1490
1490
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)
1493
1499
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)
1499
1501
endif
1500
1502
1501
1503
disasm : $(OBJDIR ) /$(TARGET ) .lss
0 commit comments