Update CDC Class Driver character stream functions to use the correct avr-libc return...

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

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c
index 954cbcb..2cdf711 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/MIDI.c
+++ b/Demos/Device/LowLevel/MIDI/MIDI.c
@@ -37,7 +37,7 @@
 #include "MIDI.h"\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
- *  starts the scheduler to run the application tasks.\r
+ *  enters a loop to run the application tasks in sequence.\r
  */\r
 int main(void)\r
 {\r
@@ -70,7 +70,7 @@ void SetupHardware(void)
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */\r
-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r
 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
@@ -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\r
  *  the status LEDs, disables the sample update and PWM output timers and stops the USB and MIDI management tasks.\r
  */\r
-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r
 {\r
        /* Indicate USB not ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
@@ -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\r
  *  of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.\r
  */\r
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
@@ -117,7 +117,7 @@ void MIDI_Task(void)
        static uint8_t PrevJoystickStatus;\r
 \r
        /* Device must be connected and configured for the task to run */\r
-       if (!(USB_IsConnected) || !(USB_ConfigurationNumber))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
          return;\r
 \r
        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
@@ -190,7 +190,26 @@ void MIDI_Task(void)
        /* Select the MIDI OUT stream */\r
        Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);\r
 \r
-       /* Check if endpoint is ready to be read from, if so discard its (unused) data */\r
+       /* Check if a MIDI command has been received */\r
        if (Endpoint_IsOUTReceived())\r
-         Endpoint_ClearOUT();\r
+       {\r
+               USB_MIDI_EventPacket_t MIDIEvent;\r
+                       \r
+               /* Read the MIDI event packet from the endpoint */\r
+               Endpoint_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));\r
+       \r
+               if (MIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4))\r
+               {\r
+                       /* Change LEDs depending on the pitch of the sent note */\r
+                       LEDs_SetAllLEDs(MIDIEvent.Data2 > 64 ? LEDS_LED1 : LEDS_LED2);\r
+               }\r
+               else\r
+               {\r
+                       /* Turn off all LEDs in response to non-Note On messages */\r
+                       LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
+               }\r
+       \r
+               /* Clear the endpoint ready for new packet */\r
+               Endpoint_ClearOUT();\r
+       }\r
 }\r