Skip to content

Commit f790358

Browse files
committed
update vid/pid manuf/product string to support defined from mbed core
1 parent e3ad125 commit f790358

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

src/arduino/Adafruit_USBD_Device.cpp

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,42 @@
3434
// USB Information can be defined in variant file e.g pins_arduino.h
3535
#include "Arduino.h"
3636

37+
// - USB_VID, USB_PID, USB_MANUFACTURER, USB_PRODUCT are defined on most
38+
// core that has built-in support for TinyUSB. Otherwise
39+
// - BOARD_VENDORID, BOARD_PRODUCTID, BOARD_MANUFACTURER, BOARD_NAME are use
40+
// if defined, mostly on mbed core
41+
3742
#ifndef USB_VID
38-
#define USB_VID 0xcafe
43+
#ifdef BOARD_VENDORID
44+
#define USB_VID BOARD_VENDORID
45+
#else
46+
#define USB_VID 0x239a
47+
#endif
3948
#endif
4049

4150
#ifndef USB_PID
42-
#define USB_PID 0xcafe
51+
#ifdef BOARD_PRODUCTID
52+
#define USB_PID BOARD_PRODUCTID
53+
#else
54+
#define USB_PID 0xcafe
55+
#endif
4356
#endif
4457

4558
#ifndef USB_MANUFACTURER
46-
#define USB_MANUFACTURER "Unknown"
59+
60+
#ifdef BOARD_MANUFACTURER
61+
#define USB_MANUFACTURER BOARD_MANUFACTURER
62+
#else
63+
#define USB_MANUFACTURER "Adafruit"
64+
#endif
4765
#endif
4866

4967
#ifndef USB_PRODUCT
50-
#define USB_PRODUCT "Unknown"
68+
#ifdef BOARD_NAME
69+
#define USB_PRODUCT BOARD_NAME
70+
#else
71+
#define USB_PRODUCT "Unknown"
72+
#endif
5173
#endif
5274

5375
#ifndef USB_LANGUAGE

0 commit comments

Comments
 (0)