Merge pull request #39 from keyboardio/jesse/extract-descriptor-strings

Make it possible to override usb vendor/product strings from config.h or the commandline

Author: devanlai

README.md

@@ -92,6 +92,11 @@ To use a custom VID/PID pair, you need to set the macros `USB_VID` and `USB_PID`
      DEFS="-DUSB_VID=0x1209 -DUSB_PID=0xCAFE" make
 
 
+## USB Vendor, Product, and Interface strings
+
+To customize the USB vendor, product, and interface strings that DAPBoot reports to the USB host, you may set the macros `USB_VENDOR_STRING`, `USB_PRODUCT_STRING`, and `USB_INTERFACE_STRING`, respectively. You can do this by setting the `DEFS` environment variable or including these macros in your board's `config.h`
+
+
 ## Licensing
 All contents of the dapboot project are licensed under terms that are compatible with the terms of the GNU Lesser General Public License version 3.
 

src/usb_conf.c

@@ -98,14 +98,10 @@ static const struct usb_bos_descriptor bos = {
 static char serial_number[USB_SERIAL_NUM_LENGTH+1];
 
 static const char *usb_strings[] = {
-    "Devanarchy",
-#ifdef BOOTLOADER_HIGH
-    "DAPBoot High-Memory DFU Bootloader",
-#else
-    "DAPBoot DFU Bootloader",
-#endif
+    USB_VENDOR_STRING,
+    USB_PRODUCT_STRING,
     serial_number,
-    "DAPBoot DFU"
+    USB_INTERFACE_STRING 
 };
 
 /* Buffer to be used for control requests. */

src/usb_conf.h

@@ -25,10 +25,29 @@
 #define USB_VID                 0x1209
 #endif
 
+#ifndef USB_VENDOR_STRING
+#define USB_VENDOR_STRING "Devanarchy"
+#endif
+
 #ifndef USB_PID
 #define USB_PID                 0xdb42
 #endif
 
+
+#ifndef USB_PRODUCT_STRING
+
+#ifdef BOOTLOADER_HIGH
+#define USB_PRODUCT_STRING "DAPBoot High-Memory DFU Bootloader"
+#else
+#define USB_PRODUCT_STRING "DAPBoot DFU Bootloader"
+#endif
+ 
+#endif
+
+#ifndef USB_INTERFACE_STRING
+#define USB_INTERFACE_STRING "DAPBoot DFU"
+#endif
+
 #define USB_CONTROL_BUF_SIZE    1024
 #define USB_SERIAL_NUM_LENGTH   24
 #define INTF_DFU                0