From 4cd7df42d42bf7a8b53699515f1d410d4c4d7007 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Sun, 10 Oct 2021 14:56:11 +1300 Subject: [PATCH] Enabled custom USB product names for non-F4 boards. --- src/main/msc/usbd_msc_desc.c | 4 ++-- src/main/vcp_hal/usbd_desc.c | 7 +++++++ src/main/vcpf4/usbd_desc.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/msc/usbd_msc_desc.c b/src/main/msc/usbd_msc_desc.c index da78072fff..2c61361273 100644 --- a/src/main/msc/usbd_msc_desc.c +++ b/src/main/msc/usbd_msc_desc.c @@ -65,8 +65,8 @@ #define USBD_LANGID_STRING 0x409 #define USBD_MANUFACTURER_STRING "STMicroelectronics" -#define USBD_PRODUCT_HS_STRING "Mass Storage in HS Mode" -#define USBD_PRODUCT_FS_STRING "Mass Storage in FS Mode" +#define USBD_PRODUCT_HS_STRING "Betaflight FC Mass Storage (HS Mode)" +#define USBD_PRODUCT_FS_STRING "Betaflight FC Mass Storage (FS Mode)" #define USBD_CONFIGURATION_HS_STRING "MSC Config" #define USBD_INTERFACE_HS_STRING "MSC Interface" #define USBD_CONFIGURATION_FS_STRING "MSC Config" diff --git a/src/main/vcp_hal/usbd_desc.c b/src/main/vcp_hal/usbd_desc.c index b38b8f8a5b..e30f1b7447 100644 --- a/src/main/vcp_hal/usbd_desc.c +++ b/src/main/vcp_hal/usbd_desc.c @@ -64,8 +64,15 @@ #define USBD_PID 0x5740 #define USBD_LANGID_STRING 0x409 #define USBD_MANUFACTURER_STRING FC_FIRMWARE_NAME + +#ifdef USBD_PRODUCT_STRING +#define USBD_PRODUCT_HS_STRING USBD_PRODUCT_STRING +#define USBD_PRODUCT_FS_STRING USBD_PRODUCT_STRING +#else #define USBD_PRODUCT_HS_STRING "STM32 Virtual ComPort in HS Mode" #define USBD_PRODUCT_FS_STRING "STM32 Virtual ComPort in FS Mode" +#endif + #define USBD_CONFIGURATION_HS_STRING "VCP Config" #define USBD_INTERFACE_HS_STRING "VCP Interface" #define USBD_CONFIGURATION_FS_STRING "VCP Config" diff --git a/src/main/vcpf4/usbd_desc.c b/src/main/vcpf4/usbd_desc.c index 637e399314..4994018f56 100644 --- a/src/main/vcpf4/usbd_desc.c +++ b/src/main/vcpf4/usbd_desc.c @@ -67,20 +67,20 @@ #define USBD_MANUFACTURER_STRING FC_FIRMWARE_NAME #ifdef USBD_PRODUCT_STRING - #define USBD_PRODUCT_HS_STRING USBD_PRODUCT_STRING - #define USBD_PRODUCT_FS_STRING USBD_PRODUCT_STRING +#define USBD_PRODUCT_HS_STRING USBD_PRODUCT_STRING +#define USBD_PRODUCT_FS_STRING USBD_PRODUCT_STRING #else - #define USBD_PRODUCT_HS_STRING "STM32 Virtual ComPort in HS mode" - #define USBD_PRODUCT_FS_STRING "STM32 Virtual ComPort in FS Mode" +#define USBD_PRODUCT_HS_STRING "STM32 Virtual ComPort in HS mode" +#define USBD_PRODUCT_FS_STRING "STM32 Virtual ComPort in FS Mode" #endif /* USBD_PRODUCT_STRING */ #ifdef USBD_SERIALNUMBER_STRING - #define USBD_SERIALNUMBER_HS_STRING USBD_SERIALNUMBER_STRING - #define USBD_SERIALNUMBER_FS_STRING USBD_SERIALNUMBER_STRING +#define USBD_SERIALNUMBER_HS_STRING USBD_SERIALNUMBER_STRING +#define USBD_SERIALNUMBER_FS_STRING USBD_SERIALNUMBER_STRING #else - // start of STM32 flash - #define USBD_SERIALNUMBER_HS_STRING "0x8000000" - #define USBD_SERIALNUMBER_FS_STRING "0x8000000" +// start of STM32 flash +#define USBD_SERIALNUMBER_HS_STRING "0x8000000" +#define USBD_SERIALNUMBER_FS_STRING "0x8000000" #endif /* USBD_SERIALNUMBER_STRING */ #define USBD_CONFIGURATION_HS_STRING "VCP Config"