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

chore: Fix build (things got lost in merge)

This commit is contained in:
Francois Best 2022-10-08 14:50:54 +02:00
parent 12f05866cf
commit 21a4ad23df
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/MIDI.h
View File

@ -294,6 +294,7 @@ private:
MidiMessage mMessage; MidiMessage mMessage;
unsigned long mLastMessageSentTime; unsigned long mLastMessageSentTime;
unsigned long mLastMessageReceivedTime; unsigned long mLastMessageReceivedTime;
unsigned long mSenderActiveSensingPeriodicity;
bool mReceiverActiveSensingActive; bool mReceiverActiveSensingActive;
int8_t mLastError; int8_t mLastError;

14
src/MIDI.hpp
View File

@ -42,9 +42,9 @@ inline MidiInterface<Transport, Settings, Platform>::MidiInterface(Transport& in
, mCurrentNrpnNumber(0xffff) , mCurrentNrpnNumber(0xffff)
, mLastMessageSentTime(0) , mLastMessageSentTime(0)
, mLastMessageReceivedTime(0) , mLastMessageReceivedTime(0)
, mSenderActiveSensingPeriodicity(Settings::SenderActiveSensingPeriodicity)
, mReceiverActiveSensingActive(false) , mReceiverActiveSensingActive(false)
, mLastError(0) , mLastError(0)
, mSenderActiveSensingPeriodicity(Settings::SenderActiveSensingPeriodicity)
{ {
static_assert(!(Settings::UseSenderActiveSensing && Settings::UseReceiverActiveSensing), "UseSenderActiveSensing and UseReceiverActiveSensing can't be both set to true."); static_assert(!(Settings::UseSenderActiveSensing && Settings::UseReceiverActiveSensing), "UseSenderActiveSensing and UseReceiverActiveSensing can't be both set to true.");
} }
@ -82,7 +82,7 @@ MidiInterface<Transport, Settings, Platform>& MidiInterface<Transport, Settings,
mCurrentRpnNumber = 0xffff; mCurrentRpnNumber = 0xffff;
mCurrentNrpnNumber = 0xffff; mCurrentNrpnNumber = 0xffff;
mLastMessageSentTime = mLastMessageSentTime =
mLastMessageReceivedTime = Platform::now(); mLastMessageReceivedTime = Platform::now();
mMessage.valid = false; mMessage.valid = false;
@ -769,10 +769,10 @@ inline bool MidiInterface<Transport, Settings, Platform>::read(Channel inChannel
sendActiveSensing(); sendActiveSensing();
} }
// Once an Active Sensing message is received, the unit will begin monitoring // Once an Active Sensing message is received, the unit will begin monitoring
// the intervalbetween all subsequent messages. If there is an interval of 420 ms // the intervalbetween all subsequent messages. If there is an interval of 420 ms
// or longer betweenmessages while monitoring is active, the same processing // or longer betweenmessages while monitoring is active, the same processing
// as when All Sound Off, All Notes Off,and Reset All Controllers messages are // as when All Sound Off, All Notes Off,and Reset All Controllers messages are
// received will be carried out. The unit will then stopmonitoring the message interval. // received will be carried out. The unit will then stopmonitoring the message interval.
if (Settings::UseReceiverActiveSensing && mReceiverActiveSensingActive) if (Settings::UseReceiverActiveSensing && mReceiverActiveSensingActive)
{ {
@ -1396,7 +1396,7 @@ void MidiInterface<Transport, Settings, Platform>::launchCallback()
*/ */
template<class Transport, class Settings, class Platform> template<class Transport, class Settings, class Platform>
inline void MidiInterface<Transport, Settings, Platform>::turnThruOn(ThruFilterCallback fptr) inline MidiInterface<Transport, Settings, Platform>& MidiInterface<Transport, Settings, Platform>::turnThruOn(ThruFilterCallback fptr)
{ {
mThruFilterCallback = fptr; mThruFilterCallback = fptr;
return *this; return *this;