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

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

diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h
index 635036a..10d8d33 100644 (file)
--- a/Demos/Device/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
@@ -44,49 +44,27 @@
 \r
                #include "Descriptors.h"\r
                                \r
-               #include <LUFA/Version.h>                            // Library Version Information\r
-               #include <LUFA/Drivers/USB/USB.h>                    // USB Functionality\r
-               #include <LUFA/Drivers/Board/Joystick.h>             // Joystick driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>                 // LEDs driver\r
-               #include <LUFA/Drivers/Board/Buttons.h>              // Board Buttons driver\r
-               #include <LUFA/Scheduler/Scheduler.h>                // Simple scheduler for task management\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Board/Joystick.h>\r
+               #include <LUFA/Drivers/Board/Buttons.h>\r
+               #include <LUFA/Drivers/Peripheral/ADC.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/USB/Class/Device/MIDI.h>\r
 \r
-   /* Macros: */\r
-               /** MIDI command for a note on (activation) event */\r
-               #define MIDI_COMMAND_NOTE_ON         0x90\r
-\r
-               /** MIDI command for a note off (deactivation) event */\r
-               #define MIDI_COMMAND_NOTE_OFF        0x80\r
-\r
-               /** Standard key press velocity value used for all note events, as no pressure sensor is mounted */\r
-               #define MIDI_STANDARD_VELOCITY       64\r
+       /* Macros: */\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+               \r
+       /* Function Prototypes: */\r
+               void SetupHardware(void);\r
+               void CheckJoystickMovement(void);\r
                \r
-               /** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel\r
-                *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.\r
-                *\r
-                *  \param channel  MIDI channel number to address\r
-                */\r
-               #define MIDI_CHANNEL(channel)        (channel - 1)\r
-\r
-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum MIDI_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */\r
-                       Status_USBEnumerating = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady       = 2, /**< USB interface is connected and ready */\r
-               };\r
-\r
-       /* Task Definitions: */\r
-               TASK(USB_MIDI_Task);\r
-\r
-   /* Function Prototypes: */\r
                void EVENT_USB_Connect(void);\r
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\r
-\r
-               void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff,\r
-                                       const uint8_t CableID, const uint8_t Channel);          \r
-               void UpdateStatus(uint8_t CurrentStatus);\r
+               void EVENT_USB_UnhandledControlPacket(void);\r
                \r
 #endif\r