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

Add monitor commands using less and cat.

Browse source 
Use `less` as the default `MONITOR_CMD`.
Change comment explenation about `# Serial Monitor`.
This commit is contained in:
Doron Behar 2017-09-25 22:28:34 +03:00
parent 1d72ebb391
commit c5d744f70c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Arduino.mk
View file

@ -936,11 +936,11 @@ ifndef ARDUINO_LIBS
endif endif
######################################################################## ########################################################################
# Serial monitor (just a screen wrapper) # Serial monitor
# Quite how to construct the monitor command seems intimately tied # In order to construct a monitor command, we need to use either `less`,
# to the command we're using (here screen). So, read the screen docs # `screen` or `cat`. With `less`, as the default fallback, we will use
# for more information (search for 'character special device'). # `-f` flag. Read it's man page to get a better understanding.
ifeq ($(strip $(NO_CORE)),) ifeq ($(strip $(NO_CORE)),)
ifndef MONITOR_BAUDRATE ifndef MONITOR_BAUDRATE
@ -958,9 +958,8 @@ ifeq ($(strip $(NO_CORE)),)
else else
$(call show_config_variable,MONITOR_BAUDRATE, [USER]) $(call show_config_variable,MONITOR_BAUDRATE, [USER])
endif endif
ifndef MONITOR_CMD ifndef MONITOR_CMD
MONITOR_CMD = screen MONITOR_CMD = less
endif endif
endif endif
@ -1763,6 +1762,10 @@ else ifeq ($(notdir $(MONITOR_CMD)), picocom)
$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port) $(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
else ifeq ($(notdir $(MONITOR_CMD)), cu) else ifeq ($(notdir $(MONITOR_CMD)), cu)
$(MONITOR_CMD) -l $(call get_monitor_port) -s $(MONITOR_BAUDRATE) $(MONITOR_CMD) -l $(call get_monitor_port) -s $(MONITOR_BAUDRATE)
else ifeq ($(MONITOR_CMD), less)
$(MONITOR_CMD) -f $(call get_monitor_port)
else ifeq ($(MONITOR_CMD), cat)
$(MONITOR_CMD) $(call get_monitor_port)
else else
$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE) $(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
endif endif