arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-10-13 23:48:28 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

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;
#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)
// Fall through to unknown if no manufacturer name was provided in a macro
#define USB_MANUFACTURER "Unknown"
# define USB_MANUFACTURER "Unknown"
#endif
const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER;