summaryrefslogtreecommitdiff
path: root/software/rhmixxx/Makefile
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-06-30 02:54:36 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-06-30 02:54:36 (GMT)
commit3e5e5b07af1cc930be624e496c6d6cf5da79efa4 (patch)
tree259b1fb78fbd2c4993532eeb86ce8f0bf08077ae /software/rhmixxx/Makefile
parent1ca60f98838b75dcbc7d19a459943288642aa97d (diff)
upgraded to new lufa version of avr-utils
Diffstat (limited to 'software/rhmixxx/Makefile')
-rw-r--r--software/rhmixxx/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/software/rhmixxx/Makefile b/software/rhmixxx/Makefile
index 6883376..c612c81 100644
--- a/software/rhmixxx/Makefile
+++ b/software/rhmixxx/Makefile
@@ -1,7 +1,7 @@
##
## rhmidi
##
-## Copyright (C) 2014 Christian Pointner <equinox@helsinki.at>
+## Copyright (C) 2014-2015 Christian Pointner <equinox@helsinki.at>
##
## This file is part of rhmidi.
##
@@ -26,7 +26,7 @@ LIBS := util led lufa-descriptor-midi
EXTERNAL_LIBS := lufa
SPREADAVR_PATH := ../../contrib/avr-utils
-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-140928
LUFA_OPTS = -D USB_DEVICE_ONLY
LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
LUFA_OPTS += -D ORDERED_EP_CONFIG
@@ -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\"" -D USB_MANUFACTURER_LEN=14
-LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\"" -D USB_PRODUCT_LEN=23
+LUFA_OPTS += -D USB_MANUFACTURER="L\"Radio Helsinki\""
+LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\""
LUFA_COMPONENTS := USB USBCLASS