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

Merge branch 'master' of https://github.com/sudar/Arduino-Makefile

Browse source
This commit is contained in:
gabriel 2013-01-24 12:10:27 +01:00
commit ccd17539e2
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -42,7 +42,7 @@ need the `YAML` library to run ard-parse-boards.
On Debian or Ubuntu: On Debian or Ubuntu:
apt-get install libdevice-serial-perl apt-get install libdevice-serialport-perl
apt-get install libyaml-perl apt-get install libyaml-perl
On Fedora: On Fedora:
@ -129,6 +129,7 @@ The following are the list of changes that I have made or merged in this fork. H
- Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech) - Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech)
- Changed shebang to use /usr/bin/env (https://github.com/anm) - Changed shebang to use /usr/bin/env (https://github.com/anm)
- set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr) - set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr)
- Updated Readme (https://github.com/fr0sty1/)
## Know Issues ## Know Issues
- Because of the way the makefile is structured, the configuration parameters gets printed twice. - Because of the way the makefile is structured, the configuration parameters gets printed twice.

12
arduino-mk/Arduino.mk
View file

@ -478,6 +478,14 @@ ifndef ARDUINO_SKETCHBOOK
$(HOME)/.arduino/preferences.txt | \ $(HOME)/.arduino/preferences.txt | \
sed -e 's/sketchbook.path=//' ) sed -e 's/sketchbook.path=//' )
endif endif
# on mac
ifneq ($(wildcard $(HOME)/Library/Arduino/preferences.txt),)
ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
$(HOME)/Library/Arduino/preferences.txt | \
sed -e 's/sketchbook.path=//' )
endif
ifneq ($(ARDUINO_SKETCHBOOK),) ifneq ($(ARDUINO_SKETCHBOOK),)
$(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(in arduino preferences file)) $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(in arduino preferences file))
else else
@ -503,8 +511,8 @@ endif
# for more information (search for 'character special device'). # for more information (search for 'character special device').
# #
ifndef MONITOR_BAUDRATE ifndef MONITOR_BAUDRATE
#This works only in linux. TODO: Port it to MAC OS also #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/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) 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) MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)
ifeq ($(MONITOR_BAUDRATE),) ifeq ($(MONITOR_BAUDRATE),)