Fixed CDCHost not clearing configured endpoints and resetting configured endpoints...

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

diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index e286dcb..1323e11 100644 (file)
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -39,8 +39,8 @@
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
-       { Task: USB_USBTask          , TaskStatus: TASK_STOP },\r
-       { Task: USB_MIDI_Task        , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
+       { .Task = USB_MIDI_Task        , .TaskStatus = TASK_STOP },\r
 };\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
@@ -58,7 +58,7 @@ int main(void)
        /* Hardware Initialization */\r
        Joystick_Init();\r
        LEDs_Init();\r
-       HWB_Init();\r
+       Buttons_Init();\r
 \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
@@ -134,8 +134,8 @@ TASK(USB_MIDI_Task)
                uint8_t JoystickStatus  = Joystick_GetStatus();\r
                uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r
                \r
-               /* Get HWB status - if set use channel 10 (percussion), otherwise use channel 1 */\r
-               uint8_t Channel = ((HWB_GetStatus()) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\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