Combine PDIProtocol and TPIProtocol into a single XPROGProtocol set of files.

[pub/USBasp.git] / Demos / Device / ClassDriver / MIDI / MIDI.c

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index a6c31ee..765bec6 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -46,17 +46,14 @@ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
                        {\r
                                .StreamingInterfaceNumber = 1,\r
 \r
-                               .DataINEndpointNumber     = MIDI_STREAM_IN_EPNUM,\r
-                               .DataINEndpointSize       = MIDI_STREAM_EPSIZE,\r
+                               .DataINEndpointNumber      = MIDI_STREAM_IN_EPNUM,\r
+                               .DataINEndpointSize        = MIDI_STREAM_EPSIZE,\r
+                               .DataINEndpointDoubleBank  = false,\r
 \r
-                               .DataOUTEndpointNumber    = MIDI_STREAM_OUT_EPNUM,\r
-                               .DataOUTEndpointSize      = MIDI_STREAM_EPSIZE,\r
+                               .DataOUTEndpointNumber     = MIDI_STREAM_OUT_EPNUM,\r
+                               .DataOUTEndpointSize       = MIDI_STREAM_EPSIZE,\r
+                               .DataOUTEndpointDoubleBank = false,\r
                        },\r
-                       \r
-               .State =\r
-                       {\r
-                               // Leave all state values to their defaults                     \r
-                       }\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
@@ -72,8 +69,14 @@ int main(void)
        {\r
                CheckJoystickMovement();\r
                \r
-               MIDI_EventPacket_t DummyMIDIEvent;\r
-               MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);\r
+               MIDI_EventPacket_t ReceivedMIDIEvent;\r
+               if (MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &ReceivedMIDIEvent))\r
+               {\r
+                       if ((ReceivedMIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4)) && (ReceivedMIDIEvent.Data3 > 0))\r
+                         LEDs_SetAllLEDs(ReceivedMIDIEvent.Data2 > 64 ? LEDS_LED1 : LEDS_LED2);\r
+                       else\r
+                         LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
+               }\r
        \r
                MIDI_Device_USBTask(&Keyboard_MIDI_Interface);\r
                USB_USBTask();\r
@@ -161,19 +164,19 @@ void CheckJoystickMovement(void)
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r
@@ -181,8 +184,8 @@ void EVENT_USB_ConfigurationChanged(void)
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
-/** Event handler for the library USB Unhandled Control Packet event. */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r
 {\r
-       MIDI_Device_ProcessControlPacket(&Keyboard_MIDI_Interface);\r
+       MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);\r
 }\r