Seich
/
Arduino-BLE-MIDI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed all event code 

cleanup - removed all polling code
This commit is contained in:
lathoub 2022-06-05 10:26:47 +02:00
parent edd2f21a39
commit 3c789b0b5f
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/hardware/BLEMIDI_ArduinoBLE.h
View File

@ -2,9 +2,6 @@
#include <ArduinoBLE.h> #include <ArduinoBLE.h>
#define BLE_POLLING
//#define BLE_EVENTS // TODO: requires static function (don't like)
BEGIN_BLEMIDI_NAMESPACE BEGIN_BLEMIDI_NAMESPACE
template <typename T, short rawSize> template <typename T, short rawSize>
@ -90,7 +87,6 @@ public:
bool available(byte *pvBuffer) bool available(byte *pvBuffer)
{ {
#ifdef BLE_POLLING
if (mRxBuffer.count() > 0) if (mRxBuffer.count() > 0)
{ {
*pvBuffer = mRxBuffer.dequeue(); *pvBuffer = mRxBuffer.dequeue();
@ -109,11 +105,6 @@ public:
} }
} }
return false; return false;
#endif
#ifdef BLE_EVENTS
BLE.poll();
return false;
#endif
} }
void add(byte value) void add(byte value)
@ -136,7 +127,7 @@ protected:
{ {
if (_central) if (_central)
{ {
BLEMIDI_ArduinoBLE::blePeripheralDisconnectHandler(*_central); onDisconnected(*_central);
_central = nullptr; _central = nullptr;
} }
return false; return false;
@ -147,15 +138,15 @@ protected:
if (nullptr == _central) if (nullptr == _central)
{ {
BLEMIDI_ArduinoBLE::blePeripheralConnectHandler(central); onConnected(central);
_central = &central; _central = &central;
} }
else else
{ {
if (*_central != central) if (*_central != central)
{ {
BLEMIDI_ArduinoBLE::blePeripheralDisconnectHandler(*_central); onDisconnected(*_central);
BLEMIDI_ArduinoBLE::blePeripheralConnectHandler(central); onConnected(central);
_central = &central; _central = &central;
} }
} }
@ -163,7 +154,7 @@ protected:
return true; return true;
} }
void blePeripheralConnectHandler(BLEDevice central) void onConnected(BLEDevice central)
{ {
_central = &central; _central = &central;
@ -171,22 +162,13 @@ protected:
_bleMidiTransport->_connectedCallback(); _bleMidiTransport->_connectedCallback();
} }
void blePeripheralDisconnectHandler(BLEDevice central) void onDisconnected(BLEDevice central)
{ {
if (_bleMidiTransport->_disconnectedCallback) if (_bleMidiTransport->_disconnectedCallback)
_bleMidiTransport->_disconnectedCallback(); _bleMidiTransport->_disconnectedCallback();
_central = nullptr; _central = nullptr;
} }
void characteristicWritten(BLEDevice central, BLECharacteristic characteristic)
{
auto buffer = characteristic.value();
auto length = characteristic.valueLength();
if (length > 0)
receive(buffer, length);
}
}; };
template <class _Settings> template <class _Settings>
@ -208,14 +190,6 @@ bool BLEMIDI_ArduinoBLE<_Settings>::begin(const char *deviceName, BLEMIDI_Transp
// (when not set, the device will disconnect after 0.5 seconds) // (when not set, the device will disconnect after 0.5 seconds)
_midiChar.writeValue((uint8_t)0); _midiChar.writeValue((uint8_t)0);
#ifdef BLE_EVENTS
// assign event handlers for connected, disconnected to peripheral
BLE.setEventHandler(BLEConnected, BLEMIDI_ArduinoBLE::blePeripheralConnectHandler);
BLE.setEventHandler(BLEDisconnected, BLEMIDI_ArduinoBLE::blePeripheralDisconnectHandler);
_midiChar.setEventHandler(BLEWritten, characteristicWritten);
#endif
/* Start advertising BLE. It will start continuously transmitting BLE /* Start advertising BLE. It will start continuously transmitting BLE
advertising packets and will be visible to remote BLE central devices advertising packets and will be visible to remote BLE central devices
until it receives a new connection */ until it receives a new connection */