From 96286247b6f4e8871628f586391e508e665b3c29 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 24 Apr 2013 17:49:24 +1000 Subject: boards.txt: Refactor the default usb build flags into a generic property in platform.txt --- boards.txt | 8 ++++---- platform.txt | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/boards.txt b/boards.txt index 1ec00c0..8ee4561 100644 --- a/boards.txt +++ b/boards.txt @@ -192,7 +192,7 @@ leonardo.build.usb_product="Arduino Leonardo" leonardo.build.board=AVR_LEONARDO leonardo.build.core=arduino leonardo.build.variant=leonardo -leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} +leonardo.build.extra_flags={build.usb_flags} ############################################################## @@ -222,7 +222,7 @@ micro.build.usb_product=Arduino Micro micro.build.board=AVR_MICRO micro.build.core=arduino micro.build.variant=micro -micro.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} +micro.build.extra_flags={build.usb_flags} ############################################################## @@ -252,7 +252,7 @@ esplora.build.usb_product=Arduino Esplora esplora.build.board=AVR_ESPLORA esplora.build.core=arduino esplora.build.variant=leonardo -esplora.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} +esplora.build.extra_flags={build.usb_flags} ############################################################## @@ -418,7 +418,7 @@ LilyPadUSB.build.usb_product=LilyPad USB LilyPadUSB.build.board=AVR_LILYPAD_USB LilyPadUSB.build.core=arduino LilyPadUSB.build.variant=leonardo -LilyPadUSB.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} +LilyPadUSB.build.extra_flags={build.usb_flags} ############################################################## diff --git a/platform.txt b/platform.txt index eaf9469..a0e35c3 100644 --- a/platform.txt +++ b/platform.txt @@ -86,3 +86,9 @@ tools.avrdude.bootloader.params.verbose=-v -v -v -v tools.avrdude.bootloader.params.quiet=-q -q tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/avr/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m + +# USB Default Flags +# Default blank usb manufacturer will be filled it at compile time +# - from numeric vendor ID, set to Unknown otherwise +build.usb_manufacturer= +build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} -- cgit v1.2.3-18-g5258