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

Autodetect baudrate only if either a .ino/.pde is present

Browse source 
Because of the way the autodetect code works, if no .ino/.pde file is
present, then the makefile hangs
This commit is contained in:
Sudar 2013-08-09 21:36:22 +05:30
parent 5ea10b3e19
commit c92d6724d7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
HISTORY.md
View file

@ -17,6 +17,7 @@ The following is the rough list of changes that went into different versions. I
- Implement ard-parse-boards with shell scripting instead of Perl (https://github.com/peplin) - Implement ard-parse-boards with shell scripting instead of Perl (https://github.com/peplin)
- Compile with debugging symbols only when DEBUG=1 (https://github.com/peplin) - Compile with debugging symbols only when DEBUG=1 (https://github.com/peplin)
- Replace Leonardo detection with Caterina detection (https://github.com/sej7278) - Replace Leonardo detection with Caterina detection (https://github.com/sej7278)
- Autodetect baudrate only if either a .ino/.pde is present
### 0.12.0 (2013-06-20) ### 0.12.0 (2013-06-20)
- Fix "generated_assembly" target, which got broken earlier. Fix issue #76 (https://github.com/matthijskooijman) - Fix "generated_assembly" target, which got broken earlier. Fix issue #76 (https://github.com/matthijskooijman)

2
arduino-mk/Arduino.mk
View file

@ -657,8 +657,10 @@ endif
# #
ifeq ($(strip $(NO_CORE)),) ifeq ($(strip $(NO_CORE)),)
ifndef MONITOR_BAUDRATE ifndef MONITOR_BAUDRATE
ifeq ($(words $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS)), 1)
SPEED = $(shell egrep -h 'Serial.begin\([0-9]+\)' $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS) | sed -e 's/[^0-9]//g'| head -n1) SPEED = $(shell egrep -h 'Serial.begin\([0-9]+\)' $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS) | sed -e 's/[^0-9]//g'| head -n1)
MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200) MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)
endif
ifeq ($(MONITOR_BAUDRATE),) ifeq ($(MONITOR_BAUDRATE),)
MONITOR_BAUDRATE = 9600 MONITOR_BAUDRATE = 9600