# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1425861209 25200
# Node ID f158dfa0fa852d521b344755d31e54af4b2dba75
# Parent  ac842066568ab2d79f97efdc0b39e2eaa3fcfb32# Parent  4617ef5e06f1d547f00d7810bc88bfb7ef497628
Merge pull request #25 from smasher816/master

Set DFU bootloader name

diff -r ac842066568a -r f158dfa0fa85 Bootloader/_buildvars.h
--- a/Bootloader/_buildvars.h	Sat Mar 07 00:50:42 2015 -0800
+++ b/Bootloader/_buildvars.h	Sun Mar 08 17:33:29 2015 -0700
@@ -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 -r ac842066568a -r f158dfa0fa85 Bootloader/dfu.desc.c
--- a/Bootloader/dfu.desc.c	Sat Mar 07 00:50:42 2015 -0800
+++ b/Bootloader/dfu.desc.c	Sun Mar 08 17:33:29 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 ac842066568a -r f158dfa0fa85 Lib/CMake/arm.cmake
--- a/Lib/CMake/arm.cmake	Sat Mar 07 00:50:42 2015 -0800
+++ b/Lib/CMake/arm.cmake	Sun Mar 08 17:33:29 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" )