diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2013-05-30 12:55:10 +0200 |
|---|---|---|
| committer | Matthijs Kooijman <matthijs@stdin.nl> | 2013-05-30 12:55:10 +0200 |
| commit | 14fd6e712699ca98485abb54e84972cc9a9a59d6 (patch) | |
| tree | 716c859e1041069e33ce18fcfdbd01ec0a637f7e | |
| parent | cb5ce2c9afd3676a7639f34ef908f4fd4207206a (diff) | |
Move MONITOR_BAUDRATE detection further down
No changes are made to the code, it is only moved. This allows it to use
LOCAL_INO_SRCS and LOCAL_INO_PDE_SRCS in the next commit.
| -rw-r--r-- | arduino-mk/Arduino.mk | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 96f2e1b..24c6021 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -504,32 +504,6 @@ else endif ######################################################################## -# Serial monitor (just a screen wrapper) -# -# Quite how to construct the monitor command seems intimately tied -# to the command we're using (here screen). So, read the screen docs -# for more information (search for 'character special device'). -# -ifndef MONITOR_BAUDRATE - #This works only in linux. TODO: Port it to MAC OS also - SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) - MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200) - - ifeq ($(MONITOR_BAUDRATE),) - MONITOR_BAUDRATE = 9600 - $(call show_config_variable,MONITOR_BAUDRATE,[ASSUMED]) - else - $(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch)) - endif -else - $(call show_config_variable,MONITOR_BAUDRATE, [SPECIFIED]) -endif - -ifndef MONITOR_CMD - MONITOR_CMD = screen -endif - -######################################################################## # Reset ifndef RESET_CMD RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino $(ARD_RESET_OPTS) @@ -676,6 +650,32 @@ ifndef ARDUINO_LIBS endif ######################################################################## +# Serial monitor (just a screen wrapper) +# +# Quite how to construct the monitor command seems intimately tied +# to the command we're using (here screen). So, read the screen docs +# for more information (search for 'character special device'). +# +ifndef MONITOR_BAUDRATE + #This works only in linux. TODO: Port it to MAC OS also + SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) + MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200) + + ifeq ($(MONITOR_BAUDRATE),) + MONITOR_BAUDRATE = 9600 + $(call show_config_variable,MONITOR_BAUDRATE,[ASSUMED]) + else + $(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch)) + endif +else + $(call show_config_variable,MONITOR_BAUDRATE, [SPECIFIED]) +endif + +ifndef MONITOR_CMD + MONITOR_CMD = screen +endif + +######################################################################## # Rules for making stuff # |