diff options
Diffstat (limited to 'Demos')
| -rw-r--r-- | Demos/Device/ClassDriver/MIDI/MIDI.c | 4 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MIDI/MIDI.c | 4 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MIDI/MIDI.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c index 234adca25..511f280d6 100644 --- a/Demos/Device/ClassDriver/MIDI/MIDI.c +++ b/Demos/Device/ClassDriver/MIDI/MIDI.c @@ -139,9 +139,9 @@ void CheckJoystickMovement(void) USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
{
.CableNumber = 0,
- .Command = MIDICommand,
+ .Command = (MIDICommand >> 4),
- .Data1 = (MIDICommand << 4) | Channel,
+ .Data1 = MIDICommand | Channel,
.Data2 = MIDIPitch,
.Data3 = MIDI_STANDARD_VELOCITY,
};
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c index c74d8d534..84d377854 100644 --- a/Demos/Device/LowLevel/MIDI/MIDI.c +++ b/Demos/Device/LowLevel/MIDI/MIDI.c @@ -168,9 +168,9 @@ void MIDI_Task(void) USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
{
.CableNumber = 0,
- .Command = MIDICommand,
+ .Command = (MIDICommand >> 4),
- .Data1 = (MIDICommand << 4) | Channel,
+ .Data1 = MIDICommand | Channel,
.Data2 = MIDIPitch,
.Data3 = MIDI_STANDARD_VELOCITY,
};
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.h b/Demos/Device/LowLevel/MIDI/MIDI.h index 1558501a7..735ac8442 100644 --- a/Demos/Device/LowLevel/MIDI/MIDI.h +++ b/Demos/Device/LowLevel/MIDI/MIDI.h @@ -52,20 +52,20 @@ /* Macros: */
/** MIDI command for a note on (activation) event */
- #define MIDI_COMMAND_NOTE_ON 0x09
+ #define MIDI_COMMAND_NOTE_ON 0x90
/** MIDI command for a note off (deactivation) event */
- #define MIDI_COMMAND_NOTE_OFF 0x08
+ #define MIDI_COMMAND_NOTE_OFF 0x80
/** Standard key press velocity value used for all note events, as no pressure sensor is mounted */
- #define MIDI_STANDARD_VELOCITY 64
+ #define MIDI_STANDARD_VELOCITY 64
/** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
* addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
*
* \param channel MIDI channel number to address
*/
- #define MIDI_CHANNEL(channel) (channel - 1)
+ #define MIDI_CHANNEL(channel) (channel - 1)
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
|