aboutsummaryrefslogtreecommitdiff
path: root/lib/lufa/Bootloaders/DFU/Descriptors.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-11-14 16:11:29 -0500
committerGitHub <noreply@github.com>2017-11-14 16:11:29 -0500
commitec3e065f0d2c65175384699cb11fa388250fa914 (patch)
treee66837d6af1a30b739303bfa06043edf12f9fcc1 /lib/lufa/Bootloaders/DFU/Descriptors.c
parent3c15c48e6a5c584d225d369ea458f9a3f9cd3d57 (diff)
downloadqmk_firmware-ec3e065f0d2c65175384699cb11fa388250fa914.tar.gz
qmk_firmware-ec3e065f0d2c65175384699cb11fa388250fa914.zip
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.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/lufa/Bootloaders/DFU/Descriptors.c b/lib/lufa/Bootloaders/DFU/Descriptors.c
index 6b7b6d490..46120781b 100644
--- a/lib/lufa/Bootloaders/DFU/Descriptors.c
+++ b/lib/lufa/Bootloaders/DFU/Descriptors.c
@@ -36,6 +36,14 @@
36 */ 36 */
37 37
38#include "Descriptors.h" 38#include "Descriptors.h"
39#include "Keyboard.h"
40
41#ifndef MANUFACTURER
42 #define MANUFACTURER QMK
43#endif
44#ifndef PRODUCT
45 #define PRODUCT Keyboard
46#endif
39 47
40/** Device descriptor structure. This descriptor, located in SRAM memory, describes the overall 48/** Device descriptor structure. This descriptor, located in SRAM memory, describes the overall
41 * device characteristics, including the supported USB version, control endpoint size and the 49 * 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
125 * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device 133 * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
126 * Descriptor. 134 * Descriptor.
127 */ 135 */
128const USB_Descriptor_String_t ManufacturerString = USB_STRING_DESCRIPTOR(L"QMK"); 136const USB_Descriptor_String_t ManufacturerString = USB_STRING_DESCRIPTOR(LSTR(MANUFACTURER));
129 137
130/** Product descriptor string. This is a Unicode string containing the product's details in human readable form, 138/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
131 * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device 139 * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
132 * Descriptor. 140 * Descriptor.
133 */ 141 */
134const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(L"KB"); 142const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(LSTR(PRODUCT));
135 143
136/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" 144/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
137 * documentation) by the application code so that the address and size of a requested descriptor can be given 145 * documentation) by the application code so that the address and size of a requested descriptor can be given