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 856f7db..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
 #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
  */\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
 }\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
 {\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
 /** 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
 {\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
 /** 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
 {\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r


@@ -116,13 +116,17 @@ void MIDI_Task(void)
 {\r
        static uint8_t PrevJoystickStatus;\r
 \r
 {\r
        static uint8_t PrevJoystickStatus;\r
 \r

-       /* Select the MIDI IN stream */\r
+       /* Device must be connected and configured for the task to run */\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return;\r
+\r

        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
 \r
        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
 \r

-       /* Check if endpoint is ready to be written to */\r

        if (Endpoint_IsINReady())\r
        {\r
        if (Endpoint_IsINReady())\r
        {\r

-               /* Get current joystick mask, XOR with previous to detect joystick changes */\r
+               uint8_t MIDICommand = 0;\r
+               uint8_t MIDIPitch;\r
+       \r

                uint8_t JoystickStatus  = Joystick_GetStatus();\r
                uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r
                \r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r
                uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r
                \r


@@ -130,20 +134,55 @@ void MIDI_Task(void)
                uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r
 \r
                if (JoystickChanges & JOY_LEFT)\r
                uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r
 \r
                if (JoystickChanges & JOY_LEFT)\r

-                 SendMIDINoteChange(0x3C, (JoystickStatus & JOY_LEFT), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3C;\r
+               }\r

 \r
                if (JoystickChanges & JOY_UP)\r
 \r
                if (JoystickChanges & JOY_UP)\r

-                 SendMIDINoteChange(0x3D, (JoystickStatus & JOY_UP), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3D;\r
+               }\r

 \r
                if (JoystickChanges & JOY_RIGHT)\r
 \r
                if (JoystickChanges & JOY_RIGHT)\r

-                 SendMIDINoteChange(0x3E, (JoystickStatus & JOY_RIGHT), 0, Channel);\r
-\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3E;\r
+               }\r
+               \r

                if (JoystickChanges & JOY_DOWN)\r
                if (JoystickChanges & JOY_DOWN)\r

-                 SendMIDINoteChange(0x3F, (JoystickStatus & JOY_DOWN), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3F;\r
+               }\r

 \r
                if (JoystickChanges & JOY_PRESS)\r
 \r
                if (JoystickChanges & JOY_PRESS)\r

-                 SendMIDINoteChange(0x3B, (JoystickStatus & JOY_PRESS), 0, Channel);\r
-\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3B;\r
+               }\r
+\r
+               /* Check if a MIDI command is to be sent */\r
+               if (MIDICommand)\r
+               {\r
+                       USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)\r
+                               {\r
+                                       .CableNumber = 0,\r
+                                       .Command     = (MIDICommand >> 4),\r
+                                       \r
+                                       .Data1       = MIDICommand | Channel,\r
+                                       .Data2       = MIDIPitch,\r
+                                       .Data3       = MIDI_STANDARD_VELOCITY,                  \r
+                               };\r
+                               \r
+                       /* Write the MIDI event packet to the endpoint */\r
+                       Endpoint_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));\r
+               \r
+                       /* Send the data in the endpoint to the host */\r
+                       Endpoint_ClearIN();\r
+               }\r
+               \r

                /* Save previous joystick value for next joystick change detection */\r
                PrevJoystickStatus = JoystickStatus;\r
        }\r
                /* Save previous joystick value for next joystick change detection */\r
                PrevJoystickStatus = JoystickStatus;\r
        }\r


@@ -151,35 +190,26 @@ void MIDI_Task(void)
        /* Select the MIDI OUT stream */\r
        Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);\r
 \r
        /* 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
        if (Endpoint_IsOUTReceived())\r

-         Endpoint_ClearOUT();\r
-}\r
-\r
-/** Sends a MIDI note change event (note on or off) to the MIDI output jack, on the given virtual cable ID and channel.\r
- *\r
- *  \param Pitch    Pitch of the note to turn on or off\r
- *  \param OnOff    Set to true if the note is on (being held down), or false otherwise\r
- *  \param CableID  ID of the virtual cable to send the note change to\r
- *  \param Channel  MIDI channel number to send the note change event to\r
- */\r
-void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
-{\r
-       /* If endpoint ready for more data, abort */\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         return;\r
-\r
-       /* Check if the message should be a Note On or Note Off command */\r
-       uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
-\r
-       /* Write the Packet Header to the endpoint */\r
-       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r
-\r
-       /* Write the Note On/Off command with the specified channel, pitch and velocity */\r
-       Endpoint_Write_Byte(Command | Channel);\r
-       Endpoint_Write_Byte(Pitch);\r
-       Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\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
        \r

-       /* Send the data in the endpoint to the host */\r
-       Endpoint_ClearIN();\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
 }\r