diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-11-14 16:11:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 16:11:29 -0500 |
| commit | ec3e065f0d2c65175384699cb11fa388250fa914 (patch) | |
| tree | e66837d6af1a30b739303bfa06043edf12f9fcc1 /lib/lufa/Bootloaders/DFU/Descriptors.c | |
| parent | 3c15c48e6a5c584d225d369ea458f9a3f9cd3d57 (diff) | |
QMK DFU bootloader generation (#2009)
* adds :bootloader target
* update planck and preonic revisions
* remove references to .h files for planck
* update preonic keymap
* only add keyboard.h files that exist
* add production target
* hook things up with the new lufa variables
* update rules for planck/preonic
* back backlight key turn of status led when pressed
* add manufacturer/product strings to bootloader
Diffstat (limited to 'lib/lufa/Bootloaders/DFU/Descriptors.c')
| -rw-r--r-- | lib/lufa/Bootloaders/DFU/Descriptors.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/lufa/Bootloaders/DFU/Descriptors.c b/lib/lufa/Bootloaders/DFU/Descriptors.c index 6b7b6d4900..46120781b1 100644 --- a/lib/lufa/Bootloaders/DFU/Descriptors.c +++ b/lib/lufa/Bootloaders/DFU/Descriptors.c @@ -36,6 +36,14 @@ */ #include "Descriptors.h" +#include "Keyboard.h" + +#ifndef MANUFACTURER + #define MANUFACTURER QMK +#endif +#ifndef PRODUCT + #define PRODUCT Keyboard +#endif /** Device descriptor structure. This descriptor, located in SRAM memory, describes the overall * device characteristics, including the supported USB version, control endpoint size and the @@ -125,13 +133,13 @@ const USB_Descriptor_String_t LanguageString = USB_STRING_DESCRIPTOR_ARRAY(LANGU * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -const USB_Descriptor_String_t ManufacturerString = USB_STRING_DESCRIPTOR(L"QMK"); +const USB_Descriptor_String_t ManufacturerString = USB_STRING_DESCRIPTOR(LSTR(MANUFACTURER)); /** Product descriptor string. This is a Unicode string containing the product's details in human readable form, * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(L"KB"); +const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(LSTR(PRODUCT)); /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" * documentation) by the application code so that the address and size of a requested descriptor can be given |