@@ -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])
10651065endif
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
14901490monitor :
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)
14931499else
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)
14991501endif
15001502
15011503disasm : $(OBJDIR ) /$(TARGET ) .lss
0 commit comments