uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use LUFA's keyboard report descriptor.

Browse Source
This commit is contained in:
László Monda
2016-03-01 18:28:06 +01:00
parent a72d95dad1
commit ab2cb911d4
3 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
right/usb_descriptor_keyboard_report.c
View File

@@ -6,73 +6,39 @@ uint8_t UsbKeyboardReportDescriptor[USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
HID_RI_USAGE(8, HID_RI_USAGE_KEYBOARD),
HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
0x75U, 0x01U, // Report Size (1U)
0x95U, 0x08U, // Report Count (8U)
0x05U, 0x07U, // Usage Page (Key Codes)
0x19U, 0xE0U, // Usage Minimum (224U)
0x29U, 0xE7U, // Usage Maximum (231U)
0x15U, 0x00U, // Logical Minimum (0U)
0x25U, 0x01U, // Logical Maximum (1U)
0x81U, 0x02U, // Input (Data, Variable, Absolute) modifier byte
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
HID_RI_USAGE_MINIMUM(8, 0xE0),
HID_RI_USAGE_MAXIMUM(8, 0xE7),
HID_RI_LOGICAL_MINIMUM(8, 0x00),
HID_RI_LOGICAL_MAXIMUM(8, 0x01),
HID_RI_REPORT_SIZE(8, 0x01),
HID_RI_REPORT_COUNT(8, 0x08),
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
0x95U, 0x01U, // Report count (1U)
0x75U, 0x08U, // Report Size (8U)
0x81U, 0x01U, // Input (Constant), reserved byte
0x95U, 0x05U, // Report count (5U)
0x75U, 0x01U, // Report Size (1U)
HID_RI_REPORT_COUNT(8, 0x01),
HID_RI_REPORT_SIZE(8, 0x08),
HID_RI_INPUT(8, HID_IOF_CONSTANT),
0x05U, 0x01U, // Usage Page (Page# for LEDs)
0x19U, 0x01U, // Usage Minimum (1U)
0x29U, 0x05U, // Usage Maximum (5U)
0x91U, 0x02U, // Output (Data, Variable, Absolute) LED report
0x95U, 0x01U, // Report count (1U)
0x75U, 0x03U, // Report Size (3U)
0x91U, 0x01U, // Output (Constant), LED report padding
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_LEDS),
HID_RI_USAGE_MINIMUM(8, 0x01),
HID_RI_USAGE_MAXIMUM(8, 0x05),
HID_RI_REPORT_COUNT(8, 0x05),
HID_RI_REPORT_SIZE(8, 0x01),
HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
0x95U, 0x06U, // Report count (6U)
0x75U, 0x08U, // Report Size (8U)
0x15U, 0x00U, // Logical Minimum (0U)
0x25U, 0xFFU, // Logical Maximum (255U)
0x05U, 0x07U, // Usage Page (Key Codes)
0x19U, 0x00U, // Usage Minimum (0U)
0x29U, 0xFFU, // Usage Maximum (255U)
HID_RI_REPORT_COUNT(8, 0x01),
HID_RI_REPORT_SIZE(8, 0x03),
HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
HID_RI_LOGICAL_MINIMUM(8, 0x00),
HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
HID_RI_USAGE_MINIMUM(8, 0x00),
HID_RI_USAGE_MAXIMUM(8, 0xFF),
HID_RI_REPORT_COUNT(8, USB_KEYBOARD_MAX_KEYS),
HID_RI_REPORT_SIZE(8, 0x08),
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
0x81U, 0x00U, // Input (Data, Array), Key arrays (6U bytes)
HID_RI_END_COLLECTION(0),
};
/*
#define HID_DESCRIPTOR_KEYBOARD(MaxKeys) \
//HID_RI_USAGE_PAGE(8, 0x01), \
//HID_RI_USAGE(8, 0x06), \
//HID_RI_COLLECTION(8, 0x01), \
HID_RI_USAGE_PAGE(8, 0x07), \
HID_RI_USAGE_MINIMUM(8, 0xE0), \
HID_RI_USAGE_MAXIMUM(8, 0xE7), \
HID_RI_LOGICAL_MINIMUM(8, 0x00), \
HID_RI_LOGICAL_MAXIMUM(8, 0x01), \
HID_RI_REPORT_SIZE(8, 0x01), \
HID_RI_REPORT_COUNT(8, 0x08), \
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
HID_RI_REPORT_COUNT(8, 0x01), \
HID_RI_REPORT_SIZE(8, 0x08), \
HID_RI_INPUT(8, HID_IOF_CONSTANT), \
HID_RI_USAGE_PAGE(8, 0x08), \
HID_RI_USAGE_MINIMUM(8, 0x01), \
HID_RI_USAGE_MAXIMUM(8, 0x05), \
HID_RI_REPORT_COUNT(8, 0x05), \
HID_RI_REPORT_SIZE(8, 0x01), \
HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
HID_RI_REPORT_COUNT(8, 0x01), \
HID_RI_REPORT_SIZE(8, 0x03), \
HID_RI_OUTPUT(8, HID_IOF_CONSTANT), \
HID_RI_LOGICAL_MINIMUM(8, 0x00), \
HID_RI_LOGICAL_MAXIMUM(8, 0xFF), \
HID_RI_USAGE_PAGE(8, 0x07), \
HID_RI_USAGE_MINIMUM(8, 0x00), \
HID_RI_USAGE_MAXIMUM(8, 0xFF), \
HID_RI_REPORT_COUNT(8, MaxKeys), \
HID_RI_REPORT_SIZE(8, 0x08), \
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), \
//HID_RI_END_COLLECTION(0)
*/

1
right/usb_descriptor_keyboard_report.h
View File

@@ -4,6 +4,7 @@
// Macros:
#define USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH (63U)
#define USB_KEYBOARD_MAX_KEYS (6U)
// Variables:

3
right/usb_report_item_macros.h
View File

@@ -9,9 +9,12 @@
// Macros:
#define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01
#define HID_RI_USAGE_PAGE_LEDS 0x08
#define HID_RI_USAGE_KEYBOARD 0x06
#define HID_RI_COLLECTION_APPLICATION 0x01
#define HID_RI_USAGE_PAGE_KEY_CODES 0x07
#endif