aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/ClassDriver/MIDI/MIDI.c
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-06-16 07:17:22 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-06-16 07:17:22 +0000
commitdcf303762ad6b1401d2dcfd763764b400dcee2f7 (patch)
tree27d6d4cb5aaeecf0dcc5841c4af83d88096c054a /Demos/Device/ClassDriver/MIDI/MIDI.c
parent39d07c3da045a3d739f9977101f8a81f0b8ff0e1 (diff)
downloadlufa-dcf303762ad6b1401d2dcfd763764b400dcee2f7.tar.gz
lufa-dcf303762ad6b1401d2dcfd763764b400dcee2f7.tar.bz2
lufa-dcf303762ad6b1401d2dcfd763764b400dcee2f7.zip
Pipe_GetErrorFlags() now returns additional error flags for overflow and underflow errors.
Change MIDI demos to use real MIDI command values, and shift for the USB wrapper, rather than shift for the MIDI bytes. This is a little confusing for the MIDI USB wrapper, but allows for the use of real standardized MIDI command values.
Diffstat (limited to 'Demos/Device/ClassDriver/MIDI/MIDI.c')
-rw-r--r--Demos/Device/ClassDriver/MIDI/MIDI.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index 234adca25..511f280d6 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -139,9 +139,9 @@ void CheckJoystickMovement(void)
USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
{
.CableNumber = 0,
- .Command = MIDICommand,
+ .Command = (MIDICommand >> 4),
- .Data1 = (MIDICommand << 4) | Channel,
+ .Data1 = MIDICommand | Channel,
.Data2 = MIDIPitch,
.Data3 = MIDI_STANDARD_VELOCITY,
};