diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-06-30 01:29:31 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-06-30 01:29:31 +0200 |
| commit | 3a39803b4d66096899573f5203f3191c9db93697 (patch) | |
| tree | 8b14339ae55144f00d8cb6d383f1eb4627c0173a /usb-midi | |
| parent | ported usb-keyboardmouse to new lufa (diff) | |
ported usb-midi to new lufa
Diffstat (limited to 'usb-midi')
| -rw-r--r-- | usb-midi/Makefile | 6 | ||||
| -rw-r--r-- | usb-midi/usb-midi.c | 39 |
2 files changed, 24 insertions, 21 deletions
diff --git a/usb-midi/Makefile b/usb-midi/Makefile index f8f4f34..0175854 100644 --- a/usb-midi/Makefile +++ b/usb-midi/Makefile @@ -27,7 +27,7 @@ LIBS := util led lufa-descriptor-midi serialio EXTERNAL_LIBS := lufa SPREADAVR_PATH := .. -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 @@ -37,8 +37,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 SERIAL diff --git a/usb-midi/usb-midi.c b/usb-midi/usb-midi.c index 6339646..3c14499 100644 --- a/usb-midi/usb-midi.c +++ b/usb-midi/usb-midi.c @@ -32,7 +32,7 @@ /* LUFA Library - Copyright (C) Dean Camera, 2012. + Copyright (C) Dean Camera, 2014. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -46,20 +46,25 @@ * within a device can be differentiated from one another. */ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface = - { - .Config = - { - .StreamingInterfaceNumber = 1, + { + .Config = + { + .StreamingInterfaceNumber = INTERFACE_ID_AudioStream, + .DataINEndpoint = + { + .Address = MIDI_STREAM_IN_EPADDR, + .Size = MIDI_STREAM_EPSIZE, + .Banks = 1, + }, + .DataOUTEndpoint = + { + .Address = MIDI_STREAM_OUT_EPADDR, + .Size = MIDI_STREAM_EPSIZE, + .Banks = 1, + }, + }, + }; - .DataINEndpointNumber = MIDI_STREAM_IN_EPNUM, - .DataINEndpointSize = MIDI_STREAM_EPSIZE, - .DataINEndpointDoubleBank = false, - - .DataOUTEndpointNumber = MIDI_STREAM_OUT_EPNUM, - .DataOUTEndpointSize = MIDI_STREAM_EPSIZE, - .DataOUTEndpointDoubleBank = false, - }, - }; /** Event handler for the library USB Configuration Changed event. */ void EVENT_USB_Device_ConfigurationChanged(void) @@ -107,16 +112,14 @@ int main(void) MIDI_EventPacket_t MIDIEventOn = (MIDI_EventPacket_t) { - .CableNumber = 0, - .Command = (MIDI_COMMAND_NOTE_ON >> 4), + .Event = MIDI_EVENT(0, MIDI_COMMAND_NOTE_ON), .Data1 = MIDI_COMMAND_NOTE_ON | 0, .Data2 = 0, .Data3 = 0x7F, }; MIDI_EventPacket_t MIDIEventOff = (MIDI_EventPacket_t) { - .CableNumber = 0, - .Command = (MIDI_COMMAND_NOTE_OFF >> 4), + .Event = MIDI_EVENT(0, MIDI_COMMAND_NOTE_OFF), .Data1 = MIDI_COMMAND_NOTE_OFF | 0, .Data2 = 0, .Data3 = 0, |