diff options
Diffstat (limited to 'software/rhmixxx/rhmixxx.c')
| -rw-r--r-- | software/rhmixxx/rhmixxx.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/software/rhmixxx/rhmixxx.c b/software/rhmixxx/rhmixxx.c index 33595f4..bf22ac8 100644 --- a/software/rhmixxx/rhmixxx.c +++ b/software/rhmixxx/rhmixxx.c @@ -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. * @@ -27,7 +27,7 @@ /* LUFA Library - Copyright (C) Dean Camera, 2012. + Copyright (C) Dean Camera, 2014. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -41,20 +41,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) @@ -76,8 +80,7 @@ void EVENT_USB_Device_ControlRequest(void) #include "gpio.h" #include "analog.h" -#define MIDI_COMMAND_CONTROL_CHANGE 0xB0 -#define MIDI_COMMAND_PROGRAM_CHANGE 0xC0 +#define MIDI_CABLENUMBER 1 static void process_incoming_midi(void) { @@ -127,24 +130,21 @@ 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, }; MIDI_EventPacket_t MIDIEventAnalog = (MIDI_EventPacket_t) { - .CableNumber = 0, // TODO: hardcoded value - .Command = (MIDI_COMMAND_CONTROL_CHANGE >> 4), + .Event = MIDI_EVENT(MIDI_CHANNEL(MIDI_CABLENUMBER), MIDI_COMMAND_CONTROL_CHANGE), .Data1 = MIDI_COMMAND_CONTROL_CHANGE | 0, .Data2 = 0, .Data3 = 0, |