Fixes to the MIDI device demos (ClassDriver, LowLevel); discard unused read-in events...

[pub/lufa.git] / Demos / Device / LowLevel / MIDI / MIDI.c

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c
index 856f7db..c74d8d5 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/MIDI.c
+++ b/Demos/Device/LowLevel/MIDI/MIDI.c
@@ -122,6 +122,9 @@ void MIDI_Task(void)
        /* Check if endpoint is ready to be written to */\r
        if (Endpoint_IsINReady())\r
        {\r
+               uint8_t MIDICommand = 0;\r
+               uint8_t MIDIPitch;\r
+       \r
                /* Get current joystick mask, XOR with previous to detect joystick changes */\r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r
                uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r
@@ -130,20 +133,55 @@ void MIDI_Task(void)
                uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r
 \r
                if (JoystickChanges & JOY_LEFT)\r
-                 SendMIDINoteChange(0x3C, (JoystickStatus & JOY_LEFT), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3C;\r
+               }\r
 \r
                if (JoystickChanges & JOY_UP)\r
-                 SendMIDINoteChange(0x3D, (JoystickStatus & JOY_UP), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3D;\r
+               }\r
 \r
                if (JoystickChanges & JOY_RIGHT)\r
-                 SendMIDINoteChange(0x3E, (JoystickStatus & JOY_RIGHT), 0, Channel);\r
-\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3E;\r
+               }\r
+               \r
                if (JoystickChanges & JOY_DOWN)\r
-                 SendMIDINoteChange(0x3F, (JoystickStatus & JOY_DOWN), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3F;\r
+               }\r
 \r
                if (JoystickChanges & JOY_PRESS)\r
-                 SendMIDINoteChange(0x3B, (JoystickStatus & JOY_PRESS), 0, Channel);\r
-\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3B;\r
+               }\r
+\r
+               /* Check if a MIDI command is to be sent */\r
+               if (MIDICommand)\r
+               {\r
+                       USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)\r
+                               {\r
+                                       .CableNumber = 0,\r
+                                       .Command     = MIDICommand,\r
+                                       \r
+                                       .Data1       = (MIDICommand << 4) | Channel,\r
+                                       .Data2       = MIDIPitch,\r
+                                       .Data3       = MIDI_STANDARD_VELOCITY,                  \r
+                               };\r
+                               \r
+                       /* Write the MIDI event packet to the endpoint */\r
+                       Endpoint_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));\r
+               \r
+                       /* Send the data in the endpoint to the host */\r
+                       Endpoint_ClearIN();\r
+               }\r
+               \r
                /* Save previous joystick value for next joystick change detection */\r
                PrevJoystickStatus = JoystickStatus;\r
        }\r
@@ -155,31 +193,3 @@ void MIDI_Task(void)
        if (Endpoint_IsOUTReceived())\r
          Endpoint_ClearOUT();\r
 }\r
-\r
-/** Sends a MIDI note change event (note on or off) to the MIDI output jack, on the given virtual cable ID and channel.\r
- *\r
- *  \param Pitch    Pitch of the note to turn on or off\r
- *  \param OnOff    Set to true if the note is on (being held down), or false otherwise\r
- *  \param CableID  ID of the virtual cable to send the note change to\r
- *  \param Channel  MIDI channel number to send the note change event to\r
- */\r
-void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
-{\r
-       /* If endpoint ready for more data, abort */\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         return;\r
-\r
-       /* Check if the message should be a Note On or Note Off command */\r
-       uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
-\r
-       /* Write the Packet Header to the endpoint */\r
-       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r
-\r
-       /* Write the Note On/Off command with the specified channel, pitch and velocity */\r
-       Endpoint_Write_Byte(Command | Channel);\r
-       Endpoint_Write_Byte(Pitch);\r
-       Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
-       \r
-       /* Send the data in the endpoint to the host */\r
-       Endpoint_ClearIN();\r
-}\r