X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6be24e44046ffc386e2f4072aa5cccb1c462f47f..fd96b288824caaa3ee4e5e03887f016de9df80cf:/Demos/Device/ClassDriver/MIDI/MIDI.c?ds=inline

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index bb4eaf2df..5c0f25e64 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -40,15 +40,20 @@
  *  passed to all MIDI Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
  */
-USB_ClassInfo_MIDI_t Keyboard_MIDI_Interface =
+USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
 	{
-		.StreamingInterfaceNumber = 1,
+		.Config =
+			{
+				.StreamingInterfaceNumber = 1,
 
-		.DataINEndpointNumber     = MIDI_STREAM_IN_EPNUM,
-		.DataINEndpointSize       = MIDI_STREAM_EPSIZE,
+				.DataINEndpointNumber      = MIDI_STREAM_IN_EPNUM,
+				.DataINEndpointSize        = MIDI_STREAM_EPSIZE,
+				.DataINEndpointDoubleBank  = false,
 
-		.DataOUTEndpointNumber    = MIDI_STREAM_OUT_EPNUM,
-		.DataOUTEndpointSize      = MIDI_STREAM_EPSIZE,
+				.DataOUTEndpointNumber     = MIDI_STREAM_OUT_EPNUM,
+				.DataOUTEndpointSize       = MIDI_STREAM_EPSIZE,
+				.DataOUTEndpointDoubleBank = false,
+			},
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -64,10 +69,16 @@ int main(void)
 	{
 		CheckJoystickMovement();
 		
-		USB_MIDI_EventPacket_t DummyMIDIEvent;
-		USB_MIDI_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);
+		MIDI_EventPacket_t ReceivedMIDIEvent;
+		if (MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &ReceivedMIDIEvent))
+		{
+			if ((ReceivedMIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4)) && (ReceivedMIDIEvent.Data3 > 0))
+			  LEDs_SetAllLEDs(ReceivedMIDIEvent.Data2 > 64 ? LEDS_LED1 : LEDS_LED2);
+			else
+			  LEDs_SetAllLEDs(LEDS_NO_LEDS);
+		}
 	
-		USB_MIDI_USBTask(&Keyboard_MIDI_Interface);
+		MIDI_Device_USBTask(&Keyboard_MIDI_Interface);
 		USB_USBTask();
 	}
 }
@@ -136,45 +147,46 @@ void CheckJoystickMovement(void)
 	
 	if (MIDICommand)
 	{
-		USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
+		MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
 			{
 				.CableNumber = 0,
-				.Command     = MIDICommand,
+				.Command     = (MIDICommand >> 4),
 				
-				.Data1       = (MIDICommand << 4) | Channel,
+				.Data1       = MIDICommand | Channel,
 				.Data2       = MIDIPitch,
 				.Data3       = MIDI_STANDARD_VELOCITY,			
 			};
 			
-		USB_MIDI_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
+		MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
+		MIDI_Device_Flush(&Keyboard_MIDI_Interface);
 	}
 
 	PrevJoystickStatus = JoystickStatus;
 }
 
 /** Event handler for the library USB Connection event. */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
 }
 
 /** Event handler for the library USB Disconnection event. */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
 
 /** Event handler for the library USB Configuration Changed event. */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 	
-	if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))
+	if (!(MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
-/** Event handler for the library USB Unhandled Control Packet event. */
-void EVENT_USB_UnhandledControlPacket(void)
+/** Event handler for the library USB Unhandled Control Request event. */
+void EVENT_USB_Device_UnhandledControlRequest(void)
 {
-	USB_MIDI_ProcessControlPacket(&Keyboard_MIDI_Interface);
+	MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);
 }