di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #25 from smasher816/master

Browse Source 
Set DFU bootloader name
This commit is contained in:
Jacob Alexander 2015-03-08 17:33:29 -07:00
commit aeaaaaa468
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Bootloader/_buildvars.h
View File

@ -29,17 +29,18 @@
// ----- Defines ----- // ----- Defines -----
// You can change these to give your code its own name. // You can change these to give your code its own name.
#define STR_MANUFACTURER u"Kiibohd" #define STR_MANUFACTURER u"Kiibohd"
#define STR_PRODUCT u"Kiibohd DFU Bootloader" #define STR_PRODUCT u"Kiibohd DFU Bootloader"
#define STR_SERIAL u"@CHIP@" #define STR_SERIAL u"@CHIP@"
#define STR_ALTNAME u"@BOOT_DFU_ALTNAME"
// Mac OS-X and Linux automatically load the correct drivers. On // Mac OS-X and Linux automatically load the correct drivers. On
// Windows, even though the driver is supplied by Microsoft, an // Windows, even though the driver is supplied by Microsoft, an
// INF file is needed to load the driver. These numbers need to // INF file is needed to load the driver. These numbers need to
// match the INF file. // match the INF file.
#define VENDOR_ID @BOOT_VENDOR_ID@ #define VENDOR_ID @BOOT_VENDOR_ID@
#define PRODUCT_ID @BOOT_PRODUCT_ID@ #define PRODUCT_ID @BOOT_PRODUCT_ID@
#endif #endif

3
Bootloader/dfu.desc.c
View File

@ -50,7 +50,7 @@ static const struct usb_config_1 usb_config_1 = {
.bInterfaceClass = USB_DEV_CLASS_APP, .bInterfaceClass = USB_DEV_CLASS_APP,
.bInterfaceSubClass = USB_DEV_SUBCLASS_APP_DFU, .bInterfaceSubClass = USB_DEV_SUBCLASS_APP_DFU,
.bInterfaceProtocol = USB_DEV_PROTO_DFU_DFU, .bInterfaceProtocol = USB_DEV_PROTO_DFU_DFU,
.iInterface = 0 .iInterface = 4
}, },
.dfu = { .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_MANUFACTURER),
USB_DESC_STRING(STR_PRODUCT), USB_DESC_STRING(STR_PRODUCT),
USB_DESC_STRING(STR_SERIAL), USB_DESC_STRING(STR_SERIAL),
USB_DESC_STRING(STR_ALTNAME),
NULL NULL
}; };

1
Lib/CMake/arm.cmake
View File

@ -113,6 +113,7 @@ if ( "${CHIP}" MATCHES "mk20dx128vlf5" OR "${CHIP}" MATCHES "mk20dx256vlh7" )
set( PRODUCT_ID "0xB04D" ) set( PRODUCT_ID "0xB04D" )
set( BOOT_VENDOR_ID "0x1C11" ) set( BOOT_VENDOR_ID "0x1C11" )
set( BOOT_PRODUCT_ID "0xB007" ) set( BOOT_PRODUCT_ID "0xB007" )
set( BOOT_DFU_ALTNAME "Kiibohd DFU" )
set( DFU 1 ) set( DFU 1 )
message( "dfu" ) message( "dfu" )
elseif ( "${CHIP}" MATCHES "mk20dx128" OR "${CHIP}" MATCHES "mk20dx256" ) elseif ( "${CHIP}" MATCHES "mk20dx128" OR "${CHIP}" MATCHES "mk20dx256" )