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

Merged changes from https://github.com/alohr

Browse source
This commit is contained in:
Sudar 2012-12-15 19:54:02 +05:30
commit 4446705995
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -50,6 +50,13 @@ On Fedora:
yum install perl-Device-SerialPort yum install perl-Device-SerialPort
yum install perl-YAML yum install perl-YAML
On Mac using MacPorts:
sudo port install p5-device-serialport
sudo port install p5-YAML
and use /opt/local/bin/perl5 instead of /usr/bin/perl
On other systems: On other systems:
cpanm Device::SerialPort cpanm Device::SerialPort
@ -120,6 +127,8 @@ The following are the list of changes that I have made or merged in this fork. H
- Added sketch size verification. (https://github.com/fornellas) - Added sketch size verification. (https://github.com/fornellas)
- Show original line number for error messages (https://github.com/WizenedEE) - Show original line number for error messages (https://github.com/WizenedEE)
- 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)
- set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr)
## 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.

4
arduino-mk/Arduino.mk
View file

@ -145,6 +145,8 @@
# - Added sketch size verification. (https://github.com/fornellas) # - Added sketch size verification. (https://github.com/fornellas)
# - Show original line number for error messages (https://github.com/WizenedEE) # - Show original line number for error messages (https://github.com/WizenedEE)
# - 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)
# - set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr)
# #
######################################################################## ########################################################################
# #
@ -554,6 +556,7 @@ ifndef F_CPU
F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu) F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu)
endif endif
ifeq ($(VARIANT),leonardo)
# USB IDs for the Leonardo # USB IDs for the Leonardo
ifndef USB_VID ifndef USB_VID
USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid) USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid)
@ -562,6 +565,7 @@ endif
ifndef USB_PID ifndef USB_PID
USB_PID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.pid) USB_PID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.pid)
endif endif
endif
# normal programming info # normal programming info
ifndef AVRDUDE_ARD_PROGRAMMER ifndef AVRDUDE_ARD_PROGRAMMER