Modified received(). Running Status and divided SysEx are accepted
This commit is contained in:
Roberto
parent
5a0fd77bc6
commit
4e52f70062
|
|
@ -95,14 +95,19 @@ public:
|
|||
return mRxBuffer[--mRxIndex];
|
||||
}
|
||||
|
||||
bool end()
|
||||
{
|
||||
return mBleClass.end();
|
||||
}
|
||||
|
||||
unsigned available()
|
||||
{
|
||||
uint8_t byte;
|
||||
auto success = mBleClass.available(&byte);
|
||||
if (!success) return mRxIndex;
|
||||
if (!success)
|
||||
return mRxIndex;
|
||||
|
||||
mRxBuffer[mRxIndex++] = byte;
|
||||
|
||||
return mRxIndex;
|
||||
}
|
||||
|
||||
|
|
@ -170,11 +175,13 @@ public:
|
|||
void (*_disconnectedCallback)() = nullptr;
|
||||
|
||||
public:
|
||||
void setHandleConnected(void(*fptr)()) {
|
||||
void setHandleConnected(void (*fptr)())
|
||||
{
|
||||
_connectedCallback = fptr;
|
||||
}
|
||||
|
||||
void setHandleDisconnected(void(*fptr)()) {
|
||||
void setHandleDisconnected(void (*fptr)())
|
||||
{
|
||||
_disconnectedCallback = fptr;
|
||||
}
|
||||
|
||||
|
|
@ -211,42 +218,85 @@ public:
|
|||
void receive(byte *buffer, size_t length)
|
||||
{
|
||||
// Pointers used to search through payload.
|
||||
byte lPtr = 0;
|
||||
byte rPtr = 0;
|
||||
int lPtr = 0;
|
||||
int rPtr = 0;
|
||||
|
||||
// lastStatus used to capture runningStatus
|
||||
byte lastStatus;
|
||||
// Decode first packet -- SHALL be "Full MIDI message"
|
||||
lPtr = 2; //Start at first MIDI status -- SHALL be "MIDI status"
|
||||
// previousStatus used to continue a runningStatus interrupted by a timeStamp or a System Message.
|
||||
byte previousStatus = 0x00;
|
||||
|
||||
byte headerByte = buffer[lPtr++];
|
||||
|
||||
auto timestampHigh = 0x3f & headerByte;
|
||||
|
||||
byte timestampByte = buffer[lPtr++];
|
||||
uint16_t timestamp = 0;
|
||||
|
||||
bool sysExContinuation = false;
|
||||
bool runningStatusContinuation = false;
|
||||
|
||||
if (timestampByte >= 80)
|
||||
{
|
||||
auto timestampLow = 0x7f & timestampByte;
|
||||
timestamp = timestampLow + (timestampHigh << 7);
|
||||
}
|
||||
else
|
||||
{
|
||||
sysExContinuation = true;
|
||||
lPtr--; // the second byte is part of the SysEx
|
||||
}
|
||||
|
||||
//While statement contains incrementing pointers and breaks when buffer size exceeded.
|
||||
while (true)
|
||||
{
|
||||
lastStatus = buffer[lPtr];
|
||||
|
||||
if( (buffer[lPtr] < 0x80))
|
||||
return; // Status message not present, bail
|
||||
if (previousStatus == 0x00)
|
||||
{
|
||||
if ((lastStatus < 0x80) && !sysExContinuation)
|
||||
return; // Status message not present and it is not a runningStatus continuation, bail
|
||||
}
|
||||
else if (lastStatus < 0x80)
|
||||
{
|
||||
lastStatus = previousStatus;
|
||||
runningStatusContinuation = true;
|
||||
}
|
||||
|
||||
// Point to next non-data byte
|
||||
rPtr = lPtr;
|
||||
while ((buffer[rPtr + 1] < 0x80) && (rPtr < (length - 1)))
|
||||
rPtr++;
|
||||
if (buffer[rPtr + 1] == 0xF7) rPtr++;
|
||||
|
||||
if (!runningStatusContinuation)
|
||||
{
|
||||
// look at l and r pointers and decode by size.
|
||||
if( rPtr - lPtr < 1 ) {
|
||||
if (rPtr - lPtr < 1)
|
||||
{
|
||||
// Time code or system
|
||||
mBleClass.add(lastStatus);
|
||||
} else if( rPtr - lPtr < 2 ) {
|
||||
mBleClass.add(lastStatus);
|
||||
mBleClass.add(buffer[lPtr]);
|
||||
}
|
||||
else if (rPtr - lPtr < 2)
|
||||
{
|
||||
mBleClass.add(buffer[lPtr]);
|
||||
mBleClass.add(buffer[lPtr + 1]);
|
||||
} else if( rPtr - lPtr < 3 ) {
|
||||
mBleClass.add(lastStatus);
|
||||
}
|
||||
else if (rPtr - lPtr < 3)
|
||||
{
|
||||
mBleClass.add(buffer[lPtr]);
|
||||
mBleClass.add(buffer[lPtr + 1]);
|
||||
mBleClass.add(buffer[lPtr + 2]);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
// Too much data
|
||||
// If not System Common or System Real-Time, send it as running status
|
||||
switch(buffer[lPtr] & 0xF0)
|
||||
|
||||
auto midiType = lastStatus & 0xF0;
|
||||
if (sysExContinuation)
|
||||
midiType = 0xF0;
|
||||
|
||||
switch (midiType)
|
||||
{
|
||||
case 0x80:
|
||||
case 0x90:
|
||||
|
|
@ -269,22 +319,75 @@ public:
|
|||
}
|
||||
break;
|
||||
case 0xF0:
|
||||
mBleClass.add(buffer[lPtr]);
|
||||
mBleClass.add(lastStatus);
|
||||
for (auto i = lPtr; i < rPtr; i++)
|
||||
mBleClass.add(buffer[i + 1]);
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
auto midiType = lastStatus & 0xF0;
|
||||
if (sysExContinuation)
|
||||
midiType = 0xF0;
|
||||
|
||||
switch (midiType)
|
||||
{
|
||||
case 0x80:
|
||||
case 0x90:
|
||||
case 0xA0:
|
||||
case 0xB0:
|
||||
case 0xE0:
|
||||
//3 bytes full Midi -> 2 bytes runningStatus
|
||||
for (auto i = lPtr; i <= rPtr; i = i + 2)
|
||||
{
|
||||
mBleClass.add(lastStatus);
|
||||
mBleClass.add(buffer[i]);
|
||||
mBleClass.add(buffer[i + 1]);
|
||||
}
|
||||
break;
|
||||
case 0xC0:
|
||||
case 0xD0:
|
||||
//2 bytes full Midi -> 1 byte runningStatus
|
||||
for (auto i = lPtr; i <= rPtr; i = i + 1)
|
||||
{
|
||||
mBleClass.add(lastStatus);
|
||||
mBleClass.add(buffer[i]);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
runningStatusContinuation = false;
|
||||
}
|
||||
|
||||
if (++rPtr >= length)
|
||||
return; // end of packet
|
||||
|
||||
if (lastStatus < 0xf0) //exclude System Message. They must not be RunningStatus
|
||||
{
|
||||
previousStatus = lastStatus;
|
||||
}
|
||||
|
||||
timestampByte = buffer[rPtr++];
|
||||
if (timestampByte >= 80) // is bit 7 set?
|
||||
{
|
||||
auto timestampLow = 0x7f & timestampByte;
|
||||
timestamp = timestampLow + (timestampHigh << 7);
|
||||
}
|
||||
|
||||
// Point to next status
|
||||
lPtr = rPtr + 2;
|
||||
lPtr = rPtr;
|
||||
if (lPtr >= length)
|
||||
return; //end of packet
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
struct MySettings : public MIDI_NAMESPACE::DefaultSettings
|
||||
|
|
@ -293,4 +396,3 @@ struct MySettings : public MIDI_NAMESPACE::DefaultSettings
|
|||
};
|
||||
|
||||
END_BLEMIDI_NAMESPACE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue