From da2de8d519c07044f820b60249ceb7417e490e75 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sat, 27 Apr 2019 16:40:08 +0700
Subject: [PATCH] update pid for metro nrf52840

---
 src/boards/feather_nrf52840_express/board.h |  8 ++++++++
 src/boards/metro_nrf52840_express/board.h   | 15 +++++++++++----
 src/usb/usb.c                               |  2 +-
 src/usb/usb_desc.h                          |  8 ++++----
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h
index 090ef50..9a256a2 100644
--- a/src/boards/feather_nrf52840_express/board.h
+++ b/src/boards/feather_nrf52840_express/board.h
@@ -58,6 +58,14 @@
 #define BLEDIS_MANUFACTURER   "Adafruit Industries"
 #define BLEDIS_MODEL          "Feather nRF52840 Express"
 
+//--------------------------------------------------------------------+
+// USB
+//--------------------------------------------------------------------+
+#define USB_DESC_VID           0x239A
+#define USB_DESC_UF2_PID       0x0029
+#define USB_DESC_CDC_ONLY_PID  0x002A
+
+//------------- UF2 -------------//
 #define UF2_PRODUCT_NAME   "Adafruit Feather nRF52840 Express"
 #define UF2_VOLUME_LABEL   "FTHR840BOOT"
 #define UF2_BOARD_ID       "nRF52840-Feather-revD"
diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h
index 786b8d6..0e68f01 100644
--- a/src/boards/metro_nrf52840_express/board.h
+++ b/src/boards/metro_nrf52840_express/board.h
@@ -58,11 +58,18 @@
 #define BLEDIS_MANUFACTURER   "Adafruit Industries"
 #define BLEDIS_MODEL          "Metro nRF52840 Express"
 
-#define UF2_PRODUCT_NAME   "Adafruit Metro nRF52840 Express"
-#define UF2_VOLUME_LABEL   "METR840BOOT"
-#define UF2_BOARD_ID       "nRF52840-Metro-revA"
+//--------------------------------------------------------------------+
+// USB
+//--------------------------------------------------------------------+
+#define USB_DESC_VID           0x239A
+#define USB_DESC_UF2_PID       0x003F
+#define USB_DESC_CDC_ONLY_PID  0x0040
 
-#define UF2_INDEX_URL      "https://www.adafruit.com/"
+//------------- UF2 -------------//
+#define UF2_PRODUCT_NAME       "Adafruit Metro nRF52840 Express"
+#define UF2_VOLUME_LABEL       "METR840BOOT"
+#define UF2_BOARD_ID           "nRF52840-Metro-revA"
 
+#define UF2_INDEX_URL          "https://www.adafruit.com/"
 
 #endif /* _METRO_NRF52840_H_ */
diff --git a/src/usb/usb.c b/src/usb/usb.c
index 21df788..c9dbc30 100644
--- a/src/usb/usb.c
+++ b/src/usb/usb.c
@@ -97,7 +97,7 @@ void usb_init(bool cdc_only)
   if ( cdc_only )
   {
     // Change PID to CDC only
-    usb_desc_dev.idProduct = USB_DESC_SERIAL_ONLY_PID;
+    usb_desc_dev.idProduct = USB_DESC_CDC_ONLY_PID;
 
     // Remove MSC interface = reduce total interface + adjust config desc length
     usb_desc_cfg.config.bNumInterfaces--;
diff --git a/src/usb/usb_desc.h b/src/usb/usb_desc.h
index 8b6dbc4..cb83263 100644
--- a/src/usb/usb_desc.h
+++ b/src/usb/usb_desc.h
@@ -33,15 +33,15 @@
 #endif
 
 #ifndef USB_DESC_VID
-#define USB_DESC_VID                0x239A
+#define USB_DESC_VID             0x239A
 #endif
 
 #ifndef USB_DESC_UF2_PID
-#define USB_DESC_UF2_PID            0x0029
+#define USB_DESC_UF2_PID         0x0029
 #endif
 
-#ifndef USB_DESC_SERIAL_ONLY_PID
-#define USB_DESC_SERIAL_ONLY_PID    0x002A
+#ifndef USB_DESC_CDC_ONLY_PID
+#define USB_DESC_CDC_ONLY_PID    0x002A
 #endif