Skip to content

Commit 4be3e49

Browse files
author
Phil Manofsky
committed
3rd party can use own Product/manufacturer string
now "myboard.build.usb_product" and "myboard.build.usb_manufacturer" from a 3rd party board in "boards.txt" are used in source code. if they aren't defined in "boards.txt", default values are used.
1 parent f5282f2 commit 4be3e49

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

hardware/arduino/sam/cores/arduino/USB/USBCore.cpp

+3-14
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,16 @@ const uint16_t STRING_LANGUAGE[2] = {
6666
};
6767

6868
#ifndef USB_PRODUCT
69-
// Use a hardcoded product name if none is provided
70-
#if USB_PID == USB_PID_DUE
7169
#define USB_PRODUCT "Arduino Due"
72-
#else
73-
#define USB_PRODUCT "USB IO Board"
74-
#endif
7570
#endif
7671

7772
const uint8_t STRING_PRODUCT[] = USB_PRODUCT;
7873

79-
#if USB_VID == 0x2341
80-
# if defined(USB_MANUFACTURER)
81-
# undef USB_MANUFACTURER
82-
# endif
83-
# define USB_MANUFACTURER "Arduino LLC"
84-
#elif !defined(USB_MANUFACTURER)
85-
// Fall through to unknown if no manufacturer name was provided in a macro
86-
# define USB_MANUFACTURER "Unknown"
74+
#ifndef USB_MANUFACTURER
75+
#define USB_MANUFACTURER "Arduino LLC"
8776
#endif
8877

89-
const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER;
78+
const uint8_t STRING_MANUFACTURER[] = USB_MANUFACTURER;
9079

9180
#ifdef CDC_ENABLED
9281
#define DEVICE_CLASS 0x02

0 commit comments

Comments
 (0)