diff options
| author | Christian Pointner <equinox@mur.at> | 2014-03-15 21:33:43 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2014-03-15 21:33:43 +0000 |
| commit | 2f0ec3589ac3bda7970c9c055b19d0fe1ccc1c4c (patch) | |
| tree | 45a01020263db914fbb0383c19fae7114c76ff48 /software/avr.lib/lufa-descriptor-keyboardmouse.c | |
| parent | updated avr utils (diff) | |
upgraded avr utils
git-svn-id: https://svn.spreadspace.org/mur.sat@881 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software/avr.lib/lufa-descriptor-keyboardmouse.c')
| -rw-r--r-- | software/avr.lib/lufa-descriptor-keyboardmouse.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/software/avr.lib/lufa-descriptor-keyboardmouse.c b/software/avr.lib/lufa-descriptor-keyboardmouse.c index ca19381..acc319b 100644 --- a/software/avr.lib/lufa-descriptor-keyboardmouse.c +++ b/software/avr.lib/lufa-descriptor-keyboardmouse.c @@ -208,10 +208,11 @@ const USB_Descriptor_String_t PROGMEM LanguageString = */
const USB_Descriptor_String_t PROGMEM ManufacturerString =
{
- .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
#ifndef USB_MANUFACTURER
+ .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
.UnicodeString = L"Dean Camera"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
.UnicodeString = USB_MANUFACTURER
#endif
};
@@ -222,10 +223,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */
const USB_Descriptor_String_t PROGMEM ProductString =
{
- .Header = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
#ifndef USB_PRODUCT
+ .Header = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
.UnicodeString = L"LUFA Mouse and Keyboard Demo"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
.UnicodeString = USB_PRODUCT
#endif
};
|