Removed 'USB_MANUFACTURER' constant redefinition for known VIDs.

See #1877
2014-04-20 20:49:04 +02:00 · 2014-04-20 20:49:04 +02:00 · 40d87e96d7
parent 945cf41bc3
commit 40d87e96d7
1 changed files with 9 additions and 3 deletions
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@ -57,8 +57,14 @@ const u16 STRING_LANGUAGE[2] = {
 const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT;

 #if USB_VID == 0x2341
+#  if defined(USB_MANUFACTURER)
+#    undef USB_MANUFACTURER
+#  endif
 #  define USB_MANUFACTURER "Arduino LLC"
 #elif USB_VID == 0x1b4f
+#  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