From 4bbdeab8d10ed2a0e8f00549085940b286cccf22 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 8 May 2020 12:18:37 +0700 Subject: [PATCH] fix ci build by re-using VID/PID of feather 52840 for other boards build for these board will be disabled in the future. --- src/boards/mdk_nrf52840_dongle/board.h | 6 ++++++ src/boards/particle_argon/board.h | 6 ++++++ src/boards/particle_boron/board.h | 6 ++++++ src/boards/particle_xenon/board.h | 6 ++++++ src/boards/pca10100/board.h | 4 ++++ src/boards/raytac_mdbt50q_rx/board.h | 8 +++++--- 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/boards/mdk_nrf52840_dongle/board.h b/src/boards/mdk_nrf52840_dongle/board.h index c45213e..6528451 100644 --- a/src/boards/mdk_nrf52840_dongle/board.h +++ b/src/boards/mdk_nrf52840_dongle/board.h @@ -58,6 +58,12 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ + +// Shared VID/PID with Feather nRF52840, will be disabled for building in the future +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x0029 + #define UF2_PRODUCT_NAME "MDK nRF52840 USB Dongle" #define UF2_VOLUME_LABEL "MDK840DONGL" #define UF2_BOARD_ID "nRF52840-Dongle-v1" diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h index 467a7df..3f7078a 100644 --- a/src/boards/particle_argon/board.h +++ b/src/boards/particle_argon/board.h @@ -56,6 +56,12 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ + +// Shared VID/PID with Feather nRF52840, will be disabled for building in the future +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x0029 + #define UF2_PRODUCT_NAME "Particle Argon" #define UF2_VOLUME_LABEL "ARGONBOOT " #define UF2_BOARD_ID "nRF52840-Argon-v1" diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h index b433cea..6db75be 100644 --- a/src/boards/particle_boron/board.h +++ b/src/boards/particle_boron/board.h @@ -56,6 +56,12 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ + +// Shared VID/PID with Feather nRF52840, will be disabled for building in the future +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x0029 + #define UF2_PRODUCT_NAME "Particle Boron" #define UF2_VOLUME_LABEL "BORONBOOT " #define UF2_BOARD_ID "nRF52840-Boron-v1" diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h index 5fe2474..ac2c9a7 100644 --- a/src/boards/particle_xenon/board.h +++ b/src/boards/particle_xenon/board.h @@ -56,6 +56,12 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ + +// Shared VID/PID with Feather nRF52840, will be disabled for building in the future +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x0029 + #define UF2_PRODUCT_NAME "Particle Xenon" #define UF2_VOLUME_LABEL "XENONBOOT " #define UF2_BOARD_ID "nRF52840-Xenon-v1" diff --git a/src/boards/pca10100/board.h b/src/boards/pca10100/board.h index d82e2d1..743f175 100644 --- a/src/boards/pca10100/board.h +++ b/src/boards/pca10100/board.h @@ -50,6 +50,10 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ +#define USB_DESC_VID 0x1915 +#define USB_DESC_UF2_PID 0x521F +#define USB_DESC_CDC_ONLY_PID 0x521F + #define UF2_PRODUCT_NAME "Nordic nRF52833 DK" #define UF2_BOARD_ID "nRF52833-pca10100-v1" #define UF2_INDEX_URL "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52833-DK" diff --git a/src/boards/raytac_mdbt50q_rx/board.h b/src/boards/raytac_mdbt50q_rx/board.h index 18b7c90..6da8b22 100644 --- a/src/boards/raytac_mdbt50q_rx/board.h +++ b/src/boards/raytac_mdbt50q_rx/board.h @@ -52,9 +52,11 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ -#define USB_DESC_VID 0x239A -#define USB_DESC_UF2_PID 0x0029 -#define USB_DESC_CDC_ONLY_PID 0x002A + +// Shared VID/PID with Feather nRF52840, will be disabled for building in the future +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x0029 //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Raytac MDBT50Q-RX"