USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response...

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

diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h
index 733a7ba..635036a 100644 (file)
--- a/Demos/Device/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
@@ -45,11 +45,10 @@
                #include "Descriptors.h"\r
                                \r
                #include <LUFA/Version.h>                            // Library Version Information\r
                #include "Descriptors.h"\r
                                \r
                #include <LUFA/Version.h>                            // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                 // PROGMEM tags readable by the ButtLoad project\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/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/HWB.h>                  // Hardware Button driver\r
+               #include <LUFA/Drivers/Board/Buttons.h>              // Board Buttons driver\r

                #include <LUFA/Scheduler/Scheduler.h>                // Simple scheduler for task management\r
 \r
    /* Macros: */\r
                #include <LUFA/Scheduler/Scheduler.h>                // Simple scheduler for task management\r
 \r
    /* Macros: */\r


@@ -81,17 +80,11 @@
        /* Task Definitions: */\r
                TASK(USB_MIDI_Task);\r
 \r
        /* Task Definitions: */\r
                TASK(USB_MIDI_Task);\r
 \r

-       /* Event Handlers: */\r
-               /** Indicates that this module will catch the USB_Connect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Connect);\r
-\r
-               /** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Disconnect);\r
-\r
-               /** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */\r
-               HANDLES_EVENT(USB_ConfigurationChanged);\r
-\r

    /* Function Prototypes: */\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 SendMIDINoteChange(const uint8_t Pitch, const bool OnOff,\r
                                        const uint8_t CableID, const uint8_t Channel);          \r
                void UpdateStatus(uint8_t CurrentStatus);\r