# HG changeset patch # User Rowan Decker # Date 1425859174 25200 # Node ID f9c406854bc22677f03a475993daab54160f0e31 # Parent 71882cd1c3623da3eec4acde8ac072ada3d64b1d Set DFU bootloader name Fixes #22 Each (dfu) interface may have more than one a ltsetting each with their own index and name. According to the DFU_1.1 pdf section 4.2.3, "* Alternate settings can be used by an application to access additional memory segments. In this case, it is suggested that each alternate setting employ a string descriptor to indicate the target memory segment; e.g., 'EEPROM'." Whether or not we end up using multiple memory segments it is still good to have a descriptive name incase there are other dfu devices connected. Edit: Fixed previous indentation diff -r 71882cd1c362 -r f9c406854bc2 Bootloader/_buildvars.h --- a/Bootloader/_buildvars.h Thu Feb 12 19:42:01 2015 -0800 +++ b/Bootloader/_buildvars.h Sun Mar 08 16:59:34 2015 -0700 @@ -32,6 +32,7 @@ #define STR_MANUFACTURER u"Kiibohd" #define STR_PRODUCT u"Kiibohd DFU Bootloader" #define STR_SERIAL u"@CHIP@" +#define STR_ALTNAME u"@BOOT_DFU_ALTNAME@" // Mac OS-X and Linux automatically load the correct drivers. On diff -r 71882cd1c362 -r f9c406854bc2 Bootloader/dfu.desc.c --- a/Bootloader/dfu.desc.c Thu Feb 12 19:42:01 2015 -0800 +++ b/Bootloader/dfu.desc.c Sun Mar 08 16:59:34 2015 -0700 @@ -50,7 +50,7 @@ .bInterfaceClass = USB_DEV_CLASS_APP, .bInterfaceSubClass = USB_DEV_SUBCLASS_APP_DFU, .bInterfaceProtocol = USB_DEV_PROTO_DFU_DFU, - .iInterface = 0 + .iInterface = 4 }, .dfu = { @@ -101,6 +101,7 @@ USB_DESC_STRING(STR_MANUFACTURER), USB_DESC_STRING(STR_PRODUCT), USB_DESC_STRING(STR_SERIAL), + USB_DESC_STRING(STR_ALTNAME), NULL }; diff -r 71882cd1c362 -r f9c406854bc2 Lib/CMake/arm.cmake --- a/Lib/CMake/arm.cmake Thu Feb 12 19:42:01 2015 -0800 +++ b/Lib/CMake/arm.cmake Sun Mar 08 16:59:34 2015 -0700 @@ -113,6 +113,7 @@ set( PRODUCT_ID "0xB04D" ) set( BOOT_VENDOR_ID "0x1C11" ) set( BOOT_PRODUCT_ID "0xB007" ) + set( BOOT_DFU_ALTNAME "Kiibohd DFU" ) set( DFU 1 ) message( "dfu" ) elseif ( "${CHIP}" MATCHES "mk20dx128" OR "${CHIP}" MATCHES "mk20dx256" )