Fixes to the MIDI device demos (ClassDriver, LowLevel); discard unused read-in events...

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index 8881d1d..bb4eaf2 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -63,6 +63,9 @@ int main(void)
        for (;;)\r
        {\r
                CheckJoystickMovement();\r
        for (;;)\r
        {\r
                CheckJoystickMovement();\r

+               \r
+               USB_MIDI_EventPacket_t DummyMIDIEvent;\r
+               USB_MIDI_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);\r

        \r
                USB_MIDI_USBTask(&Keyboard_MIDI_Interface);\r
                USB_USBTask();\r
        \r
                USB_MIDI_USBTask(&Keyboard_MIDI_Interface);\r
                USB_USBTask();\r

diff --git a/Demos/Device/LowLevel/CDC/CDC.h b/Demos/Device/LowLevel/CDC/CDC.h
index 821ba8f..a8f7199 100644 (file)
--- a/Demos/Device/LowLevel/CDC/CDC.h
+++ b/Demos/Device/LowLevel/CDC/CDC.h
@@ -180,6 +180,4 @@
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_UnhandledControlPacket(void);\r
 \r
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_UnhandledControlPacket(void);\r
 \r

-               void UpdateStatus(uint8_t CurrentStatus);\r
-\r

 #endif\r
 #endif\r

diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.h b/Demos/Device/LowLevel/GenericHID/GenericHID.h
index e48bf1d..fbd0a7f 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.h
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.h
@@ -68,15 +68,6 @@
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

-               \r
-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum GenericHID_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
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
 \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c
index 856f7db..c74d8d5 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/MIDI.c
+++ b/Demos/Device/LowLevel/MIDI/MIDI.c
@@ -122,6 +122,9 @@ void MIDI_Task(void)
        /* Check if endpoint is ready to be written to */\r
        if (Endpoint_IsINReady())\r
        {\r
        /* Check if endpoint is ready to be written to */\r
        if (Endpoint_IsINReady())\r
        {\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
                /* Get current joystick mask, XOR with previous to detect joystick changes */\r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r
                uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r


@@ -130,20 +133,55 @@ void MIDI_Task(void)
                uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r
 \r
                if (JoystickChanges & JOY_LEFT)\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
+                       MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3C;\r
+               }\r

 \r
                if (JoystickChanges & JOY_UP)\r
 \r
                if (JoystickChanges & JOY_UP)\r

-                 SendMIDINoteChange(0x3D, (JoystickStatus & JOY_UP), 0, Channel);\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3D;\r
+               }\r

 \r
                if (JoystickChanges & JOY_RIGHT)\r
 \r
                if (JoystickChanges & JOY_RIGHT)\r

-                 SendMIDINoteChange(0x3E, (JoystickStatus & JOY_RIGHT), 0, Channel);\r
-\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3E;\r
+               }\r
+               \r

                if (JoystickChanges & JOY_DOWN)\r
                if (JoystickChanges & JOY_DOWN)\r

-                 SendMIDINoteChange(0x3F, (JoystickStatus & JOY_DOWN), 0, Channel);\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
                if (JoystickChanges & JOY_PRESS)\r

-                 SendMIDINoteChange(0x3B, (JoystickStatus & JOY_PRESS), 0, Channel);\r
-\r
+               {\r
+                       MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+                       MIDIPitch   = 0x3B;\r
+               }\r
+\r
+               /* Check if a MIDI command is to be sent */\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
+                       /* Write the MIDI event packet to the endpoint */\r
+                       Endpoint_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));\r
+               \r
+                       /* Send the data in the endpoint to the host */\r
+                       Endpoint_ClearIN();\r
+               }\r
+               \r

                /* Save previous joystick value for next joystick change detection */\r
                PrevJoystickStatus = JoystickStatus;\r
        }\r
                /* Save previous joystick value for next joystick change detection */\r
                PrevJoystickStatus = JoystickStatus;\r
        }\r


@@ -155,31 +193,3 @@ void MIDI_Task(void)
        if (Endpoint_IsOUTReceived())\r
          Endpoint_ClearOUT();\r
 }\r
        if (Endpoint_IsOUTReceived())\r
          Endpoint_ClearOUT();\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
-{\r
-       /* If endpoint ready for more data, abort */\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         return;\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
-       /* Write the Packet Header to the endpoint */\r
-       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\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
-       \r
-       /* Send the data in the endpoint to the host */\r
-       Endpoint_ClearIN();\r
-}\r

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.h b/Demos/Device/LowLevel/MIDI/MIDI.h
index 0e8dde8..1558501 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/MIDI.h
+++ b/Demos/Device/LowLevel/MIDI/MIDI.h
@@ -52,10 +52,10 @@
 \r
    /* Macros: */\r
                /** MIDI command for a note on (activation) event */\r
 \r
    /* Macros: */\r
                /** MIDI command for a note on (activation) event */\r

-               #define MIDI_COMMAND_NOTE_ON         0x90\r
+               #define MIDI_COMMAND_NOTE_ON         0x09\r

 \r
                /** MIDI command for a note off (deactivation) event */\r
 \r
                /** MIDI command for a note off (deactivation) event */\r

-               #define MIDI_COMMAND_NOTE_OFF        0x80\r
+               #define MIDI_COMMAND_NOTE_OFF        0x08\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
 \r
                /** Standard key press velocity value used for all note events, as no pressure sensor is mounted */\r
                #define MIDI_STANDARD_VELOCITY       64\r


@@ -78,6 +78,18 @@
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

+\r
+       /* Type Defines: */\r
+               /** Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface. */\r
+               typedef struct\r
+               {\r
+                       unsigned char Command     : 4; /**< MIDI command being sent or received in the event packet */\r
+                       unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface */\r
+                       \r
+                       uint8_t Data1; /**< First byte of data in the MIDI event */\r
+                       uint8_t Data2; /**< Second byte of data in the MIDI event */\r
+                       uint8_t Data3; /**< Third byte of data in the MIDI event */             \r
+               } USB_MIDI_EventPacket_t;\r

                \r
    /* Function Prototypes: */\r
                void SetupHardware(void);\r
                \r
    /* Function Prototypes: */\r
                void SetupHardware(void);\r


@@ -86,9 +98,5 @@
                void EVENT_USB_Connect(void);\r
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\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

                \r
 #endif\r
                \r
 #endif\r

diff --git a/Demos/Device/LowLevel/Mouse/Mouse.h b/Demos/Device/LowLevel/Mouse/Mouse.h
index b9460b3..8ff8b8f 100644 (file)
--- a/Demos/Device/LowLevel/Mouse/Mouse.h
+++ b/Demos/Device/LowLevel/Mouse/Mouse.h
@@ -107,6 +107,5 @@
                void EVENT_USB_UnhandledControlPacket(void);\r
 \r
                void CreateMouseReport(USB_MouseReport_Data_t* ReportData);\r
                void EVENT_USB_UnhandledControlPacket(void);\r
 \r
                void CreateMouseReport(USB_MouseReport_Data_t* ReportData);\r

-               void UpdateStatus(uint8_t CurrentStatus);\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h
index 1a4a1cb..51c47c9 100644 (file)
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h
@@ -172,14 +172,6 @@
                        Parity_Mark         = 3, /**< Mark parity bit mode on each frame */\r
                        Parity_Space        = 4, /**< Space parity bit mode on each frame */\r
                };\r
                        Parity_Mark         = 3, /**< Mark parity bit mode on each frame */\r
                        Parity_Space        = 4, /**< Space parity bit mode on each frame */\r
                };\r

-\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum USBtoSerial_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
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h
index e78e392..890b3f1 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h
@@ -68,19 +68,6 @@
 \r
        /* Task Definitions: */\r
                void Bluetooth_Management_Task(void);\r
 \r
        /* Task Definitions: */\r
                void Bluetooth_Management_Task(void);\r

-\r
-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum MouseHostViaInt_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady        = 0, /**< USB is not ready (disconnected from a USB device) */\r
-                       Status_USBEnumerating     = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady           = 2, /**< USB interface is connected and ready */\r
-                       Status_EnumerationError   = 3, /**< Software error while enumerating the attached USB device */\r
-                       Status_HardwareError      = 4, /**< Hardware error while enumerating the attached USB device */\r
-                       Status_BluetoothConnected = 5, /**< Bluetooth stack connected to device and idle */\r
-                       Status_BluetoothBusy      = 6, /**< Bluetooth stack busy */ \r
-               };\r

                \r
        /* Event Handlers: */\r
                void EVENT_USB_DeviceAttached(void);\r
                \r
        /* Event Handlers: */\r
                void EVENT_USB_DeviceAttached(void);\r