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

Better organize and name HID macros.

Browse Source
This commit is contained in:
László Monda
2017-03-07 22:11:18 +01:00
parent 264c5b671b
commit 15388640c8
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
right/src/usb_api.h
View File

@@ -39,13 +39,11 @@
// HID report item related constants // HID report item related constants
#define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01 #define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01
#define HID_RI_USAGE_PAGE_KEY_CODES 0x07
#define HID_RI_USAGE_PAGE_LEDS 0x08 #define HID_RI_USAGE_PAGE_LEDS 0x08
#define HID_RI_USAGE_PAGE_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_ID_CONSUMER_PAGE_CONSUMER_CONTROL 0x01
#define HID_RI_USAGE_ID_GENERIC_DESKTOP_PAGE_SYSTEM_CONTROL 0x80
#define HID_RI_USAGE_GENERIC_DESKTOP_POINTER 0x01 #define HID_RI_USAGE_GENERIC_DESKTOP_POINTER 0x01
#define HID_RI_USAGE_GENERIC_DESKTOP_MOUSE 0x02 #define HID_RI_USAGE_GENERIC_DESKTOP_MOUSE 0x02
#define HID_RI_USAGE_GENERIC_DESKTOP_JOYSTICK 0x04 #define HID_RI_USAGE_GENERIC_DESKTOP_JOYSTICK 0x04
@@ -56,13 +54,12 @@
#define HID_RI_USAGE_GENERIC_DESKTOP_Y 0x31 #define HID_RI_USAGE_GENERIC_DESKTOP_Y 0x31
#define HID_RI_USAGE_GENERIC_DESKTOP_WHEEL 0x38 #define HID_RI_USAGE_GENERIC_DESKTOP_WHEEL 0x38
#define HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER 0x48 #define HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER 0x48
#define HID_RI_USAGE_GENERIC_DESKTOP_SYSTEM_CONTROL 0x80
#define HID_RI_USAGE_CONSUMER_AC_PAN 0x0238 #define HID_RI_USAGE_CONSUMER_CONTROL 0x01
#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
#define HID_RI_COLLECTION_LOGICAL 0x02 #define HID_RI_COLLECTION_LOGICAL 0x02
#define HID_RI_USAGE_PAGE_KEY_CODES 0x07
#endif #endif

2
right/src/usb_descriptors/usb_descriptor_media_keyboard_report.c
View File

@@ -3,7 +3,7 @@
uint8_t UsbMediaKeyboardReportDescriptor[USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = { uint8_t UsbMediaKeyboardReportDescriptor[USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER), HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
HID_RI_USAGE(8, HID_RI_USAGE_ID_CONSUMER_PAGE_CONSUMER_CONTROL), HID_RI_USAGE(8, HID_RI_USAGE_CONSUMER_CONTROL),
HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION), HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
// Media Keys // Media Keys
HID_RI_LOGICAL_MINIMUM(8, 0x00), HID_RI_LOGICAL_MINIMUM(8, 0x00),

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

@@ -3,7 +3,7 @@
uint8_t UsbSystemKeyboardReportDescriptor[USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = { uint8_t UsbSystemKeyboardReportDescriptor[USB_SYSTEM_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_ID_GENERIC_DESKTOP_PAGE_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_LOGICAL_MINIMUM(8, 0x00),