Skip to content

Commit 747476d

Browse files
committed
Merge branch 'zero-core' into zero-package
2 parents c3e5bc7 + 50bc786 commit 747476d

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

cores/arduino/USB/USBCore.cpp

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,29 @@
3030
//#define TRACE_CORE(x) x
3131
#define TRACE_CORE(x)
3232

33-
//==================================================================
34-
35-
#define USB_PID_DUE 0x003E
36-
#define USB_PID_ZERO 0x804D
37-
38-
// USB Device
39-
#define USB_VID 0x2341 // arduino LLC vid
40-
#undef USB_PID
41-
#define USB_PID USB_PID_ZERO
42-
43-
//==================================================================
44-
4533
static char isRemoteWakeUpEnabled = 0;
4634
static char isEndpointHalt = 0;
4735

48-
4936
const uint16_t STRING_LANGUAGE[2] = {
5037
(3<<8) | (2+2),
5138
0x0409 // English
5239
};
5340

5441
#ifndef USB_PRODUCT
55-
// Use a hardcoded product name if none is provided
56-
#if USB_PID == USB_PID_DUE
57-
#define USB_PRODUCT "Arduino Due"
58-
#elif USB_PID == USB_PID_ZERO
59-
#define USB_PRODUCT "Arduino Zero"
60-
#else
61-
#define USB_PRODUCT "USB IO Board"
62-
#endif
42+
// If no product is provided, use USB IO Board
43+
#define USB_PRODUCT "USB IO Board"
6344
#endif
6445

6546
const uint8_t STRING_PRODUCT[] = USB_PRODUCT;
6647

6748
#if USB_VID == 0x2341
68-
#define USB_MANUFACTURER "Arduino LLC"
49+
# if defined(USB_MANUFACTURER)
50+
# undef USB_MANUFACTURER
51+
# endif
52+
# define USB_MANUFACTURER "Arduino LLC"
6953
#elif !defined(USB_MANUFACTURER)
70-
// Fall through to unknown if no manufacturer name was provided in a macro
71-
#define USB_MANUFACTURER "Unknown"
54+
// Fall through to unknown if no manufacturer name was provided in a macro
55+
# define USB_MANUFACTURER "Unknown"
7256
#endif
7357

7458
const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER;

0 commit comments

Comments
 (0)