BLE MIDI Corrections

Author: pschatzmann

examples/MidiBLEServer/MidiBLEServer.ino

@@ -10,18 +10,15 @@ Clarinet clarinet(440);
 ArdMidiBleEventHandler handler(&voicer);
 ArdMidiBleServer ble("MidiServer", &handler);
 
-using namespace stk;
-
-ArdMidiBleServer ble("MidiServer");
-
 StkFloat note = 64; // 0 to 128
 StkFloat amplitude = 100; // 0 to 128
 
 void setup() {
   Serial.begin(115200);
 
-  voicer.addInstrument(&clarinet, 0);
+  voicer.addInstrument(&clarinet, 1);
   ble.start(voicer);
+  ble.setDefaultSendingChannel(0);
 }
 
 void loop() {
@@ -37,3 +34,4 @@ void loop() {
   }
 }
 
+

examples/MidiFromUDP/MidiFromUDP

@@ -7,7 +7,6 @@
 
 using namespace stk;
 
-
 WiFiUDP udp;
 Clarinet clarinet(440);
 Voicer voicer;
@@ -33,10 +32,5 @@ void setup() {
 
 void loop() {
   in.loop();
-}```
-
-## BLE Server
-The MIDI BLE Server functionality is provided by the __ArdMidiBleServer__ class. Above you have already seen all relevant components and how they work together.
-
-### Sending of MIDI Messages over BLE
+}
 

src/ArdMidiBleEventHandler.cpp

@@ -3,6 +3,8 @@
 
 namespace stk {
 
+char * APP_EVENT_HDLR = "ArdMidiBleEventHandler";
+
 ArdMidiBleEventHandler::ArdMidiBleEventHandler(Voicer *p_voicer, uint8_t *p_channel)
 : ArdMidiEventHandler(p_voicer, p_channel) {
 };
@@ -15,7 +17,7 @@ ArdMidiBleEventHandler::~ArdMidiBleEventHandler(){
  * @param [in] pCharacteristic The characteristic that is the source of the event.
  */
 void ArdMidiBleEventHandler::onRead(BLECharacteristic* pCharacteristic) {
-	//ESP_LOGD(APP, "onRead");
+	ESP_LOGD(APP_EVENT_HDLR, "onRead");
 } // onRead
 
 
@@ -24,8 +26,9 @@ void ArdMidiBleEventHandler::onRead(BLECharacteristic* pCharacteristic) {
  * @param [in] pCharacteristic The characteristic that is the source of the event.
  */
 void ArdMidiBleEventHandler::onWrite(BLECharacteristic* pCharacteristic) {
+	ESP_LOGD(APP_EVENT_HDLR, "onWrite");
   const char* str = pCharacteristic->getValue().c_str();
-  int len = strlen(str);
+  int len = pCharacteristic->getValue().length();
   parse((uint8_t*)str, len);
 } 
 

src/ArdMidiBleServer.cpp

@@ -19,44 +19,6 @@ void ArdMidiBleServer :: start() {
     pServer = BLEDevice::createServer();
     pServer->setCallbacks(new ArdMidiBleServerCallback(&connectionStatus));
 
-    // Create the BLE Service
-    BLEService *pService = pServer->createService(BLEUUID(MIDI_SERVICE_UUID));
-    // Create a BLE Characteristic
-    pCharacteristic = pService->createCharacteristic(
-                        BLEUUID(MIDI_CHARACTERISTIC_UUID),
-                        BLECharacteristic::PROPERTY_READ   |
-                        BLECharacteristic::PROPERTY_WRITE_NR  |
-                        BLECharacteristic::PROPERTY_NOTIFY |
-                        BLECharacteristic::PROPERTY_INDICATE
-                    );
-                    
-    pCharacteristic->setAccessPermissions(ESP_GATT_PERM_READ_ENCRYPTED | ESP_GATT_PERM_WRITE_ENCRYPTED);
-    pCharacteristic->addDescriptor(new BLE2902());
-
-    // Start the service
-    pService->start();
-
-    BLEAdvertising *pAdvertising = BLEDevice::getAdvertising();
-    pAdvertising->addServiceUUID(MIDI_SERVICE_UUID);
-    pAdvertising->setScanResponse(true);
-    pAdvertising->setMinPreferred(0x06);  // functions that help with iPhone connections issue
-    pAdvertising->setMinPreferred(0x12);
-    pAdvertising->start();
-
-    ESP_LOGD(APP_SERVER, "started");
-
-}
-
-void ArdMidiBleServer :: start(Voicer &voicer) {
-    setVoicer(voicer);
-
-    // Create the BLE Device
-    BLEDevice::init(this->name);
-
-    // Create the BLE Server
-    pServer = BLEDevice::createServer();
-    pServer->setCallbacks(new ArdMidiBleServerCallback(&connectionStatus));
-
     //BLEDevice::setEncryptionLevel((esp_ble_sec_act_t)ESP_LE_AUTH_REQ_SC_BOND);
 
     // Create the BLE Service
@@ -70,13 +32,18 @@ void ArdMidiBleServer :: start(Voicer &voicer) {
                         BLECharacteristic::PROPERTY_NOTIFY |
                         BLECharacteristic::PROPERTY_INDICATE
                     );
+
 
-    if (this->pEventHandler == NULL){
-        this->pEventHandler =  new ArdMidiBleEventHandler(&voicer, &(this->receivingChannel));
+    if (this->pVoicer != nullptr) {                
+        if (this->pEventHandler == nullptr){
+            this->pEventHandler =  new ArdMidiBleEventHandler(pVoicer, &(this->receivingChannel));
+        }
+        pCharacteristic->setCallbacks(this->pEventHandler);
     }
-    pCharacteristic->setCallbacks(this->pEventHandler);
-    pCharacteristic->setAccessPermissions(ESP_GATT_PERM_READ_ENCRYPTED | ESP_GATT_PERM_WRITE_ENCRYPTED);
+
+    //pCharacteristic->setAccessPermissions(ESP_GATT_PERM_READ_ENCRYPTED | ESP_GATT_PERM_WRITE_ENCRYPTED);
     pCharacteristic->addDescriptor(new BLE2902());
+    pCharacteristic->setBroadcastProperty(true);
 
     // Start the service
     pService->start();
@@ -98,6 +65,12 @@ void ArdMidiBleServer :: start(Voicer &voicer) {
 
 }
 
+void ArdMidiBleServer :: start(Voicer &voicer) {
+	ESP_LOGD(APP_SERVER, "start");
+    setVoicer(voicer);
+    start();
+}
+
 void ArdMidiBleServer :: writeData(MidiMessage *pMsg, int len) {
     updateTimestamp(&outMessage);
 
@@ -120,10 +93,12 @@ ArdMidiBleServerCallback :: ArdMidiBleServerCallback(ConnectionStatus *pStatus){
     this->pConnectionStatus = pStatus;
 }
 void ArdMidiBleServerCallback :: onConnect(BLEServer* pServer) {
+	ESP_LOGD(APP_SERVER, "onConnect");
     *pConnectionStatus = Connected;
 };
 
 void ArdMidiBleServerCallback :: onDisconnect(BLEServer* pServer) {
+	ESP_LOGD(APP_SERVER, "onDisconnect");
     *pConnectionStatus = Disconnected;
 }
 

src/ArdMidiCommon.cpp

@@ -5,6 +5,8 @@ namespace stk {
 
 ArdMidiCommon::ArdMidiCommon(){
      this->connectionStatus = Unconnected;
+     this->timestampLow = 0;
+     this->timestampHigh = 0;
  }
 
 void ArdMidiCommon :: setVoicer(Voicer &voicer) {
@@ -28,8 +30,8 @@ void ArdMidiCommon ::  updateTimestamp(MidiMessage *pMsg) {
             timestampHigh = 0;
         }
     }
-    pMsg->timestampHigh = 0b10000000 | timestampHigh;
-    pMsg->timestampHigh = 0b10000000 | timestampLow;
+    pMsg->timestampHigh = 0b10000000 + timestampHigh;
+    pMsg->timestampLow = 0b10000000 + timestampLow;
 }
 
 

src/ArdMidiCommon.h

@@ -29,8 +29,8 @@
 #include "esp_log.h"
 #include "BLE2902.h"
 
-#define MIDI_SERVICE_UUID        "03b80e5a-ede8-4b33-a751-6ce34ec4c700"
-#define MIDI_CHARACTERISTIC_UUID "7772e5db-3868-4112-a1a9-f2669d106bf3"
+#define MIDI_SERVICE_UUID        "03B80E5A-EDE8-4B33-A751-6CE34EC4C700"
+#define MIDI_CHARACTERISTIC_UUID "7772E5DB-3868-4112-A1A9-F2669D106BF3"
 
 #endif
 

src/ArdMidiEventHandler.cpp

@@ -30,19 +30,22 @@ void ArdMidiEventHandler :: addInstrument(Instrmnt &instrument, int channel){
  */
 
 void ArdMidiEventHandler::parse(uint8_t* msg, uint8_t len){
+  ESP_LOGD(APP, "parse: len: %d", len);
+
   int pos = 0;
-  uint8_t status;
-  uint8_t channel;
-  uint8_t p1;
-  uint8_t p2;
+  uint8_t status=0;
+  uint8_t channel=0;
+  uint8_t p1=0;
+  uint8_t p2=0;
 
-  while (pos>len){
+  while (pos<len){
     // find status ingnoring headers and timestamps
     while (msg[pos]>>7 == 1) {
       // if next is data we have a status record
       if (pos+1<len && msg[pos+1]>>7 == 0){
-        status = msg[pos] > 4;
-        channel = status |  0b1111;
+        // status: 0b1001 << 4 | channel;
+        status = msg[pos] >> 4;  // high 4 bits
+        channel = msg[pos] & 0x0F; // lower 4 bits
         p1 = 0;
         p2 = 0;
       }
@@ -52,6 +55,7 @@ void ArdMidiEventHandler::parse(uint8_t* msg, uint8_t len){
     // process data bytes
     if (msg[pos]>>7 == 0) { // data
       p1 = msg[pos];
+      // check if we have 2 data bytes
       if (pos+1<len && msg[pos+1]>>7 == 0) {
         pos++;
         p2 = msg[pos];
@@ -65,7 +69,7 @@ void ArdMidiEventHandler::parse(uint8_t* msg, uint8_t len){
 }
 
 void ArdMidiEventHandler::onCommand(uint8_t channel, uint8_t status, uint8_t p1,uint8_t p2 ){
-  //ESP_LOGD(APP, "onCommand");
+  ESP_LOGD(APP, "onCommand channel:%d, status:%d, p1:%d,  p2:%d", (int)channel, (int)status, (int)p1, (int)p2);
   if (p_channel==NULL || *p_channel == -1 || *p_channel == channel) {
     switch (status) {
       case 0b1001: