rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-12 09:29:23 +01:00
Code Issues Releases Activity

Removed 'USB_MANUFACTURER' constant redefinition for known VIDs.

Browse Source 
See #1877
This commit is contained in:
Cristian Maglie 2014-04-20 20:49:04 +02:00
parent b673b72cfb
commit abbebed7dd
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/arduino/avr/cores/arduino/USBCore.cpp
View File

@ -57,12 +57,18 @@ const u16 STRING_LANGUAGE[2] = {
const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT; const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT;
#if USB_VID == 0x2341 #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 #elif USB_VID == 0x1b4f
#define USB_MANUFACTURER "SparkFun" # if defined(USB_MANUFACTURER)
# undef USB_MANUFACTURER
# endif
# define USB_MANUFACTURER "SparkFun"
#elif !defined(USB_MANUFACTURER) #elif !defined(USB_MANUFACTURER)
// Fall through to unknown if no manufacturer name was provided in a macro // Fall through to unknown if no manufacturer name was provided in a macro
#define USB_MANUFACTURER "Unknown" # define USB_MANUFACTURER "Unknown"
#endif #endif
const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER; const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;

7
hardware/arduino/sam/cores/arduino/USB/USBCore.cpp
View File

@ -69,10 +69,13 @@ const uint16_t STRING_LANGUAGE[2] = {
const uint8_t STRING_PRODUCT[] = USB_PRODUCT; const uint8_t STRING_PRODUCT[] = USB_PRODUCT;
#if USB_VID == 0x2341 #if USB_VID == 0x2341
#define USB_MANUFACTURER "Arduino LLC" # if defined(USB_MANUFACTURER)
# undef USB_MANUFACTURER
# endif
# define USB_MANUFACTURER "Arduino LLC"
#elif !defined(USB_MANUFACTURER) #elif !defined(USB_MANUFACTURER)
// Fall through to unknown if no manufacturer name was provided in a macro // Fall through to unknown if no manufacturer name was provided in a macro
#define USB_MANUFACTURER "Unknown" # define USB_MANUFACTURER "Unknown"
#endif #endif
const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER; const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER;