Skip to content

Commit 92a8d28

Browse files
committed
update new hid descriptor (drop comma after report id)
this will need requires tinyusb core update from bsp to work with.
1 parent 950fc6b commit 92a8d28

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

examples/HID/hid_composite/hid_composite.ino

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,16 @@
3535
enum
3636
{
3737
RID_KEYBOARD = 1,
38-
RID_MOUSE
38+
RID_MOUSE,
39+
RID_CONSUMER_CONTROL, // Media, volume etc ..
3940
};
4041

4142
// HID report descriptor using TinyUSB's template
4243
uint8_t const desc_hid_report[] =
4344
{
44-
TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD), ),
45-
TUD_HID_REPORT_DESC_MOUSE ( HID_REPORT_ID(RID_MOUSE), )
45+
TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD) ),
46+
TUD_HID_REPORT_DESC_MOUSE ( HID_REPORT_ID(RID_MOUSE) ),
47+
//TUD_HID_REPORT_DESC_CONSUMER( HID_REPORT_ID(RID_CONSUMER_CONTROL), )
4648
};
4749

4850
// USB HID object

examples/HID/hid_composite_joy_featherwing/hid_composite_joy_featherwing.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ enum
4242
// HID report descriptor using TinyUSB's template
4343
uint8_t const desc_hid_report[] =
4444
{
45-
TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD), ),
46-
TUD_HID_REPORT_DESC_MOUSE ( HID_REPORT_ID(RID_MOUSE), )
45+
TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(RID_KEYBOARD) ),
46+
TUD_HID_REPORT_DESC_MOUSE ( HID_REPORT_ID(RID_MOUSE) )
4747
};
4848

4949
// USB HID object

src/Adafruit_USBD_MIDI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "Adafruit_USBD_MIDI.h"
2626

27-
#if CFG_TUD_MIDI && defined(TUD_MIDI_DESC_HEAD_LEN)
27+
#if CFG_TUD_MIDI
2828

2929
//--------------------------------------------------------------------+
3030
// MACRO TYPEDEF CONSTANT ENUM DECLARATION

0 commit comments

Comments
 (0)