kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

clean up

This commit is contained in:
hathach 2018-07-30 15:49:16 +07:00
parent 683bb574e7
commit 2910b8d77a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/device/usbd_desc.c
View File

@ -118,7 +118,7 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
/*------------- Keyboard Descriptor -------------*/ /*------------- Keyboard Descriptor Template -------------*/
#define HID_REPORT_KEYBOARD(...) \ #define HID_REPORT_KEYBOARD(...) \
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\ HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ) ,\ HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ) ,\
@ -159,7 +159,7 @@
HID_OUTPUT ( HID_CONSTANT ) ,\ HID_OUTPUT ( HID_CONSTANT ) ,\
HID_COLLECTION_END \ HID_COLLECTION_END \
/*------------- Mouse Descriptor -------------*/ /*------------- Mouse Descriptor Template -------------*/
#define HID_REPORT_MOUSE(...) \ #define HID_REPORT_MOUSE(...) \
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\ HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ) ,\ HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ) ,\
@ -200,7 +200,7 @@
HID_COLLECTION_END \ HID_COLLECTION_END \
/*------------- Generic (composite) Descriptor -------------*/ /*------------- Boot Protocol Report Descriptor -------------*/
#if CFG_TUD_HID_KEYBOARD && CFG_TUD_HID_KEYBOARD_BOOT #if CFG_TUD_HID_KEYBOARD && CFG_TUD_HID_KEYBOARD_BOOT
uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() }; uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() };
#endif #endif
@ -209,8 +209,14 @@ uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() };
uint8_t const _desc_auto_hid_boot_mse_report[] = { HID_REPORT_MOUSE() }; uint8_t const _desc_auto_hid_boot_mse_report[] = { HID_REPORT_MOUSE() };
#endif #endif
/*------------- Generic (composite) Descriptor -------------*/
#if TUD_OPT_HID_GENERIC #if TUD_OPT_HID_GENERIC
// Report ID: 0 if there is only 1 report
// starting from 1 if there is multiple reports
#define _REPORT_ID_KBD
// TODO report ID // TODO report ID
uint8_t const _desc_auto_hid_generic_report[] = uint8_t const _desc_auto_hid_generic_report[] =
{ {