diff options
Diffstat (limited to 'Demos/Device/ClassDriver/GenericHID/Descriptors.c')
| -rw-r--r-- | Demos/Device/ClassDriver/GenericHID/Descriptors.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c index dd4593272..0716ae9ca 100644 --- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c +++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c @@ -45,22 +45,23 @@ */ USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] = { - 0x06, 0x9c, 0xff, /* Usage Page (Vendor Defined) */ - 0x09, 0x01, /* Usage (Vendor Defined) */ - 0xa1, 0x01, /* Collection (Vendor Defined) */ - 0x09, 0x02, /* Usage (Vendor Defined) */ - 0x75, 0x08, /* Report Size (8) */ - 0x95, GENERIC_REPORT_SIZE, /* Report Count (GENERIC_REPORT_SIZE) */ - 0x15, 0x80, /* Logical Minimum (-128) */ - 0x25, 0x7F, /* Logical Maximum (127) */ - 0x81, 0x02, /* Input (Data, Variable, Absolute) */ - 0x09, 0x03, /* Usage (Vendor Defined) */ - 0x75, 0x08, /* Report Size (8) */ - 0x95, GENERIC_REPORT_SIZE, /* Report Count (GENERIC_REPORT_SIZE) */ - 0x15, 0x00, /* Logical Minimum (0) */ - 0x25, 0xff, /* Logical Maximum (255) */ - 0x91, 0x02, /* Output (Data, Variable, Absolute) */ - 0xc0 /* End Collection */ + HID_RI_USAGE_PAGE(16), 0x00, 0xFF, /* Vendor Page 1 */ + HID_RI_USAGE(8), 0x01, /* Vendor Usage 1 */ + HID_RI_COLLECTION(8), 0x01, /* Vendor Usage 1 */ + HID_RI_USAGE(8), 0x02, /* Vendor Usage 2 */ + HID_RI_LOGICAL_MINIMUM(8), 0x00, + HID_RI_LOGICAL_MAXIMUM(8), 0xFF, + HID_RI_REPORT_SIZE(8), 8, + HID_RI_REPORT_COUNT(8), GENERIC_REPORT_SIZE, + HID_RI_INPUT(8), (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE), + + HID_RI_USAGE(8), 0x03, /* Vendor Usage 3 */ + HID_RI_LOGICAL_MINIMUM(8), 0x00, + HID_RI_LOGICAL_MAXIMUM(8), 0xFF, + HID_RI_REPORT_SIZE(8), 8, + HID_RI_REPORT_COUNT(8), GENERIC_REPORT_SIZE, + HID_RI_OUTPUT(8), (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE), + HID_RI_END_COLLECTION(0), }; /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall |