Midi support

Author: pschatzmann

README.md

@@ -16,6 +16,7 @@ Further information can be found in my Blogs
 - [Overview](https://www.pschatzmann.ch/home/2020/09/24/the-synthesis-toolkit-skt-library-for-the-arduino-esp32/)
 - [Sound without Files](https://www.pschatzmann.ch/home/2020/09/26/the-synthesis-toolkit-stk-w-o-files/)
 - [Using Midi](https://www.pschatzmann.ch/home/2020/09/28/the-synthesis-toolkit-skt-library-for-the-arduino-esp32-midi/) 
+- [Bluetooth Support](https://www.pschatzmann.ch/home/2020/10/02/the-synthesis-toolkit-skt-library-for-the-arduino-esp32-bluetooth-support/)
 
 ## Installation
 Download the project as zip and install the file in the Arduino IDE via -> Sketch -> Include Library -> Add ZIP Library or execute the following command in the Arduino Library Folder

src/ArdBtSource.cpp

@@ -3,11 +3,14 @@
 
 namespace stk {
 
+char * APP_ArdBtSource = "ArdBtSource";
+
 // Used to make the voicer available to the callback
 Voicer *pArdBtSourceVoicer;
 
 //! Default Constructor
 ArdBtSource :: ArdBtSource( ) {
+    a2dp_source = new BluetoothA2DPSource();
 }
 
 //! Destructor
@@ -29,6 +32,9 @@ StkFloat&  clipTest( StkFloat& sample )
     return sample;
 }
 
+bool hasSoundData;
+long logTime;
+
 //! Callback: we just get the ticks from the pVoicer converted to Int16
 int32_t get_stk_data(uint8_t *data, int32_t len) {
 
@@ -53,26 +59,40 @@ int32_t get_stk_data(uint8_t *data, int32_t len) {
           ptr++;
           // Channel 2
           *ptr = *(ptr-1);
+          if (*ptr!=0){
+            hasSoundData = true;
+          }
           ptr++;
     }
+
+    if (logTime < millis()){
+      logTime = millis()+5000;
+      ESP_LOGD(APP_ArdBtSource, "Playing %s sound!", hasSoundData ? "" : "no" );
+      hasSoundData = false;
+    }
+
     return len;
 }
 
 void ArdBtSource :: start(char* name, Voicer &voicer) {
   this->pVoicer = &voicer;
   pArdBtSourceVoicer = &voicer;
 
-  if (a2dp_source != NULL) {
-    delete a2dp_source;
-  }
-  a2dp_source = new BluetoothA2DPSource();
   a2dp_source->startRaw(name, get_stk_data);
 }
 
 bool ArdBtSource :: isConnected(){
   return a2dp_source->isConnected();
 }
 
+void ArdBtSource :: setNVSInit(bool doInit){
+  a2dp_source->setNVSInit(doInit);
+}
+
+void ArdBtSource ::  setResetBLE(bool doInit){
+  a2dp_source->setResetBLE(doInit);
+}
+
 } // stk namespace
 
 #endif

src/ArdBtSource.h

@@ -1,6 +1,6 @@
 
 #include "Stk.h"
-#ifdef __ESP__
+#ifdef __BT_A2DP__
 
 #ifndef ARDBTSOURCE_H
 #define ARDBTSOURCE_H
@@ -9,6 +9,7 @@
 #include "ArdCommonOut.h"
 #include "BluetoothA2DPSource.h"
 #include "Voicer.h"
+#include "esp_log.h"
 
 namespace stk {
 
@@ -38,6 +39,13 @@ class ArdBtSource : public Stk
     //! Checks if this device is still connnected
     bool isConnected();
 
+    //! Defines if the Flash NVS should be reset on start
+    void setNVSInit(bool doInit);
+
+    //! Defines if the BLE should be reset on start
+    void setResetBLE(bool doInit);
+
+
   protected:
     Voicer *pVoicer;
     BluetoothA2DPSource *a2dp_source;

src/ArdConfig.h

@@ -9,6 +9,7 @@
 #if defined(ESP32)    
     #define __RAW_ARRAYS__      // raw files as compilable c arrays
     #define __STREAMS__         // output to Ardiono Streams
+    #define __BT_A2DP__         // output to A2DP sink
     #define __MIDI__            // support Midi 
     #define __MIDI_BLE__        // support BLE 
     #define __RTOS__            // supports Free RTOS

src/ArdMidiBleEventHandler.cpp

@@ -5,7 +5,7 @@ namespace stk {
 
 char * APP_EVENT_HDLR = "ArdMidiBleEventHandler";
 
-ArdMidiBleEventHandler::ArdMidiBleEventHandler(Voicer *p_voicer, uint8_t *p_channel)
+ArdMidiBleEventHandler::ArdMidiBleEventHandler(Voicer *p_voicer, int *p_channel)
 : ArdMidiEventHandler(p_voicer, p_channel) {
 };
 

src/ArdMidiBleEventHandler.h

@@ -7,6 +7,7 @@
 #include "Voicer.h"
 #include "ArdMidiEventHandler.h"
 #include "BLECharacteristic.h"
+#include "esp_log.h"
 
 namespace stk {
 
@@ -26,7 +27,7 @@ namespace stk {
 class ArdMidiBleEventHandler 
 : public BLECharacteristicCallbacks , public  ArdMidiEventHandler {
     public:
-        ArdMidiBleEventHandler(Voicer *voicer, uint8_t *p_channel = NULL );
+        ArdMidiBleEventHandler(Voicer *voicer, int *p_channel = NULL );
          ~ArdMidiBleEventHandler();
         void onRead(BLECharacteristic* pCharacteristic);
 	    void onWrite(BLECharacteristic* pCharacteristic);

src/ArdMidiBleServer.cpp

@@ -5,7 +5,8 @@ namespace stk {
 
 const char* APP_SERVER = "ArdMidiBleServer";
 
-ArdMidiBleServer::ArdMidiBleServer(char* name, ArdMidiBleEventHandler* pEventHandler){
+ArdMidiBleServer::ArdMidiBleServer(char* name, ArdMidiBleEventHandler* pEventHandler)
+ : ArdMidiCommon() {
      this->name = name;
      this->pEventHandler = pEventHandler;
      this->connectionStatus = Unconnected;
@@ -34,10 +35,12 @@ void ArdMidiBleServer :: start() {
                     );
 
 
-    if (this->pVoicer != nullptr) {                
-        if (this->pEventHandler == nullptr){
+    if (this->pVoicer != NULL) {                
+        if (this->pEventHandler == NULL){
+            ESP_LOGD(APP_SERVER, "Creating new ArdMidiBleEventHandler for voicer");
             this->pEventHandler =  new ArdMidiBleEventHandler(pVoicer, &(this->receivingChannel));
         }
+        ESP_LOGD(APP_SERVER, "Setting callback for characteristic");
         pCharacteristic->setCallbacks(this->pEventHandler);
     }
 

src/ArdMidiCommon.cpp

@@ -17,7 +17,7 @@ void ArdMidiCommon :: setDefaultSendingChannel(int8_t channel) {
     this->sendingChannel = channel;
 }
 
-void ArdMidiCommon :: setFilterReceivingChannel(int8_t channel){
+void ArdMidiCommon :: setFilterReceivingChannel(int channel){
     this->receivingChannel = channel;
 }
 

src/ArdMidiCommon.h

@@ -75,7 +75,7 @@ class ArdMidiCommon {
         ArdMidiCommon();
 
         //! Activates a filter on receiving messages to the indicated channel
-        void setFilterReceivingChannel(int8_t channel);
+        void setFilterReceivingChannel(int channel);
 
         //! Sets the default channel for the sending commands. 
         void setDefaultSendingChannel(int8_t channel);
@@ -131,7 +131,7 @@ class ArdMidiCommon {
         ConnectionStatus connectionStatus;
         Voicer *pVoicer;
         MidiMessage outMessage;
-        uint8_t receivingChannel = -1;  
+        int receivingChannel = -1;  
         uint8_t sendingChannel = 0;  
         uint8_t timestampLow;
         uint8_t timestampHigh;

src/ArdMidiEventHandler.cpp

@@ -9,7 +9,7 @@ const char* APP = "ArdMidiEventHandler";
 
 //ArdMidiEventHandler *self_ArdMidiEventHandler;
 
-ArdMidiEventHandler::ArdMidiEventHandler(Voicer *p_voicer, uint8_t *p_channel){
+ArdMidiEventHandler::ArdMidiEventHandler(Voicer *p_voicer, int *p_channel){
   this->p_voicer = p_voicer;
   this->p_channel = p_channel;
 
@@ -70,7 +70,8 @@ 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 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) {
+  ESP_LOGD(APP, "onCommand filtered channel: %d ", *p_channel);
+  if (p_channel==NULL || *p_channel < 0 || *p_channel == channel) {
     switch (status) {
       case 0b1001:
         onNoteOn(channel, p1, p2);
@@ -92,10 +93,12 @@ void ArdMidiEventHandler::onCommand(uint8_t channel, uint8_t status, uint8_t p1,
 }
 
 void ArdMidiEventHandler::onNoteOn(uint8_t channel, uint8_t note, uint8_t velocity){
+    ESP_LOGD(APP, "noteOn note:%d, velocity:%d, channel:%d", (int)note, (int)velocity, (int)channel);
     p_voicer->noteOn(note, velocity, channel);
 };
 
 void ArdMidiEventHandler::onNoteOff(uint8_t channel, uint8_t note, uint8_t velocity){
+    ESP_LOGD(APP, "noteOff note:%d, velocity:%d, channel:%d", (int)note, (int)velocity, (int)channel);
     p_voicer->noteOff(note, velocity, channel);
 };
 void ArdMidiEventHandler::onControlChange(uint8_t channel, uint8_t controller, uint8_t value){