diff --git a/Bootloader/_buildvars.h b/Bootloader/_buildvars.h index 17a3557..d6c2a6b 100644 --- a/Bootloader/_buildvars.h +++ b/Bootloader/_buildvars.h @@ -29,17 +29,18 @@ // ----- Defines ----- // You can change these to give your code its own name. -#define STR_MANUFACTURER u"Kiibohd" -#define STR_PRODUCT u"Kiibohd DFU Bootloader" +#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 // Windows, even though the driver is supplied by Microsoft, an // INF file is needed to load the driver. These numbers need to // match the INF file. -#define VENDOR_ID @BOOT_VENDOR_ID@ -#define PRODUCT_ID @BOOT_PRODUCT_ID@ +#define VENDOR_ID @BOOT_VENDOR_ID@ +#define PRODUCT_ID @BOOT_PRODUCT_ID@ #endif diff --git a/Bootloader/dfu.desc.c b/Bootloader/dfu.desc.c index 5d7d69c..52377ea 100644 --- a/Bootloader/dfu.desc.c +++ b/Bootloader/dfu.desc.c @@ -50,7 +50,7 @@ static const struct usb_config_1 usb_config_1 = { .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 @@ static const struct usb_desc_string_t * const dfu_device_str_desc[] = { USB_DESC_STRING(STR_MANUFACTURER), USB_DESC_STRING(STR_PRODUCT), USB_DESC_STRING(STR_SERIAL), + USB_DESC_STRING(STR_ALTNAME), NULL }; diff --git a/Lib/CMake/arm.cmake b/Lib/CMake/arm.cmake index b468ae2..3efbe7c 100644 --- a/Lib/CMake/arm.cmake +++ b/Lib/CMake/arm.cmake @@ -113,6 +113,7 @@ if ( "${CHIP}" MATCHES "mk20dx128vlf5" OR "${CHIP}" MATCHES "mk20dx256vlh7" ) 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" )