cleanup

examples/Esp32_NoteOnOffEverySec/Esp32_NoteOnOffEverySec.ino

@@ -1,6 +1,3 @@
-// Select your device
-#define ESP32
-
 #include "BleMidi.h"
 
 BLEMIDI_CREATE_INSTANCE(bm);

src/Ble_esp32.h

@@ -14,9 +14,9 @@ class BleMidiInterface : public AbstractMidiInterface
 {
 protected:
     // ESP32
-    BLEServer  *pServer;
+    BLEServer  * _server;
-    BLEAdvertising *pAdvertising;
+    BLEAdvertising * _advertising;
-    BLECharacteristic *pCharacteristic;
+    BLECharacteristic *_characteristic;
     
     bool _connected;
     
@@ -28,7 +28,7 @@ public:
     void(*_disconnectedCallback)() = NULL;
     
 protected:
-    void getMidiTimestamp (uint8_t *header, uint8_t *timestamp)
+    inline static void getMidiTimestamp (uint8_t *header, uint8_t *timestamp)
     {
         /*
          The first byte of all BLE packets must be a header byte. This is followed by timestamp bytes and MIDI messages.
@@ -74,6 +74,9 @@ protected:
         *timestamp = (currentTimeStamp & 0x7F) | 0x80;            // 7 bits plus MSB
     }
     
+    
+    // serialize towards hardware
+    
     void serialize(DataByte b1)
     {
         getMidiTimestamp(&_midiPacket[0], &_midiPacket[1]);
@@ -82,8 +85,8 @@ protected:
 
         // TODO: quid running status
         
-        pCharacteristic->setValue(_midiPacket, 3);
+        _characteristic->setValue(_midiPacket, 3);
-        pCharacteristic->notify();
+        _characteristic->notify();
     };
     
     void serialize(DataByte b1, DataByte b2)
@@ -95,8 +98,8 @@ protected:
 
         // TODO: quid running status
 
-        pCharacteristic->setValue(_midiPacket, 4);
+        _characteristic->setValue(_midiPacket, 4);
-        pCharacteristic->notify();
+        _characteristic->notify();
     };
     
     void serialize(DataByte b1, DataByte b2, DataByte b3)
@@ -109,8 +112,8 @@ protected:
 
         // TODO: quid running status
 
-        pCharacteristic->setValue(_midiPacket, 5);
+        _characteristic->setValue(_midiPacket, 5);
-        pCharacteristic->notify();
+        _characteristic->notify();
    };
 
 
@@ -123,8 +126,15 @@ public:
     {
     }
     
+    // TODO why must these functions be inline??
+    
     inline bool begin(const char* deviceName);
     
+    inline void run()
+    {
+        // n/a, data comes in async (see onWrite callbacks)
+    }
+    
     inline void receive(uint8_t *buffer, uint8_t bufferSize);
 
     void onConnected(void(*fptr)()) {
@@ -146,12 +156,12 @@ public:
 protected:
     BleMidiInterface* _bleMidiInterface;
 
-    void onConnect(BLEServer* pServer) {
+    void onConnect(BLEServer* server) {
         if (_bleMidiInterface->_connectedCallback)
             _bleMidiInterface->_connectedCallback();
     };
     
-    void onDisconnect(BLEServer* pServer) {
+    void onDisconnect(BLEServer* server) {
         if (_bleMidiInterface->_disconnectedCallback)
             _bleMidiInterface->_disconnectedCallback();
     }
@@ -162,11 +172,12 @@ public:
     MyCharacteristicCallbacks(BleMidiInterface* bleMidiInterface) {
         _bleMidiInterface = bleMidiInterface;
     }
+    
 protected:
     BleMidiInterface* _bleMidiInterface;
 
-    void onWrite(BLECharacteristic *pCharacteristic) {
+    void onWrite(BLECharacteristic * characteristic) {
-        std::string rxValue = pCharacteristic->getValue();
+        std::string rxValue = characteristic->getValue();
         if (rxValue.length() > 0) {
             _bleMidiInterface->receive((uint8_t *)(rxValue.c_str()), rxValue.length());
         }
@@ -177,23 +188,23 @@ bool BleMidiInterface::begin(const char* deviceName)
 {
     BLEDevice::init(deviceName);
     
-    pServer = BLEDevice::createServer();
+    _server = BLEDevice::createServer();
-    pServer->setCallbacks(new MyServerCallbacks(this));
+    _server->setCallbacks(new MyServerCallbacks(this));
     
     // Create the BLE Service
-    auto pService = pServer->createService(BLEUUID(SERVICE_UUID));
+    auto service = _server->createService(BLEUUID(SERVICE_UUID));
     
     // Create a BLE Characteristic
-    pCharacteristic = pService->createCharacteristic(
+    _characteristic = service->createCharacteristic(
                                                      BLEUUID(CHARACTERISTIC_UUID),
                                                      BLECharacteristic::PROPERTY_READ   |
                                                      BLECharacteristic::PROPERTY_WRITE  |
                                                      BLECharacteristic::PROPERTY_NOTIFY |
                                                      BLECharacteristic::PROPERTY_WRITE_NR
                                                      );
-    pCharacteristic->setCallbacks(new MyCharacteristicCallbacks(this));
+    _characteristic->setCallbacks(new MyCharacteristicCallbacks(this));
     // Start the service
-    pService->start();
+    service->start();
     
     auto advertisementData = BLEAdvertisementData();
     advertisementData.setFlags(0x04);
@@ -201,9 +212,9 @@ bool BleMidiInterface::begin(const char* deviceName)
     advertisementData.setName(deviceName);
     
     // Start advertising
-    pAdvertising = pServer->getAdvertising();
+    _advertising = _server->getAdvertising();
-    pAdvertising->setAdvertisementData(advertisementData);
+    _advertising->setAdvertisementData(advertisementData);
-    pAdvertising->start();
+    _advertising->start();
     
     return true;
 }
@@ -275,7 +286,7 @@ void BleMidiInterface::receive(uint8_t *buffer, uint8_t bufferSize)
 
             // TODO: switch for type
             
-            if (_noteOnCallback)
+if (_noteOnCallback) // if an attached function exisist, call it here
     _noteOnCallback(0, 1, 2);
 
             //        MIDI.send(command, buffer[lPtr + 1], buffer[lPtr + 2], channel);

src/utility/AbstractMidiInterface.h

@@ -71,6 +71,7 @@ typedef byte MIDI_PRESSURE;
 enum MidiType : uint8_t
 {
     InvalidType           = 0x00,    ///< For notifying errors
+    
     NoteOff               = 0x80,    ///< Note Off
     NoteOn                = 0x90,    ///< Note On
     AfterTouchPoly        = 0xA0,    ///< Polyphonic AfterTouch
@@ -78,13 +79,16 @@ enum MidiType : uint8_t
     ProgramChange         = 0xC0,    ///< Program Change
     AfterTouchChannel     = 0xD0,    ///< Channel (monophonic) AfterTouch
     PitchBend             = 0xE0,    ///< Pitch Bend
+    
     SystemExclusive       = 0xF0,    ///< System Exclusive
     SystemExclusiveStart  = SystemExclusive,
     SystemExclusiveEnd    = 0xF7,    ///< System Exclusive End
+    
     TimeCodeQuarterFrame  = 0xF1,    ///< System Common - MIDI Time Code Quarter Frame
     SongPosition          = 0xF2,    ///< System Common - Song Position Pointer
     SongSelect            = 0xF3,    ///< System Common - Song Select
     TuneRequest           = 0xF6,    ///< System Common - Tune Request
+    
     Clock                 = 0xF8,    ///< System Real Time - Timing Clock
     Tick                  = 0xF9,    ///< System Real Time - Tick
     Start                 = 0xFA,    ///< System Real Time - Start
@@ -311,45 +315,62 @@ public:
         send(MidiType::AfterTouchChannel, note, pressure, channel);
     }
     
+    
     void sendSysEx(const byte*, uint16_t inLength) {
+        // TODO
     }
     
+    
     void sendTimeCodeQuarterFrame(DataByte typeNibble, DataByte valuesNibble) {
+        // TODO f(typeNibble, valuesNibble);
+        send(MidiType::TimeCodeQuarterFrame);
     }
     
     void sendTimeCodeQuarterFrame(DataByte data) {
+        send(MidiType::TimeCodeQuarterFrame, data);
     }
     
     void sendSongPosition(unsigned short beats) {
+        send(MidiType::SongPosition, beats);
     }
     
     void sendSongSelect(DataByte number) {
+        send(MidiType::SongSelect, number);
     }
     
     void sendTuneRequest() {
+        send(MidiType::TuneRequest);
     }
     
     void sendActiveSensing() {
+        send(MidiType::ActiveSensing);
    }
     
     void sendStart() {
+        send(MidiType::Start);
     }
     
     void sendContinue() {
+        send(MidiType::Continue);
   }
     
     void sendStop() {
-    }
+        send(MidiType::Stop);
-    
-    void sendReset() {
    }
     
     void sendClock() {
+        send(MidiType::Clock);
    }
     
     void sendTick() {
+        send(MidiType::Tick);
     }
     
+    void sendReset() {
+        send(MidiType::SystemReset);
+    }
+    
+
     //receiving
     void setHandleNoteOn(void (*fptr)(byte channel, byte note, byte velocity)) {
         _noteOnCallback = fptr;
@@ -418,8 +439,10 @@ protected:
             return; // Don't send anything
         }
         
-        if (type <= MidiType::PitchBend)  // Channel messages
+        if (type <= MidiType::PitchBend)
         {
+            // Channel messages
+            
             // Protection: remove MSBs on data
             data1 &= 0x7f;
             data2 &= 0x7f;
@@ -437,22 +460,29 @@ protected:
         }
         else if (type >= MidiType::Clock && type <= MidiType::SystemReset)
         {
-            serialize(type); // System Real-time and 1 byte.
+            send(type); // System Real-time and 1 byte.
         }
     }
     
     // SystemCommon message
-    virtual void send(MidiType type, DataByte data1, DataByte data2)
+    virtual void send(MidiType type, DataByte data1)
     {
         
     }
     
-    // realTime
+    // realTime messages
     virtual void send(MidiType type)
     {
         
     }
 
+    virtual bool begin(const char*) = 0;
+    
+    virtual void run() = 0;
+    
+    // serialize from the hardware
+
+    // serialize towards to hardware
     virtual void serialize(DataByte) = 0;
     virtual void serialize(DataByte, DataByte) = 0;
     virtual void serialize(DataByte, DataByte, DataByte) = 0;