From a33cba585f485b68dca651c68b8023522040f468 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 17 May 2013 14:34:06 +1000 Subject: Allow USB product and manufacturer strings to be supplied in boards.txt --- boards.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 893e880..1ec00c0 100644 --- a/boards.txt +++ b/boards.txt @@ -188,10 +188,11 @@ leonardo.build.mcu=atmega32u4 leonardo.build.f_cpu=16000000L leonardo.build.vid=0x2341 leonardo.build.pid=0x8036 +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} +leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} ############################################################## @@ -217,10 +218,11 @@ micro.build.mcu=atmega32u4 micro.build.f_cpu=16000000L micro.build.vid=0x2341 micro.build.pid=0x8037 +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} +micro.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} ############################################################## @@ -246,10 +248,11 @@ esplora.build.mcu=atmega32u4 esplora.build.f_cpu=16000000L esplora.build.vid=0x2341 esplora.build.pid=0x803c +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} +esplora.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product} ############################################################## @@ -407,15 +410,15 @@ LilyPadUSB.bootloader.extended_fuses=0xce LilyPadUSB.bootloader.file=caterina-LilyPadUSB/Caterina-LilyPadUSB.hex LilyPadUSB.bootloader.unlock_bits=0x3F LilyPadUSB.bootloader.lock_bits=0x2F - LilyPadUSB.build.mcu=atmega32u4 LilyPadUSB.build.f_cpu=8000000L LilyPadUSB.build.vid=0x1B4F LilyPadUSB.build.pid=0x9208 +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} +LilyPadUSB.build.extra_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 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 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'boards.txt') 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} ############################################################## -- cgit v1.2.3-18-g5258 From bda85506eae7807ac4ad96ee9df5c1760761002f Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 22 Jul 2013 12:30:25 +0200 Subject: Fixed usb_products on some AVR boards --- boards.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'boards.txt') diff --git a/boards.txt b/boards.txt index 8ee4561..ebcbf21 100644 --- a/boards.txt +++ b/boards.txt @@ -218,7 +218,7 @@ micro.build.mcu=atmega32u4 micro.build.f_cpu=16000000L micro.build.vid=0x2341 micro.build.pid=0x8037 -micro.build.usb_product=Arduino Micro +micro.build.usb_product="Arduino Micro" micro.build.board=AVR_MICRO micro.build.core=arduino micro.build.variant=micro @@ -248,7 +248,7 @@ esplora.build.mcu=atmega32u4 esplora.build.f_cpu=16000000L esplora.build.vid=0x2341 esplora.build.pid=0x803c -esplora.build.usb_product=Arduino Esplora +esplora.build.usb_product="Arduino Esplora" esplora.build.board=AVR_ESPLORA esplora.build.core=arduino esplora.build.variant=leonardo @@ -414,7 +414,7 @@ LilyPadUSB.build.mcu=atmega32u4 LilyPadUSB.build.f_cpu=8000000L LilyPadUSB.build.vid=0x1B4F LilyPadUSB.build.pid=0x9208 -LilyPadUSB.build.usb_product=LilyPad USB +LilyPadUSB.build.usb_product="LilyPad USB" LilyPadUSB.build.board=AVR_LILYPAD_USB LilyPadUSB.build.core=arduino LilyPadUSB.build.variant=leonardo -- cgit v1.2.3-18-g5258