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

Make the system keyboard descriptor play nicely with OSX.

Browse Source
This commit is contained in:
László Monda
2017-10-26 18:22:37 +02:00
parent 5642ab29a1
commit 55e4997ea2
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
right/src/usb_descriptors/usb_descriptor_system_keyboard_report.c
View File

@@ -6,12 +6,13 @@ uint8_t UsbSystemKeyboardReportDescriptor[USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_
HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_SYSTEM_CONTROL), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_SYSTEM_CONTROL),
HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION), HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
// System key // System key
HID_RI_LOGICAL_MINIMUM(8, 0x00), HID_RI_REPORT_SIZE(8, 2),
HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
HID_RI_USAGE_MINIMUM(8, 0x00),
HID_RI_USAGE_MAXIMUM(8, 0xFF),
HID_RI_REPORT_COUNT(8, USB_SYSTEM_KEYBOARD_MAX_KEYS), HID_RI_REPORT_COUNT(8, USB_SYSTEM_KEYBOARD_MAX_KEYS),
HID_RI_REPORT_SIZE(8, 0x08), HID_RI_LOGICAL_MINIMUM(8, 1),
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), HID_RI_LOGICAL_MAXIMUM(8, 3),
HID_RI_USAGE(8, 0x82),
HID_RI_USAGE(8, 0x81),
HID_RI_USAGE(8, 0x83),
HID_RI_INPUT(8, HID_IOF_NO_PREFERRED_STATE | HID_IOF_NULLSTATE),
HID_RI_END_COLLECTION(0), HID_RI_END_COLLECTION(0),
}; };

2
right/src/usb_descriptors/usb_descriptor_system_keyboard_report.h
View File

@@ -3,7 +3,7 @@
// Macros: // Macros:
#define USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH 21 #define USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH 23
#define USB_SYSTEM_KEYBOARD_MAX_KEYS 1 #define USB_SYSTEM_KEYBOARD_MAX_KEYS 1
// Variables: // Variables: