clean up blemidi. Add auto invoke MIDI.read() behavior

Author: hathach

libraries/Bluefruit52Lib/examples/Peripheral/blemidi/blemidi.ino

@@ -52,7 +52,9 @@ void setup()
   bledis.begin();
 
   // Initialize MIDI, and listen to all MIDI channels
+  // This will also call blemidi service's begin()
   MIDI.begin(MIDI_CHANNEL_OMNI);
+  blemidi.autoMIDIread(&MIDI);
 
   // Attach the handleNoteOn function to the MIDI Library. It will
   // be called whenever the Bluefruit receives MIDI Note On messages.
@@ -106,7 +108,7 @@ void loop()
   }
 
   // read any new MIDI messages
-  MIDI.read();
+  //MIDI.read();
 
   // Store the current time
   unsigned long now = millis();

libraries/Bluefruit52Lib/src/services/BLEMidi.cpp

@@ -36,6 +36,14 @@
 
 #include "bluefruit.h"
 
+// GCC 5x new feature to detect optional include
+#ifdef __has_include
+#if __has_include("MIDI.h")
+  #include <MIDI.h>
+  #define MIDI_LIB_INCLUDED
+#endif
+#endif
+
 /* MIDI Service: 03B80E5A-EDE8-4B33-A751-6CE34EC4C700
  * MIDI I/O    : 7772E5DB-3868-4112-A1A9-F2669D106BF3
  */
@@ -80,18 +88,6 @@ typedef union ATTR_PACKED
 
 VERIFY_STATIC ( sizeof(midi_timestamp_t) == 1 );
 
-typedef union ATTR_PACKED
-{
-  struct {
-    uint8_t channel : 4;
-    uint8_t type    : 4;
-  };
-
-  uint8_t byte;
-} midi_status_t;
-
-VERIFY_STATIC ( sizeof(midi_status_t) == 1 );
-
 typedef struct ATTR_PACKED
 {
   midi_header_t header;
@@ -101,38 +97,64 @@ typedef struct ATTR_PACKED
 
 VERIFY_STATIC ( sizeof(midi_event_packet_t) == 5 );
 
-typedef struct ATTR_PACKED
-{
-  midi_header_t header;
-  midi_timestamp_t timestamp;
-  midi_status_t status;
-  uint8_t data[16];
-} midi_n_event_packet_t;
-
-VERIFY_STATIC ( sizeof(midi_n_event_packet_t) == 19 );
+void blemidi_write_cb(BLECharacteristic& chr, uint8_t* data, uint16_t len, uint16_t offset);
 
 /*------------------------------------------------------------------*/
 /* IMPLEMENTATION
  *------------------------------------------------------------------*/
 BLEMidi::BLEMidi(uint16_t fifo_depth)
   : BLEService(BLEMIDI_UUID_SERVICE), _io(BLEMIDI_UUID_CHR_IO), _rxd_fifo(fifo_depth, 1)
 {
-  _write_cb = NULL;
+  _write_cb    = NULL;
+  _midilib_obj = NULL;
 }
 
 bool BLEMidi::notifyEnabled(void)
 {
   return Bluefruit.connBonded() && _io.notifyEnabled();
 }
 
+void BLEMidi::setWriteCallback(midi_write_cb_t fp)
+{
+  _write_cb = fp;
+}
+
+void BLEMidi::autoMIDIread(void* midi_obj)
+{
+  _midilib_obj = midi_obj;
+}
+void BLEMidi::begin(int baudrate)
+{
+  (void) baudrate;
+  begin();
+}
+
+err_t BLEMidi::begin(void)
+{
+  VERIFY_STATUS( this->addToGatt() );
+
+  // IO characteristic
+  _io.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE | CHR_PROPS_WRITE_WO_RESP | CHR_PROPS_NOTIFY);
+  _io.setPermission(SECMODE_ENC_NO_MITM, SECMODE_ENC_NO_MITM);
+  _io.setWriteCallback(blemidi_write_cb);
+
+  VERIFY_STATUS( _io.begin() );
+
+  // Attempt to change the connection interval to 11.25-15 ms when starting HID
+  Bluefruit.setConnInterval(9, 12);
+
+  return ERROR_NONE;
+}
 
+/*------------------------------------------------------------------*/
+/* Callbacks
+ *------------------------------------------------------------------*/
 void blemidi_write_cb(BLECharacteristic& chr, uint8_t* data, uint16_t len, uint16_t offset)
 {
   (void) offset;
   if ( len < 3 ) return;
 
   BLEMidi& midi_svc = (BLEMidi&) chr.parentService();
-
   midi_svc._write_handler(data, len);
 }
 
@@ -193,35 +215,14 @@ void BLEMidi::_write_handler(uint8_t* data, uint16_t len)
       data += 2;
     }
   }
-}
-
-void BLEMidi::setWriteCallback(midi_write_cb_t fp)
-{
-  _write_cb = fp;
-}
-
-void BLEMidi::begin(int baudrate)
-{
-  (void) baudrate;
-  begin();
-}
-
-err_t BLEMidi::begin(void)
-{
-  _io.setWriteCallback(blemidi_write_cb);
 
-  VERIFY_STATUS( this->addToGatt() );
-
-  // IO characteristic
-  _io.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE | CHR_PROPS_WRITE_WO_RESP | CHR_PROPS_NOTIFY);
-  _io.setPermission(SECMODE_ENC_NO_MITM, SECMODE_ENC_NO_MITM);
-
-  VERIFY_STATUS( _io.begin() );
-
-  // Attempt to change the connection interval to 11.25-15 ms when starting HID
-  Bluefruit.setConnInterval(9, 12);
-
-  return ERROR_NONE;
+#ifdef MIDI_LIB_INCLUDED
+  // read while possible if configured
+  if ( _midilib_obj )
+  {
+    while( ((midi::MidiInterface<BLEMidi>*)_midilib_obj)->read() ) { }
+  }
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -282,7 +283,7 @@ void BLEMidi::flush ( void )
 }
 
 /*------------------------------------------------------------------*/
-/* Send Event
+/* Send Event (notify)
  *------------------------------------------------------------------*/
  err_t BLEMidi::send(uint8_t data[])
 {

libraries/Bluefruit52Lib/src/services/BLEMidi.h

@@ -49,17 +49,6 @@
 extern const uint8_t BLEMIDI_UUID_SERVICE[];
 extern const uint8_t BLEMIDI_UUID_CHR_IO[];
 
-enum
-{
-  MIDI_TYPE_NOTE_OFF         = 0x8,
-  MIDI_TYPE_NOTE_ON          = 0x9,
-  MIDI_TYPE_AFTER_TOUCH      = 0xA,
-  MIDI_TYPE_CONTROL_CHANGE   = 0xB,
-  MIDI_TYPE_PROGRAM_CHANGE   = 0xC,
-  MIDI_TYPE_CHANNEL_PRESSURE = 0xD,
-  MIDI_TYPE_PITCH_WHEEL      = 0xE,
-};
-
 class BLEMidi: public BLEService, public Stream
 {
   public:
@@ -68,16 +57,14 @@ class BLEMidi: public BLEService, public Stream
     BLEMidi(uint16_t fifo_depth = BLE_MIDI_DEFAULT_FIFO_DEPTH);
 
     virtual err_t begin(void);
-
-    // MidiInterface
-    void begin(int baudrate);
-
+    void begin(int baudrate); // MidiInterface
     bool  notifyEnabled(void);
 
     err_t send(uint8_t data[]);
     err_t send(uint8_t status, uint8_t byte1, uint8_t byte2);
 
     void setWriteCallback(midi_write_cb_t fp);
+    void autoMIDIread(void* midi_obj);
 
     // Stream API for MIDI Interface
     virtual int       read       ( void );
@@ -94,6 +81,8 @@ class BLEMidi: public BLEService, public Stream
     Adafruit_FIFO     _rxd_fifo;
     midi_write_cb_t   _write_cb;
 
+    void* _midilib_obj;
+
     void _write_handler(uint8_t* data, uint16_t len);
 
     friend void blemidi_write_cb(BLECharacteristic& chr, uint8_t* data, uint16_t len, uint16_t offset);