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

Feature the name of the relevant usage pages in usage names.

Browse Source
This commit is contained in:
László Monda
2016-03-02 16:11:30 +01:00
parent 9140b68bd4
commit ee484d6b47
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
right/usb_descriptor_keyboard_report.c
View File

@@ -4,7 +4,7 @@
uint8_t UsbKeyboardReportDescriptor[USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = { uint8_t UsbKeyboardReportDescriptor[USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP), HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
HID_RI_USAGE(8, HID_RI_USAGE_KEYBOARD), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_KEYBOARD),
HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION), HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
// Modifiers // Modifiers

18
right/usb_descriptor_mouse_report.c
View File

@@ -4,13 +4,13 @@
uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = { uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP), HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
HID_RI_USAGE(8, HID_RI_USAGE_MOUSE), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_MOUSE),
HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION), HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
HID_RI_USAGE(8, HID_RI_USAGE_POINTER), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_POINTER),
HID_RI_COLLECTION(8, HID_RI_COLLECTION_PHYSICAL), HID_RI_COLLECTION(8, HID_RI_COLLECTION_PHYSICAL),
// Mouse buttons // Mouse buttons
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_MOUSE_BUTTONS), HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_BUTTONS),
HID_RI_USAGE_MINIMUM(8, 0x01), HID_RI_USAGE_MINIMUM(8, 0x01),
HID_RI_USAGE_MAXIMUM(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS), HID_RI_USAGE_MAXIMUM(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS),
HID_RI_LOGICAL_MINIMUM(8, 0x00), HID_RI_LOGICAL_MINIMUM(8, 0x00),
@@ -26,8 +26,8 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
// Mouse X and Y coordinates // Mouse X and Y coordinates
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP), HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
HID_RI_USAGE(8, HID_RI_USAGE_X), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_X),
HID_RI_USAGE(8, HID_RI_USAGE_Y), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_Y),
HID_RI_LOGICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE), HID_RI_LOGICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE),
HID_RI_LOGICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE), HID_RI_LOGICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE),
HID_RI_PHYSICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_PHYSICAL_VALUE), HID_RI_PHYSICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_PHYSICAL_VALUE),
@@ -39,7 +39,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL), HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
// Vertical wheel resolution multiplier // Vertical wheel resolution multiplier
HID_RI_USAGE(8, HID_RI_USAGE_RESOLUTION_MULTIPLIER), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER),
HID_RI_LOGICAL_MINIMUM(8, 0x00), HID_RI_LOGICAL_MINIMUM(8, 0x00),
HID_RI_LOGICAL_MAXIMUM(8, 0x01), HID_RI_LOGICAL_MAXIMUM(8, 0x01),
HID_RI_PHYSICAL_MINIMUM(8, 0x01), HID_RI_PHYSICAL_MINIMUM(8, 0x01),
@@ -50,7 +50,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
// Vertical wheel // Vertical wheel
HID_RI_USAGE(8, HID_RI_USAGE_WHEEL), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_WHEEL),
HID_RI_LOGICAL_MINIMUM(8, -127), HID_RI_LOGICAL_MINIMUM(8, -127),
HID_RI_LOGICAL_MAXIMUM(8, 127), HID_RI_LOGICAL_MAXIMUM(8, 127),
HID_RI_PHYSICAL_MINIMUM(8, 0x00), HID_RI_PHYSICAL_MINIMUM(8, 0x00),
@@ -62,7 +62,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL), HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
// Horizontal wheel resolution multiplier // Horizontal wheel resolution multiplier
HID_RI_USAGE(8, HID_RI_USAGE_RESOLUTION_MULTIPLIER), HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER),
HID_RI_POP(0), HID_RI_POP(0),
HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
@@ -74,7 +74,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
// Horizontal wheel // Horizontal wheel
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER), HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
HID_RI_USAGE(16, HID_RI_USAGE_AC_PAN), HID_RI_USAGE(16, HID_RI_USAGE_CONSUMER_AC_PAN),
HID_RI_LOGICAL_MINIMUM(8, -127), HID_RI_LOGICAL_MINIMUM(8, -127),
HID_RI_LOGICAL_MAXIMUM(8, 127), HID_RI_LOGICAL_MAXIMUM(8, 127),
HID_RI_REPORT_SIZE(8, 0x08), HID_RI_REPORT_SIZE(8, 0x08),

22
right/usb_report_item_macros.h
View File

@@ -10,18 +10,20 @@
#define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01 #define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01
#define HID_RI_USAGE_PAGE_LEDS 0x08 #define HID_RI_USAGE_PAGE_LEDS 0x08
#define HID_RI_USAGE_PAGE_MOUSE_BUTTONS 0x09 #define HID_RI_USAGE_PAGE_BUTTONS 0x09
#define HID_RI_USAGE_PAGE_CONSUMER 0x0C #define HID_RI_USAGE_PAGE_CONSUMER 0x0C
#define HID_RI_USAGE_POINTER 0x01 #define HID_RI_USAGE_GENERIC_DESKTOP_POINTER 0x01
#define HID_RI_USAGE_MOUSE 0x02 #define HID_RI_USAGE_GENERIC_DESKTOP_MOUSE 0x02
#define HID_RI_USAGE_JOYSTICK 0x04 #define HID_RI_USAGE_GENERIC_DESKTOP_JOYSTICK 0x04
#define HID_RI_USAGE_KEYBOARD 0x06 #define HID_RI_USAGE_GENERIC_DESKTOP_GAMEPAD 0x05
#define HID_RI_USAGE_X 0x30 #define HID_RI_USAGE_GENERIC_DESKTOP_KEYBOARD 0x06
#define HID_RI_USAGE_Y 0x31 #define HID_RI_USAGE_GENERIC_DESKTOP_X 0x30
#define HID_RI_USAGE_WHEEL 0x38 #define HID_RI_USAGE_GENERIC_DESKTOP_Y 0x31
#define HID_RI_USAGE_RESOLUTION_MULTIPLIER 0x48 #define HID_RI_USAGE_GENERIC_DESKTOP_WHEEL 0x38
#define HID_RI_USAGE_AC_PAN 0x0238 #define HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER 0x48
#define HID_RI_USAGE_CONSUMER_AC_PAN 0x0238
#define HID_RI_COLLECTION_PHYSICAL 0x00 #define HID_RI_COLLECTION_PHYSICAL 0x00
#define HID_RI_COLLECTION_APPLICATION 0x01 #define HID_RI_COLLECTION_APPLICATION 0x01