Merge pull request #56 from adafruit/develop

update new hid descriptor (drop comma after report id)

Author: hathach

examples/HID/hid_composite/hid_composite.ino

@@ -35,14 +35,16 @@
 enum
 {
   RID_KEYBOARD = 1,
-  RID_MOUSE
+  RID_MOUSE,
+  RID_CONSUMER_CONTROL, // Media, volume etc ..
 };
 
 // HID report descriptor using TinyUSB's template
 uint8_t const desc_hid_report[] =
 {
-  TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD), ),
-  TUD_HID_REPORT_DESC_MOUSE   ( HID_REPORT_ID(RID_MOUSE), )
+  TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD) ),
+  TUD_HID_REPORT_DESC_MOUSE   ( HID_REPORT_ID(RID_MOUSE) ),
+  //TUD_HID_REPORT_DESC_CONSUMER( HID_REPORT_ID(RID_CONSUMER_CONTROL), )
 };
 
 // USB HID object

examples/HID/hid_composite_joy_featherwing/hid_composite_joy_featherwing.ino

@@ -42,8 +42,8 @@ enum
 // HID report descriptor using TinyUSB's template
 uint8_t const desc_hid_report[] =
 {
-  TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD), ),
-  TUD_HID_REPORT_DESC_MOUSE   ( HID_REPORT_ID(RID_MOUSE), )
+  TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD) ),
+  TUD_HID_REPORT_DESC_MOUSE   ( HID_REPORT_ID(RID_MOUSE) )
 };
 
 // USB HID object

src/Adafruit_USBD_MIDI.cpp

@@ -24,7 +24,7 @@
 
 #include "Adafruit_USBD_MIDI.h"
 
-#if CFG_TUD_MIDI && defined(TUD_MIDI_DESC_HEAD_LEN)
+#if CFG_TUD_MIDI
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
@@ -35,8 +35,7 @@
 
 Adafruit_USBD_MIDI::Adafruit_USBD_MIDI(void) : _n_cables(1) {}
 
-Adafruit_USBD_MIDI::Adafruit_USBD_MIDI(uint8_t n_cables)
-    : _n_cables(n_cables) {}
+void Adafruit_USBD_MIDI::setCables(uint8_t n_cables) { _n_cables = n_cables; }
 
 bool Adafruit_USBD_MIDI::begin(void) {
   if (!USBDevice.addInterface(*this))
@@ -114,4 +113,12 @@ void Adafruit_USBD_MIDI::flush(void) {
   // MIDI Library doen't use flush
 }
 
+bool Adafruit_USBD_MIDI::send(const uint8_t packet[4]) {
+  return tud_midi_send(packet);
+}
+
+bool Adafruit_USBD_MIDI::receive(uint8_t packet[4]) {
+  return tud_midi_receive(packet);
+}
+
 #endif

src/Adafruit_USBD_MIDI.h

@@ -30,7 +30,6 @@
 class Adafruit_USBD_MIDI : public Stream, Adafruit_USBD_Interface {
 public:
   Adafruit_USBD_MIDI(void);
-  Adafruit_USBD_MIDI(uint8_t n_cables);
 
   bool begin(void);
 
@@ -47,10 +46,16 @@ class Adafruit_USBD_MIDI : public Stream, Adafruit_USBD_Interface {
   virtual int peek(void);
   virtual void flush(void);
 
+  // Raw MIDI USB packet interface.
+  bool send(const uint8_t packet[4]);
+  bool receive(uint8_t packet[4]);
+
   // from Adafruit_USBD_Interface
   virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t *buf,
                                  uint16_t bufsize);
 
+  void setCables(uint8_t n_cables);
+
 private:
   uint8_t _n_cables;
 };