diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-25 18:28:56 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-25 18:28:56 +0000 |
| commit | e875d7cf9f31fe9ac586718850a433f2851b5e19 (patch) | |
| tree | 6646b7317aeb0a802a6eb0e2f09c8fa9c1df6f0d /Demos/Device/LowLevel/MIDI | |
| parent | 5b5b73ce582d2afa40218e44b45a97ec6c6ce9cf (diff) | |
| download | lufa-e875d7cf9f31fe9ac586718850a433f2851b5e19.tar.gz lufa-e875d7cf9f31fe9ac586718850a433f2851b5e19.tar.bz2 lufa-e875d7cf9f31fe9ac586718850a433f2851b5e19.zip | |
Changed MIDI event structure MIDI_EventPacket_t to use a single field for the combined virtual cable index and command ID, to prevent bitfield packing issues on some architectures (thanks to Darren Gibbs).
Diffstat (limited to 'Demos/Device/LowLevel/MIDI')
| -rw-r--r-- | Demos/Device/LowLevel/MIDI/MIDI.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c index f8bc4e917..335c7143e 100644 --- a/Demos/Device/LowLevel/MIDI/MIDI.c +++ b/Demos/Device/LowLevel/MIDI/MIDI.c @@ -160,8 +160,7 @@ void MIDI_Task(void) { MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t) { - .CableNumber = 0, - .Command = (MIDICommand >> 4), + .Event = MIDI_EVENT(0, MIDICommand), .Data1 = MIDICommand | Channel, .Data2 = MIDIPitch, @@ -191,7 +190,7 @@ void MIDI_Task(void) Endpoint_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL); /* Check to see if the sent command is a note on message with a non-zero velocity */ - if ((MIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4)) && (MIDIEvent.Data3 > 0)) + if ((MIDIEvent.Event == MIDI_EVENT(0, MIDI_COMMAND_NOTE_ON)) && (MIDIEvent.Data3 > 0)) { /* Change LEDs depending on the pitch of the sent note */ LEDs_SetAllLEDs(MIDIEvent.Data2 > 64 ? LEDS_LED1 : LEDS_LED2); |