Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Merge pull request #11013 from mikeller/enable_custom_usb_product_string

Browse source
This commit is contained in:
Michael Keller 2021-10-25 10:41:12 +13:00 • committed by GitHub
commit c14d65051d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/msc/usbd_msc_desc.c
View file

@ -65,8 +65,8 @@
#define USBD_LANGID_STRING 0x409 #define USBD_LANGID_STRING 0x409
#define USBD_MANUFACTURER_STRING "STMicroelectronics" #define USBD_MANUFACTURER_STRING "STMicroelectronics"
#define USBD_PRODUCT_HS_STRING "Mass Storage in HS Mode" #define USBD_PRODUCT_HS_STRING "Betaflight FC Mass Storage (HS Mode)"
#define USBD_PRODUCT_FS_STRING "Mass Storage in FS Mode" #define USBD_PRODUCT_FS_STRING "Betaflight FC Mass Storage (FS Mode)"
#define USBD_CONFIGURATION_HS_STRING "MSC Config" #define USBD_CONFIGURATION_HS_STRING "MSC Config"
#define USBD_INTERFACE_HS_STRING "MSC Interface" #define USBD_INTERFACE_HS_STRING "MSC Interface"
#define USBD_CONFIGURATION_FS_STRING "MSC Config" #define USBD_CONFIGURATION_FS_STRING "MSC Config"

7
src/main/vcp_hal/usbd_desc.c
View file

@ -64,8 +64,15 @@
#define USBD_PID 0x5740 #define USBD_PID 0x5740
#define USBD_LANGID_STRING 0x409 #define USBD_LANGID_STRING 0x409
#define USBD_MANUFACTURER_STRING FC_FIRMWARE_NAME #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_HS_STRING "STM32 Virtual ComPort in HS Mode"
#define USBD_PRODUCT_FS_STRING "STM32 Virtual ComPort in FS Mode" #define USBD_PRODUCT_FS_STRING "STM32 Virtual ComPort in FS Mode"
#endif
#define USBD_CONFIGURATION_HS_STRING "VCP Config" #define USBD_CONFIGURATION_HS_STRING "VCP Config"
#define USBD_INTERFACE_HS_STRING "VCP Interface" #define USBD_INTERFACE_HS_STRING "VCP Interface"
#define USBD_CONFIGURATION_FS_STRING "VCP Config" #define USBD_CONFIGURATION_FS_STRING "VCP Config"

18
src/main/vcpf4/usbd_desc.c
View file

@ -67,20 +67,20 @@
#define USBD_MANUFACTURER_STRING FC_FIRMWARE_NAME #define USBD_MANUFACTURER_STRING FC_FIRMWARE_NAME
#ifdef USBD_PRODUCT_STRING #ifdef USBD_PRODUCT_STRING
#define USBD_PRODUCT_HS_STRING USBD_PRODUCT_STRING #define USBD_PRODUCT_HS_STRING USBD_PRODUCT_STRING
#define USBD_PRODUCT_FS_STRING USBD_PRODUCT_STRING #define USBD_PRODUCT_FS_STRING USBD_PRODUCT_STRING
#else #else
#define USBD_PRODUCT_HS_STRING "STM32 Virtual ComPort in HS mode" #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_FS_STRING "STM32 Virtual ComPort in FS Mode"
#endif /* USBD_PRODUCT_STRING */ #endif /* USBD_PRODUCT_STRING */
#ifdef USBD_SERIALNUMBER_STRING #ifdef USBD_SERIALNUMBER_STRING
#define USBD_SERIALNUMBER_HS_STRING USBD_SERIALNUMBER_STRING #define USBD_SERIALNUMBER_HS_STRING USBD_SERIALNUMBER_STRING
#define USBD_SERIALNUMBER_FS_STRING USBD_SERIALNUMBER_STRING #define USBD_SERIALNUMBER_FS_STRING USBD_SERIALNUMBER_STRING
#else #else
// start of STM32 flash // start of STM32 flash
#define USBD_SERIALNUMBER_HS_STRING "0x8000000" #define USBD_SERIALNUMBER_HS_STRING "0x8000000"
#define USBD_SERIALNUMBER_FS_STRING "0x8000000" #define USBD_SERIALNUMBER_FS_STRING "0x8000000"
#endif /* USBD_SERIALNUMBER_STRING */ #endif /* USBD_SERIALNUMBER_STRING */
#define USBD_CONFIGURATION_HS_STRING "VCP Config" #define USBD_CONFIGURATION_HS_STRING "VCP Config"