X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6be24e44046ffc386e2f4072aa5cccb1c462f47f..abc7dce10c03bcbc9659e1a9643cec30c465867d:/Demos/Device/LowLevel/MIDI/MIDI.c?ds=sidebyside

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c
index c74d8d534..4dfb9b7e6 100644
--- a/Demos/Device/LowLevel/MIDI/MIDI.c
+++ b/Demos/Device/LowLevel/MIDI/MIDI.c
@@ -70,7 +70,7 @@ void SetupHardware(void)
 }
 
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
 {
 	/* Indicate USB enumerating */
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
@@ -79,7 +79,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
  *  the status LEDs, disables the sample update and PWM output timers and stops the USB and MIDI management tasks.
  */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
 {
 	/* Indicate USB not ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
@@ -88,7 +88,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
  *  of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.
  */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	/* Indicate USB connected and ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
@@ -116,16 +116,17 @@ void MIDI_Task(void)
 {
 	static uint8_t PrevJoystickStatus;
 
-	/* Select the MIDI IN stream */
+	/* Device must be connected and configured for the task to run */
+	if (USB_DeviceState != DEVICE_STATE_Configured)
+	  return;
+
 	Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
 
-	/* Check if endpoint is ready to be written to */
 	if (Endpoint_IsINReady())
 	{
 		uint8_t MIDICommand = 0;
 		uint8_t MIDIPitch;
 	
-		/* Get current joystick mask, XOR with previous to detect joystick changes */
 		uint8_t JoystickStatus  = Joystick_GetStatus();
 		uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);
 		
@@ -168,9 +169,9 @@ void MIDI_Task(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,			
 				};