More improvements to the incomplete BluetoothHost demo - add Disconnection Event...

[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 fcb86d6..5c0f25e 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -46,11 +46,13 @@ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
                        {\r
                                .StreamingInterfaceNumber = 1,\r
 \r
                        {\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
 \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
 \r
                        },\r
        };\r
 \r


@@ -67,9 +69,14 @@ int main(void)
        {\r
                CheckJoystickMovement();\r
                \r
        {\r
                CheckJoystickMovement();\r
                \r

-               /* Must acknowedge MIDI packets from the host even though they aren't used, or the host locks up */\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
        \r
                MIDI_Device_USBTask(&Keyboard_MIDI_Interface);\r
                USB_USBTask();\r


@@ -151,25 +158,26 @@ void CheckJoystickMovement(void)
                        };\r
                        \r
                MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r
                        };\r
                        \r
                MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r

+               MIDI_Device_Flush(&Keyboard_MIDI_Interface);\r

        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r
 }\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
 {\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
 {\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
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r


@@ -177,8 +185,8 @@ void EVENT_USB_ConfigurationChanged(void)
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
          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
 {\r

-       MIDI_Device_ProcessControlPacket(&Keyboard_MIDI_Interface);\r
+       MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);\r

 }\r
 }\r