clean up add connect/disconnect callback

Author: hathach

libraries/Bluefruit52Lib/examples/blemidi/blemidi.ino

@@ -63,6 +63,38 @@ void setupAdv(void)
 
 void loop()
 {
-  digitalToggle(LED_BUILTIN);
-  delay(1000);
+  if ( Bluefruit.connected() && blemidi.configured() )
+  {
+    static int current_note = 60;
+    
+    // send note on
+    blemidi.send(0x90, current_note, 0x64);
+    delay(500);
+
+    // send note off
+    blemidi.send(0x80, current_note, 0x64);
+    delay(500);
+
+    // increment note pitch
+    current_note++;
+
+    // only do one octave
+    if(current_note > 72)
+    {
+      current_note = 60;
+    }
+  }
+}
+
+void connect_callback(void)
+{
+  Serial.println("Connected");
+}
+
+void disconnect_callback(uint8_t reason)
+{
+  (void) reason;
+  
+  Serial.println("Disconnected");
+  Serial.println("Bluefruit will auto start advertising (default)");
 }

libraries/Bluefruit52Lib/examples/bleuart/bleuart.ino

@@ -20,7 +20,7 @@ BLEBas blebas;
 #define STATUS_LED  (17)
 #define BLINKY_MS   (2000)
 
-int blinkyms;
+uint32_t blinkyms;
 
 void setup()
 {
@@ -39,6 +39,8 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setName("Bluefruit52");
+  Bluefruit.setConnectCallback(connect_callback);
+  Bluefruit.setDisconnectCallback(disconnect_callback);
 
   // Configure and Start Device Information Service
   bledis.setManufacturer("Adafruit Industries");
@@ -102,3 +104,16 @@ void loop()
     Serial.write(ch);
   }
 }
+
+void connect_callback(void)
+{
+  Serial.println("Connected");
+}
+
+void disconnect_callback(uint8_t reason)
+{
+  (void) reason;
+  
+  Serial.println("Disconnected");
+  Serial.println("Bluefruit will auto start advertising (default)");
+}

libraries/Bluefruit52Lib/src/services/BLEMidi.cpp

@@ -52,6 +52,68 @@ const uint8_t BLEMIDI_UUID_CHR_IO[] =
     0x12, 0x41, 0x68, 0x38, 0xD8, 0xE5, 0x72, 0x77
 };
 
+/*------------------------------------------------------------------*/
+/* MIDI Data Type
+ *------------------------------------------------------------------*/
+typedef union ATTR_PACKED
+{
+  struct {
+    uint8_t timestamp_hi : 6;
+    uint8_t              : 1;
+    uint8_t start_bit    : 1;
+  };
+
+  uint8_t byte;
+} midi_header_t;
+
+VERIFY_STATIC ( sizeof(midi_header_t) == 1 );
+
+typedef union ATTR_PACKED
+{
+  struct {
+    uint8_t timestamp_low : 7;
+    uint8_t start_bit : 1;
+  };
+
+  uint8_t byte;
+} midi_timestamp_t;
+
+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;
+  midi_timestamp_t timestamp;
+  uint8_t data[3];
+} midi_event_packet_t;
+
+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 );
+
+/*------------------------------------------------------------------*/
+/* IMPLEMENTATION
+ *------------------------------------------------------------------*/
 BLEMidi::BLEMidi(void)
   : BLEService(BLEMIDI_UUID_SERVICE), _io(BLEMIDI_UUID_CHR_IO)
 {
@@ -63,6 +125,41 @@ void blemidi_write_cb(BLECharacteristic& chr, ble_gatts_evt_write_t* request)
 
 }
 
+bool BLEMidi::configured()
+{
+  return _io.notifyEnabled();
+}
+
+err_t BLEMidi::send(uint8_t data[])
+{
+  uint32_t tstamp = millis();
+
+  midi_event_packet_t event =
+  {
+      .header = {{
+          .timestamp_hi = (uint8_t) ((tstamp & 0x1F80UL) >> 7),
+          .start_bit    = 1
+      }},
+
+      .timestamp = {{
+          .timestamp_low = (uint8_t) (tstamp & 0x7FUL),
+          .start_bit     = 1
+      }}
+  };
+
+  memcpy(event.data, data, 3);
+
+  VERIFY_STATUS( _io.notify(data, 3) );
+
+  return ERROR_NONE;
+}
+
+err_t BLEMidi::send(uint8_t status, uint8_t byte1, uint8_t byte2)
+{
+  uint8_t data[] = { status, byte1, byte2 };
+  return send(data);
+}
+
 err_t BLEMidi::start(void)
 {
   VERIFY_STATUS( this->addToGatt() );

libraries/Bluefruit52Lib/src/services/BLEMidi.h

@@ -45,17 +45,36 @@
 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:
     BLEMidi(void);
 
     virtual err_t start(void);
 
+    bool  configured();
+
+
+    err_t send(uint8_t data[]);
+    err_t send(uint8_t status, uint8_t byte1, uint8_t byte2);
+
   private:
     BLECharacteristic _io;
 
     friend void blemidi_write_cb(BLECharacteristic& chr, ble_gatts_evt_write_t* request);
 };
 
+
+
 #endif /* BLEMIDI_H_ */