Skip to content

Commit da2de8d

Browse files
committed
update pid for metro nrf52840
1 parent a7c19a4 commit da2de8d

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

src/boards/feather_nrf52840_express/board.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@
5858
#define BLEDIS_MANUFACTURER "Adafruit Industries"
5959
#define BLEDIS_MODEL "Feather nRF52840 Express"
6060

61+
//--------------------------------------------------------------------+
62+
// USB
63+
//--------------------------------------------------------------------+
64+
#define USB_DESC_VID 0x239A
65+
#define USB_DESC_UF2_PID 0x0029
66+
#define USB_DESC_CDC_ONLY_PID 0x002A
67+
68+
//------------- UF2 -------------//
6169
#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Express"
6270
#define UF2_VOLUME_LABEL "FTHR840BOOT"
6371
#define UF2_BOARD_ID "nRF52840-Feather-revD"

src/boards/metro_nrf52840_express/board.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,18 @@
5858
#define BLEDIS_MANUFACTURER "Adafruit Industries"
5959
#define BLEDIS_MODEL "Metro nRF52840 Express"
6060

61-
#define UF2_PRODUCT_NAME "Adafruit Metro nRF52840 Express"
62-
#define UF2_VOLUME_LABEL "METR840BOOT"
63-
#define UF2_BOARD_ID "nRF52840-Metro-revA"
61+
//--------------------------------------------------------------------+
62+
// USB
63+
//--------------------------------------------------------------------+
64+
#define USB_DESC_VID 0x239A
65+
#define USB_DESC_UF2_PID 0x003F
66+
#define USB_DESC_CDC_ONLY_PID 0x0040
6467

65-
#define UF2_INDEX_URL "https://www.adafruit.com/"
68+
//------------- UF2 -------------//
69+
#define UF2_PRODUCT_NAME "Adafruit Metro nRF52840 Express"
70+
#define UF2_VOLUME_LABEL "METR840BOOT"
71+
#define UF2_BOARD_ID "nRF52840-Metro-revA"
6672

73+
#define UF2_INDEX_URL "https://www.adafruit.com/"
6774

6875
#endif /* _METRO_NRF52840_H_ */

src/usb/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void usb_init(bool cdc_only)
9797
if ( cdc_only )
9898
{
9999
// Change PID to CDC only
100-
usb_desc_dev.idProduct = USB_DESC_SERIAL_ONLY_PID;
100+
usb_desc_dev.idProduct = USB_DESC_CDC_ONLY_PID;
101101

102102
// Remove MSC interface = reduce total interface + adjust config desc length
103103
usb_desc_cfg.config.bNumInterfaces--;

src/usb/usb_desc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
#endif
3434

3535
#ifndef USB_DESC_VID
36-
#define USB_DESC_VID 0x239A
36+
#define USB_DESC_VID 0x239A
3737
#endif
3838

3939
#ifndef USB_DESC_UF2_PID
40-
#define USB_DESC_UF2_PID 0x0029
40+
#define USB_DESC_UF2_PID 0x0029
4141
#endif
4242

43-
#ifndef USB_DESC_SERIAL_ONLY_PID
44-
#define USB_DESC_SERIAL_ONLY_PID 0x002A
43+
#ifndef USB_DESC_CDC_ONLY_PID
44+
#define USB_DESC_CDC_ONLY_PID 0x002A
4545
#endif
4646

4747

0 commit comments

Comments
 (0)