moparisthebest/USBHost_t36
1
0
Fork 0
mirror of https://github.com/gdsports/USBHost_t36 synced 2024-11-21 08:35:03 -05:00
Code Issues Releases Wiki Activity

Attempt workaround for improper USB MIDI sysex message

Browse Source
This commit is contained in:
PaulStoffregen 2018-01-09 12:29:39 -08:00
parent d2f7e28378
commit 414d4ca39c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
midi.cpp
View File

@ -356,7 +356,7 @@ void MIDIDevice::send_sysex_add_term_bytes(const uint8_t *data, uint32_t length,
bool MIDIDevice::read(uint8_t channel) bool MIDIDevice::read(uint8_t channel)
{ {
uint32_t n, head, tail, avail, ch, type1, type2; uint32_t n, head, tail, avail, ch, type1, type2, b1;
head = rx_head; head = rx_head;
tail = rx_tail; tail = rx_tail;
@ -376,7 +376,8 @@ bool MIDIDevice::read(uint8_t channel)
type1 = n & 15; type1 = n & 15;
type2 = (n >> 12) & 15; type2 = (n >> 12) & 15;
ch = ((n >> 8) & 15) + 1; b1 = (n >> 8) & 0xFF;
ch = (b1 & 15) + 1;
msg_cable = (n >> 4) & 15; msg_cable = (n >> 4) & 15;
if (type1 >= 0x08 && type1 <= 0x0E) { if (type1 >= 0x08 && type1 <= 0x0E) {
if (channel && channel != ch) { if (channel && channel != ch) {
@ -440,12 +441,10 @@ bool MIDIDevice::read(uint8_t channel)
msg_data2 = (n >> 24); msg_data2 = (n >> 24);
return true; return true;
} }
if (type1 == 0x02 || type1 == 0x03 || (type1 == 0x05 && type2 == 0x0F)) { if (type1 == 0x02 || type1 == 0x03 || (type1 == 0x05 && b1 >= 0xF1 && b1 != 0xF7)) {
// system common or system realtime message // system common or system realtime message
uint8_t type;
system_common_or_realtime: system_common_or_realtime:
type = n >> 8; switch (b1) {
switch (type) {
case 0xF1: // usbMIDI.TimeCodeQuarterFrame case 0xF1: // usbMIDI.TimeCodeQuarterFrame
if (handleTimeCodeQuarterFrame) { if (handleTimeCodeQuarterFrame) {
(*handleTimeCodeQuarterFrame)(n >> 16); (*handleTimeCodeQuarterFrame)(n >> 16);
@ -511,7 +510,7 @@ bool MIDIDevice::read(uint8_t channel)
default: default:
return false; // unknown message, ignore it return false; // unknown message, ignore it
} }
msg_type = type; msg_type = b1;
goto return_message; goto return_message;
} }
if (type1 == 0x04) { if (type1 == 0x04) {
@ -521,7 +520,10 @@ bool MIDIDevice::read(uint8_t channel)
return false; return false;
} }
if (type1 >= 0x05 && type1 <= 0x07) { if (type1 >= 0x05 && type1 <= 0x07) {
sysex_byte(n >> 8); sysex_byte(b1);
// allow for buggy devices which use code 5 to transmit 1 byte at a time
// https://forum.pjrc.com/threads/43450?p=164596&viewfull=1#post164596
if (type1 == 0x05 && b1 != 0xF7) return false;
if (type1 >= 0x06) sysex_byte(n >> 16); if (type1 >= 0x06) sysex_byte(n >> 16);
if (type1 == 0x07) sysex_byte(n >> 24); if (type1 == 0x07) sysex_byte(n >> 24);
uint16_t len = msg_sysex_len; uint16_t len = msg_sysex_len;
@ -537,13 +539,12 @@ bool MIDIDevice::read(uint8_t channel)
return true; return true;
} }
if (type1 == 0x0F) { if (type1 == 0x0F) {
uint8_t b = n >> 8; if (b1 >= 0xF8) {
if (b >= 0xF8) {
goto system_common_or_realtime; goto system_common_or_realtime;
} }
if (msg_sysex_len > 0) { if (b1 == 0xF0 || msg_sysex_len > 0) {
// Is this really needed? Mac OS-X does this, but do any devices? // Is this really needed? Mac OS-X does this, but do any devices?
sysex_byte(n >> 8); sysex_byte(b1);
} }
} }
return false; return false;