diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2013-05-30 13:09:15 +0200 |
|---|---|---|
| committer | Matthijs Kooijman <matthijs@stdin.nl> | 2013-05-30 13:09:15 +0200 |
| commit | e1bed904043a79611768a8f98e32d7b79bafb3b3 (patch) | |
| tree | daec63223074ac478eef65b792e115db6c57afc4 /arduino-mk/Arduino.mk | |
| parent | 05ce9fd14b9d925fb7582f872eba9f91afeeac5d (diff) | |
Let MONITOR_BAUDRATE detection also look in .pde files
Before, it would only look in .ino files. If you had no .ino file but
only a .pde file, this would cause the build to hang, since grep would
be waiting for input on its stdin.
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 88efb0d..aed16d6 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -658,7 +658,7 @@ endif # ifndef MONITOR_BAUDRATE #This works only in linux. TODO: Port it to MAC OS also - SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $(LOCAL_INO_SRCS) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) + SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS) | 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),) |