From 40d87e96d7775911c1637730bd5f31db6d867384 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sun, 20 Apr 2014 20:49:04 +0200 Subject: Removed 'USB_MANUFACTURER' constant redefinition for known VIDs. See #1877 --- cores/arduino/USBCore.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp index c46c75f..2c03e5a 100644 --- a/cores/arduino/USBCore.cpp +++ b/cores/arduino/USBCore.cpp @@ -57,12 +57,18 @@ const u16 STRING_LANGUAGE[2] = { const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT; #if USB_VID == 0x2341 -#define USB_MANUFACTURER "Arduino LLC" +# if defined(USB_MANUFACTURER) +# undef USB_MANUFACTURER +# endif +# define USB_MANUFACTURER "Arduino LLC" #elif USB_VID == 0x1b4f -#define USB_MANUFACTURER "SparkFun" +# if defined(USB_MANUFACTURER) +# undef USB_MANUFACTURER +# endif +# define USB_MANUFACTURER "SparkFun" #elif !defined(USB_MANUFACTURER) // Fall through to unknown if no manufacturer name was provided in a macro -#define USB_MANUFACTURER "Unknown" +# define USB_MANUFACTURER "Unknown" #endif const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER; -- cgit v1.2.3-18-g5258