Fixed GenericHIDHost demo report write routine incorrect for control type requests...

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

diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index c0e4f9d..e286dcb 100644 (file)
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -36,12 +36,6 @@
 \r
 #include "MIDI.h"\r
 \r
 \r
 #include "MIDI.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA MIDI App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -134,7 +128,7 @@ TASK(USB_MIDI_Task)
        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
 \r
        /* Check if endpoint is ready to be written to */\r
        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
 \r
        /* Check if endpoint is ready to be written to */\r

-       if (Endpoint_ReadWriteAllowed())\r
+       if (Endpoint_IsINReady())\r

        {\r
                /* Get current joystick mask, XOR with previous to detect joystick changes */\r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r
        {\r
                /* Get current joystick mask, XOR with previous to detect joystick changes */\r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r


@@ -166,8 +160,8 @@ TASK(USB_MIDI_Task)
        Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);\r
 \r
        /* Check if endpoint is ready to be read from, if so discard its (unused) data */\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_ReadWriteAllowed())\r
-         Endpoint_ClearCurrentBank();\r
+       if (Endpoint_IsOUTReceived())\r
+         Endpoint_ClearOUT();\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
 }\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


@@ -207,7 +201,7 @@ void UpdateStatus(uint8_t CurrentStatus)
 void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
 {\r
        /* Wait until endpoint ready for more data */\r
 void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
 {\r
        /* Wait until endpoint ready for more data */\r

-       while (!(Endpoint_ReadWriteAllowed()));\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
 \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


@@ -221,5 +215,5 @@ void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t Cab
        Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
        \r
        /* Send the data in the endpoint to the host */\r
        Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
        \r
        /* Send the data in the endpoint to the host */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 }\r
 }\r