diff options
| author | Sudar <sudar@sudarmuthu.com> | 2012-12-15 19:54:02 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2012-12-15 19:54:02 +0530 |
| commit | 44467059954cf68cdfe55e43781099bb9489a170 (patch) | |
| tree | 916fc1364fc2298cd07862898e5d2995805f23fd /arduino-mk/Arduino.mk | |
| parent | ee59c7ca2614db5764cb83696dc9d1752888355c (diff) | |
| parent | 4241eccacc6a64cff1638a393a96a8a34acda9d3 (diff) | |
Merged changes from https://github.com/alohr
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index c38a22e..c630169 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -145,6 +145,8 @@ # - Added sketch size verification. (https://github.com/fornellas) # - Show original line number for error messages (https://github.com/WizenedEE) # - 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) endif +ifeq ($(VARIANT),leonardo) # USB IDs for the Leonardo ifndef USB_VID USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid) @@ -562,6 +565,7 @@ endif ifndef USB_PID USB_PID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.pid) endif +endif # normal programming info ifndef AVRDUDE_ARD_PROGRAMMER |