From 565d4aa1a4f838c17520a58071c7d51dcc556aa7 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 15 Mar 2014 21:16:23 +0000 Subject: fixed usb string length git-svn-id: https://svn.spreadspace.org/avr/trunk@254 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- any-led/Makefile | 4 ++-- ats-watch/Makefile | 4 ++-- lib/lufa-descriptor-keyboardmouse.c | 6 ++++-- lib/lufa-descriptor-midi.c | 8 ++++---- lib/lufa-descriptor-rndis.c | 6 ++++-- lib/lufa-descriptor-usbdualserial.c | 6 ++++-- lib/lufa-descriptor-usbserial.c | 6 ++++-- pcr-controller/Makefile | 4 ++-- rf433send/Makefile | 4 ++-- tuer-rfid/Makefile | 4 ++-- usb-1wire/Makefile | 4 ++-- usb-adc-dustsensor/Makefile | 4 ++-- usb-ajar/Makefile | 4 ++-- usb-dual-serial/Makefile | 4 ++-- usb-eth/Makefile | 4 ++-- usb-keyboardmouse/Makefile | 4 ++-- usb-led/Makefile | 4 ++-- usb-midi/Makefile | 4 ++-- usb-pwm/Makefile | 4 ++-- usb-serial/Makefile | 4 ++-- usb-spi/Makefile | 4 ++-- 21 files changed, 52 insertions(+), 44 deletions(-) diff --git a/any-led/Makefile b/any-led/Makefile index 1fbb6d6..ddfcc00 100644 --- a/any-led/Makefile +++ b/any-led/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace any-led example\"" -D USB_PRODUCT_LEN=27 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/ats-watch/Makefile b/ats-watch/Makefile index 33da52c..741d9a4 100644 --- a/ats-watch/Makefile +++ b/ats-watch/Makefile @@ -36,8 +36,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"Radio Helsinki\"" -D USB_MANUFACTURER_LEN=14 +LUFA_OPTS += -D USB_PRODUCT="L\"ats-watch\"" -D USB_PRODUCT_LEN=9 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/lib/lufa-descriptor-keyboardmouse.c b/lib/lufa-descriptor-keyboardmouse.c index ca19381..acc319b 100644 --- a/lib/lufa-descriptor-keyboardmouse.c +++ b/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 }; diff --git a/lib/lufa-descriptor-midi.c b/lib/lufa-descriptor-midi.c index ee5e6c3..99fab41 100644 --- a/lib/lufa-descriptor-midi.c +++ b/lib/lufa-descriptor-midi.c @@ -261,11 +261,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 }; @@ -276,11 +276,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */ const USB_Descriptor_String_t PROGMEM ProductString = { - .Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String}, - #ifndef USB_PRODUCT + .Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String}, .UnicodeString = L"LUFA MIDI Demo" #else + .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String}, .UnicodeString = USB_PRODUCT #endif }; diff --git a/lib/lufa-descriptor-rndis.c b/lib/lufa-descriptor-rndis.c index 28ea637..ba29037 100644 --- a/lib/lufa-descriptor-rndis.c +++ b/lib/lufa-descriptor-rndis.c @@ -191,10 +191,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 }; @@ -205,10 +206,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */ const USB_Descriptor_String_t PROGMEM ProductString = { - .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String}, #ifndef USB_PRODUCT + .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String}, .UnicodeString = L"LUFA USB-RS232 Adapter" #else + .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String}, .UnicodeString = USB_PRODUCT #endif }; diff --git a/lib/lufa-descriptor-usbdualserial.c b/lib/lufa-descriptor-usbdualserial.c index 0d506c7..639391c 100644 --- a/lib/lufa-descriptor-usbdualserial.c +++ b/lib/lufa-descriptor-usbdualserial.c @@ -318,10 +318,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 }; @@ -332,10 +333,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */ const USB_Descriptor_String_t PROGMEM ProductString = { - .Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String}, #ifndef USB_PRODUCT + .Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String}, .UnicodeString = L"LUFA Dual CDC Demo" #else + .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String}, .UnicodeString = USB_PRODUCT #endif }; diff --git a/lib/lufa-descriptor-usbserial.c b/lib/lufa-descriptor-usbserial.c index 1c049be..fa2ef25 100644 --- a/lib/lufa-descriptor-usbserial.c +++ b/lib/lufa-descriptor-usbserial.c @@ -204,10 +204,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 }; @@ -218,10 +219,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */ const USB_Descriptor_String_t PROGMEM ProductString = { - .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String}, #ifndef USB_PRODUCT + .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String}, .UnicodeString = L"LUFA USB-RS232 Adapter" #else + .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String}, .UnicodeString = USB_PRODUCT #endif }; diff --git a/pcr-controller/Makefile b/pcr-controller/Makefile index e5d923c..5861510 100644 --- a/pcr-controller/Makefile +++ b/pcr-controller/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3 +LUFA_OPTS += -D USB_PRODUCT="L\"OLGA pcr-controller\"" -D USB_PRODUCT_LEN=19 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/rf433send/Makefile b/rf433send/Makefile index b544223..c35732e 100644 --- a/rf433send/Makefile +++ b/rf433send/Makefile @@ -39,8 +39,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"otti\"" -D USB_MANUFACTURER_LEN=4 +LUFA_OPTS += -D USB_PRODUCT="L\"realraum RF433 controller\"" -D USB_PRODUCT_LEN=25 LUFA_COMPONENTS := USB USBCLASS diff --git a/tuer-rfid/Makefile b/tuer-rfid/Makefile index af82ef9..4983254 100644 --- a/tuer-rfid/Makefile +++ b/tuer-rfid/Makefile @@ -39,8 +39,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"realraum door firmware\"" -D USB_PRODUCT_LEN=22 LUFA_COMPONENTS := USB USBCLASS TWI SERIAL diff --git a/usb-1wire/Makefile b/usb-1wire/Makefile index 1c7a8b4..9020cbd 100644 --- a/usb-1wire/Makefile +++ b/usb-1wire/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-1wire example\"" -D USB_PRODUCT_LEN=29 LUFA_COMPONENTS := USB USBCLASS diff --git a/usb-adc-dustsensor/Makefile b/usb-adc-dustsensor/Makefile index dcbbea8..20801fb 100644 --- a/usb-adc-dustsensor/Makefile +++ b/usb-adc-dustsensor/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-adc-dustsensor example\"" -D USB_PRODUCT_LEN=38 LUFA_COMPONENTS := USB USBCLASS diff --git a/usb-ajar/Makefile b/usb-ajar/Makefile index 612745c..4c916ec 100644 --- a/usb-ajar/Makefile +++ b/usb-ajar/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-ajar example\"" -D USB_PRODUCT_LEN=28 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-dual-serial/Makefile b/usb-dual-serial/Makefile index a4b36af..9a7070f 100644 --- a/usb-dual-serial/Makefile +++ b/usb-dual-serial/Makefile @@ -35,8 +35,8 @@ LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-dual-serial example\"" -D USB_PRODUCT_LEN=35 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-eth/Makefile b/usb-eth/Makefile index 2a6a4dd..ce4bc6a 100644 --- a/usb-eth/Makefile +++ b/usb-eth/Makefile @@ -34,8 +34,8 @@ LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-eth example\"" -D USB_PRODUCT_LEN=27 LUFA_COMPONENTS := USB USBCLASS diff --git a/usb-keyboardmouse/Makefile b/usb-keyboardmouse/Makefile index af93709..4f49c23 100644 --- a/usb-keyboardmouse/Makefile +++ b/usb-keyboardmouse/Makefile @@ -33,8 +33,8 @@ LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-keyboardmouse example\"" -D USB_PRODUCT_LEN=37 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-led/Makefile b/usb-led/Makefile index 97d1f76..bce705b 100644 --- a/usb-led/Makefile +++ b/usb-led/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-led example\"" -D USB_PRODUCT_LEN=27 LUFA_COMPONENTS := USB USBCLASS diff --git a/usb-midi/Makefile b/usb-midi/Makefile index f7c6cd8..ba1b5b3 100644 --- a/usb-midi/Makefile +++ b/usb-midi/Makefile @@ -36,8 +36,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"Radio Helsinki\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"Radio Helsinki\"" -D USB_MANUFACTURER_LEN=14 +LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\"" -D USB_PRODUCT_LEN=23 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-pwm/Makefile b/usb-pwm/Makefile index 5db975c..a66709f 100644 --- a/usb-pwm/Makefile +++ b/usb-pwm/Makefile @@ -38,8 +38,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-pwm example\"" -D USB_PRODUCT_LEN=27 LUFA_COMPONENTS := USB USBCLASS diff --git a/usb-serial/Makefile b/usb-serial/Makefile index 0a09c11..ee5961e 100644 --- a/usb-serial/Makefile +++ b/usb-serial/Makefile @@ -36,8 +36,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-serial example\"" -D USB_PRODUCT_LEN=30 LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-spi/Makefile b/usb-spi/Makefile index e4102d9..a698373 100644 --- a/usb-spi/Makefile +++ b/usb-spi/Makefile @@ -36,8 +36,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-spi example\"" -D USB_PRODUCT_LEN=27 LUFA_COMPONENTS := USB USBCLASS -- cgit v1.2.3