Seich
/
arduino_midi_library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added SendCommon, consistent with SendRealTime 

including:

sendClock, sendStart, sendStop, sendContinue, sendActiveSensing, sendSystemReset
This commit is contained in:
lathoub 2020-03-22 15:39:21 +01:00
parent 0ab711a067
commit 8730ae0bde
2 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/MIDI.h
View File

@ -103,6 +103,15 @@ public:
inline void sendSongSelect(DataByte inSongNumber);
inline void sendTuneRequest();
inline void sendCommon(MidiType inType, DataByte = 0);
inline void sendClock() { sendRealTime(Clock); };
inline void sendStart() { sendRealTime(Start); };
inline void sendStop() { sendRealTime(Stop); };
inline void sendContinue() { sendRealTime(Continue); };
inline void sendActiveSensing() { sendRealTime(ActiveSensing); };
inline void sendSystemReset() { sendRealTime(SystemReset); };
inline void sendRealTime(MidiType inType);
inline void beginRpn(unsigned inNumber,

76
src/MIDI.hpp
View File

@ -387,14 +387,7 @@ void MidiInterface<Transport, Settings, Platform>::sendSysEx(unsigned inLength,
template<class Transport, class Settings, class Platform>
void MidiInterface<Transport, Settings, Platform>::sendTuneRequest()
{
if (mTransport.beginTransmission(MidiType::TuneRequest))
{
mTransport.write(TuneRequest);
mTransport.endTransmission();
}
if (Settings::UseRunningStatus)
mRunningStatus_TX = InvalidType;
sendCommon(TuneRequest);
}
/*! \brief Send a MIDI Time Code Quarter Frame.
@ -420,15 +413,7 @@ void MidiInterface<Transport, Settings, Platform>::sendTimeCodeQuarterFrame(Data
template<class Transport, class Settings, class Platform>
void MidiInterface<Transport, Settings, Platform>::sendTimeCodeQuarterFrame(DataByte inData)
{
if (mTransport.beginTransmission(MidiType::TimeCodeQuarterFrame))
{
mTransport.write((byte)TimeCodeQuarterFrame);
mTransport.write(inData);
mTransport.endTransmission();
}
if (Settings::UseRunningStatus)
mRunningStatus_TX = InvalidType;
sendCommon(TimeCodeQuarterFrame, inData);
}
/*! \brief Send a Song Position Pointer message.
@ -437,27 +422,58 @@ void MidiInterface<Transport, Settings, Platform>::sendTimeCodeQuarterFrame(Data
template<class Transport, class Settings, class Platform>
void MidiInterface<Transport, Settings, Platform>::sendSongPosition(unsigned inBeats)
{
if (mTransport.beginTransmission(MidiType::SongPosition))
{
mTransport.write((byte)SongPosition);
mTransport.write(inBeats & 0x7f);
mTransport.write((inBeats >> 7) & 0x7f);
mTransport.endTransmission();
}
if (Settings::UseRunningStatus)
mRunningStatus_TX = InvalidType;
sendCommon(SongPosition, inBeats);
}
/*! \brief Send a Song Select message */
template<class Transport, class Settings, class Platform>
void MidiInterface<Transport, Settings, Platform>::sendSongSelect(DataByte inSongNumber)
{
if (mTransport.beginTransmission(MidiType::SongSelect))
sendCommon(SongSelect, inSongNumber);
}
/*! \brief Send a Common message. Common messages reset the running status.
\param inType The available Common types are:
TimeCodeQuarterFrame, SongPosition, SongSelect and TuneRequest.
@see MidiType
\param inData1 The byte that goes with the common message.
*/
template<class Transport, class Settings, class Platform>
void MidiInterface<Transport, Settings, Platform>::sendCommon(MidiType inType, DataByte inData1)
{
mTransport.write((byte)MidiType::SongSelect);
mTransport.write(inSongNumber & 0x7f);
switch (inType)
{
case TimeCodeQuarterFrame:
case SongPosition:
case SongSelect:
case TuneRequest:
break;
default:
// Invalid Common marker
return;
}
if (mTransport.beginTransmission(inType))
{
mTransport.write((byte)inType);
switch (inType)
{
case TimeCodeQuarterFrame:
mTransport.write(inData1);
break;
case SongPosition:
mTransport.write(inData1 & 0x7f);
mTransport.write((inData1 >> 7) & 0x7f);
break;
case SongSelect:
mTransport.write(inData1 & 0x7f);
break;
case TuneRequest:
break;
}
mTransport.endTransmission();
UpdateLastSentTime();
}
if (Settings::UseRunningStatus)