diff options
Diffstat (limited to 'dolmetsch-ctl/dolmetsch-ctl.c')
-rw-r--r-- | dolmetsch-ctl/dolmetsch-ctl.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/dolmetsch-ctl/dolmetsch-ctl.c b/dolmetsch-ctl/dolmetsch-ctl.c index 85aad6f..1308a5b 100644 --- a/dolmetsch-ctl/dolmetsch-ctl.c +++ b/dolmetsch-ctl/dolmetsch-ctl.c @@ -42,20 +42,24 @@ * within a device can be differentiated from one another. */ USB_ClassInfo_MIDI_Device_t MIDI_Interface = - { - .Config = - { - .StreamingInterfaceNumber = 1, - - .DataINEndpointNumber = MIDI_STREAM_IN_EPNUM, - .DataINEndpointSize = MIDI_STREAM_EPSIZE, - .DataINEndpointDoubleBank = false, - - .DataOUTEndpointNumber = MIDI_STREAM_OUT_EPNUM, - .DataOUTEndpointSize = MIDI_STREAM_EPSIZE, - .DataOUTEndpointDoubleBank = false, - }, - }; + { + .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, + }, + }, + }; /** Event handler for the library USB Configuration Changed event. */ void EVENT_USB_Device_ConfigurationChanged(void) @@ -75,8 +79,7 @@ void EVENT_USB_Device_ControlRequest(void) #include "keypad.h" #include "eventqueue.h" -#define MIDI_COMMAND_CONTROL_CHANGE 0xB0 -#define MIDI_COMMAND_PROGRAM_CHANGE 0xC0 +#define MIDI_CABLENUMBER 1 static void process_incoming_midi(void) { @@ -109,16 +112,14 @@ static void process_outgoing_midi(void) { MIDI_EventPacket_t MIDIEventOn = (MIDI_EventPacket_t) { - .CableNumber = 0, // TODO: hardcoded value - .Command = (MIDI_COMMAND_NOTE_ON >> 4), + .Event = MIDI_EVENT(MIDI_CHANNEL(MIDI_CABLENUMBER), MIDI_COMMAND_NOTE_ON), .Data1 = MIDI_COMMAND_NOTE_ON | 0, .Data2 = 0, .Data3 = 0x7F, }; MIDI_EventPacket_t MIDIEventOff = (MIDI_EventPacket_t) { - .CableNumber = 0, // TODO: hardcoded value - .Command = (MIDI_COMMAND_NOTE_OFF >> 4), + .Event = MIDI_EVENT(MIDI_CHANNEL(MIDI_CABLENUMBER), MIDI_COMMAND_NOTE_OFF), .Data1 = MIDI_COMMAND_NOTE_OFF | 0, .Data2 = 0, .Data3 = 0, |