Add MIDI class driver, update MIDI device demo to use the new USB class driver. All...

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

diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index b6b43df..1fee347 100644 (file)
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -28,26 +28,35 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-/** \file\r
- *\r
- *  Main source file for the MIDI input demo. This file contains the main tasks of the demo and\r
- *  is responsible for the initial application hardware configuration.\r
- */\r
-\r

 #include "MIDI.h"\r
 \r
 #include "MIDI.h"\r
 \r

-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       { .Task = USB_MIDI_Task        , .TaskStatus = TASK_STOP },\r
-};\r
+USB_ClassInfo_MIDI_t Keyboard_MIDI_Interface =\r
+       {\r
+               .InterfaceNumber       = 0,\r
+\r
+               .DataINEndpointNumber  = MIDI_STREAM_IN_EPNUM,\r
+               .DataINEndpointSize    = MIDI_STREAM_EPSIZE,\r

 \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
- */\r
+               .DataOUTEndpointNumber = MIDI_STREAM_OUT_EPNUM,\r
+               .DataOUTEndpointSize   = MIDI_STREAM_EPSIZE,\r
+       };\r
+       \r

 int main(void)\r
 {\r
 int main(void)\r
 {\r

+       SetupHardware();\r
+\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       \r
+       for (;;)\r
+       {\r
+               CheckJoystickMovement();\r
+       \r
+               USB_USBTask();\r
+       }\r
+}\r
+\r
+void SetupHardware(void)\r
+{\r

        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r


@@ -59,161 +68,85 @@ int main(void)
        Joystick_Init();\r
        LEDs_Init();\r
        Buttons_Init();\r
        Joystick_Init();\r
        LEDs_Init();\r
        Buttons_Init();\r

-\r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-       \r
-       /* Initialize Scheduler so that it can be used */\r
-       Scheduler_Init();\r
-\r
-       /* Initialize USB Subsystem */\r

        USB_Init();\r
        USB_Init();\r

-\r
-       /* Scheduling - routine never returns, so put this last in the main function */\r
-       Scheduler_Start();\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
-{\r
-       /* Start USB management task */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
-\r
-       /* Indicate USB enumerating */\r
-       UpdateStatus(Status_USBEnumerating);\r
-}\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
-{\r
-       /* Stop running audio and USB management tasks */\r
-       Scheduler_SetTaskMode(USB_MIDI_Task, TASK_STOP);\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-\r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-}\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
-{\r
-       /* Setup MIDI stream endpoints */\r
-       Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       /* Indicate USB connected and ready */\r
-       UpdateStatus(Status_USBReady);\r
-\r
-       /* Start MIDI task */\r
-       Scheduler_SetTaskMode(USB_MIDI_Task, TASK_RUN);\r

 }\r
 \r
 }\r
 \r

-/** Task to handle the generation of MIDI note change events in response to presses of the board joystick, and send them\r
- *  to the host.\r
- */\r
-TASK(USB_MIDI_Task)\r
+void CheckJoystickMovement(void)\r

 {\r
        static uint8_t PrevJoystickStatus;\r
 \r
 {\r
        static uint8_t PrevJoystickStatus;\r
 \r

-       /* Select the MIDI IN stream */\r
-       Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
-\r
-       /* Check if endpoint is ready to be written to */\r
-       if (Endpoint_IsINReady())\r
-       {\r
-               /* Get current joystick mask, XOR with previous to detect joystick changes */\r
-               uint8_t JoystickStatus  = Joystick_GetStatus();\r
-               uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r
+       uint8_t MIDICommand = 0;\r
+       uint8_t MIDIPitch;\r
+       \r
+       /* Get current joystick mask, XOR with previous to detect joystick changes */\r
+       uint8_t JoystickStatus  = Joystick_GetStatus();\r
+       uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r

                \r
                \r

-               /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */\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
-               if (JoystickChanges & JOY_UP)\r
-                 SendMIDINoteChange(0x3D, (JoystickStatus & JOY_UP), 0, Channel);\r
-\r
-               if (JoystickChanges & JOY_RIGHT)\r
-                 SendMIDINoteChange(0x3E, (JoystickStatus & JOY_RIGHT), 0, Channel);\r
+       /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */\r
+       uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r

 \r
 \r

-               if (JoystickChanges & JOY_DOWN)\r
-                 SendMIDINoteChange(0x3F, (JoystickStatus & JOY_DOWN), 0, Channel);\r
-\r
-               if (JoystickChanges & JOY_PRESS)\r
-                 SendMIDINoteChange(0x3B, (JoystickStatus & JOY_PRESS), 0, Channel);\r
-\r
-               /* Save previous joystick value for next joystick change detection */\r
-               PrevJoystickStatus = JoystickStatus;\r
+       if (JoystickChanges & JOY_LEFT)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3C;\r

        }\r
 \r
        }\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
-       if (Endpoint_IsOUTReceived())\r
-         Endpoint_ClearOUT();\r
-}\r
+       if (JoystickChanges & JOY_UP)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3D;\r
+       }\r

 \r
 \r

-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
- *  log to a serial port, or anything else that is suitable for status updates.\r
- *\r
- *  \param CurrentStatus  Current status of the system, from the MIDI_StatusCodes_t enum\r
- */\r
-void UpdateStatus(uint8_t CurrentStatus)\r
-{\r
-       uint8_t LEDMask = LEDS_NO_LEDS;\r
+       if (JoystickChanges & JOY_RIGHT)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3E;\r
+       }\r

        \r
        \r

-       /* Set the LED mask to the appropriate LED mask based on the given status code */\r
-       switch (CurrentStatus)\r
+       if (JoystickChanges & JOY_DOWN)\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
        {\r

-               case Status_USBNotReady:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_USBEnumerating:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-               case Status_USBReady:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED4);\r
-                       break;\r
+               MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3B;\r

        }\r
        \r
        }\r
        \r

-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
+       if (MIDICommand)\r
+       {\r
+               USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)\r
+                       {\r
+                               .CableNumber = 0,\r
+                               .Command     = MIDICommand,\r
+                               \r
+                               .Data1       = (MIDICommand << 4) | Channel,\r
+                               .Data2       = MIDIPitch,\r
+                               .Data3       = MIDI_STANDARD_VELOCITY,                  \r
+                       };\r
+                       \r
+               USB_MIDI_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r
+       }\r
+\r
+       PrevJoystickStatus = JoystickStatus;\r

 }\r
 \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
+void EVENT_USB_Connect(void)\r

 {\r
 {\r

-       /* Wait until endpoint ready for more data */\r
-       while (!(Endpoint_IsReadWriteAllowed()));\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
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
+}\r

 \r
 \r

-       /* Write the Packet Header to the endpoint */\r
-       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r
+void EVENT_USB_Disconnect(void)\r
+{\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+}\r

 \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
+void EVENT_USB_ConfigurationChanged(void)\r
+{\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

        \r
        \r

-       /* Send the data in the endpoint to the host */\r
-       Endpoint_ClearIN();\r
+       if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))\r
+         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

 }\r
 }\r