GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-01-28 06:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

add WCID descriptor for DFU interface

Browse Source
This commit is contained in:
Hubert Denkmair 2016-04-30 21:25:18 +02:00
parent 71248281a7
commit 8a1a8d1f7d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/config.h
View File

@ -34,14 +34,14 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "bytewerk"
#define USBD_CONFIGURATION_STRING_FS (uint8_t*) "gs_usb config"
#define USBD_INTERFACE_STRING_FS (uint8_t*) "gs_usb interface"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "candleLight dfu interface"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "candleLight firmware upgrade interface"
#define USBD_SERIALNUMBER_STRING_FS (uint8_t*) "000000000001"
#define BOARD_candleLight 1
#define BOARD_cantact 2
#if BOARD == BOARD_candleLight
#define USBD_PRODUCT_STRING_FS (uint8_t*) "candleLight gs_usb"
#define USBD_PRODUCT_STRING_FS (uint8_t*) "candleLight USB to CAN adapter"
#define CAN_S_Pin GPIO_PIN_13
#define CAN_S_GPIO_Port GPIOC

12
src/usbd_gs_can.c
View File

@ -188,10 +188,10 @@ __ALIGN_BEGIN uint8_t USBD_GS_CAN_WINUSB_STR[] __ALIGN_END =
/* Microsoft Compatible ID Feature Descriptor */
static __ALIGN_BEGIN uint8_t USBD_MS_COMP_ID_FEATURE_DESC[] __ALIGN_END = {
0x28, 0x00, 0x00, 0x00, /* length */
0x40, 0x00, 0x00, 0x00, /* length */
0x00, 0x01, /* version 1.0 */
0x04, 0x00, /* descr index (0x0004) */
0x01, /* number of sections */
0x02, /* number of sections */
0x00, 0x00, 0x00, 0x00, /* reserved */
0x00, 0x00, 0x00,
0x00, /* interface number */
@ -201,6 +201,14 @@ static __ALIGN_BEGIN uint8_t USBD_MS_COMP_ID_FEATURE_DESC[] __ALIGN_END = {
0x00, 0x00, 0x00, 0x00, /* sub-compatible ID */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, /* reserved */
0x00, 0x00,
0x01, /* interface number */
0x01, /* reserved */
0x57, 0x49, 0x4E, 0x55, /* compatible ID ("WINUSB\0\0") */
0x53, 0x42, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, /* sub-compatible ID */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, /* reserved */
0x00, 0x00
};