rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity

hid joystick: factor out min/max range from report items

Browse Source
This commit is contained in:
Stacey Sheldon 2012-08-10 23:29:34 -04:00
parent 5902c19cc3
commit 07fde38887
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flight/PiOS/Common/pios_usb_desc_hid_cdc.c
View File

@ -51,7 +51,7 @@ static const struct usb_device_desc device_desc = {
.bNumConfigurations = 1, .bNumConfigurations = 1,
}; };
static const uint8_t hid_report_desc[103] = { static const uint8_t hid_report_desc[89] = {
HID_GLOBAL_ITEM_2 (HID_TAG_GLOBAL_USAGE_PAGE), HID_GLOBAL_ITEM_2 (HID_TAG_GLOBAL_USAGE_PAGE),
0x9C, 0xFF, /* Usage Page 0xFF9C (Vendor Defined) */ 0x9C, 0xFF, /* Usage Page 0xFF9C (Vendor Defined) */
HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE), HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE),
@ -102,6 +102,11 @@ static const uint8_t hid_report_desc[103] = {
HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE), HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE),
0x04, /* Usage ID 0x0004 (Joystick) */ 0x04, /* Usage ID 0x0004 (Joystick) */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_LOGICAL_MIN),
0x00, /* Values range from min = 0x00 */
HID_GLOBAL_ITEM_4 (HID_TAG_GLOBAL_LOGICAL_MAX),
0xFF, 0xFF, 0x00, 0x00, /* Values range to max = 0x0000FFFF */
HID_MAIN_ITEM_1 (HID_TAG_MAIN_COLLECTION), HID_MAIN_ITEM_1 (HID_TAG_MAIN_COLLECTION),
0x01, /* Application */ 0x01, /* Application */
HID_MAIN_ITEM_1 (HID_TAG_MAIN_COLLECTION), HID_MAIN_ITEM_1 (HID_TAG_MAIN_COLLECTION),
@ -115,10 +120,6 @@ static const uint8_t hid_report_desc[103] = {
0x30, /* Usage ID 0x00010030 (Generic Desktop: X) */ 0x30, /* Usage ID 0x00010030 (Generic Desktop: X) */
HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE), HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE),
0x31, /* Usage ID 0x00010031 (Generic Desktop: Y) */ 0x31, /* Usage ID 0x00010031 (Generic Desktop: Y) */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_LOGICAL_MIN),
0x00, /* Values range from min = 0x00 */
HID_GLOBAL_ITEM_4 (HID_TAG_GLOBAL_LOGICAL_MAX),
0xFF, 0xFF, 0x00, 0x00, /* Values range to max = 0x0000FFFF */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_SIZE), HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_SIZE),
0x10, /* 16 bits wide */ 0x10, /* 16 bits wide */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_CNT), HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_CNT),
@ -132,10 +133,6 @@ static const uint8_t hid_report_desc[103] = {
0x32, /* Usage ID 0x00010032 (Generic Desktop: Z) */ 0x32, /* Usage ID 0x00010032 (Generic Desktop: Z) */
HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE), HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE),
0x33, /* Usage ID 0x00010031 (Generic Desktop: Rx) */ 0x33, /* Usage ID 0x00010031 (Generic Desktop: Rx) */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_LOGICAL_MIN),
0x00, /* Values range from min = 0x00 */
HID_GLOBAL_ITEM_4 (HID_TAG_GLOBAL_LOGICAL_MAX),
0xFF, 0xFF, 0x00, 0x00, /* Values range to max = 0x0000FFFF */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_SIZE), HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_SIZE),
0x10, /* 16 bits wide */ 0x10, /* 16 bits wide */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_CNT), HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_CNT),
@ -153,10 +150,6 @@ static const uint8_t hid_report_desc[103] = {
0x36, /* Usage ID 0x00010036 (Generic Desktop: Slider) */ 0x36, /* Usage ID 0x00010036 (Generic Desktop: Slider) */
HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE), HID_LOCAL_ITEM_1 (HID_TAG_LOCAL_USAGE),
0x37, /* Usage ID 0x00010037 (Generic Desktop: Dial) */ 0x37, /* Usage ID 0x00010037 (Generic Desktop: Dial) */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_LOGICAL_MIN),
0x00, /* Values range from min = 0x00 */
HID_GLOBAL_ITEM_4 (HID_TAG_GLOBAL_LOGICAL_MAX),
0xFF, 0xFF, 0x00, 0x00, /* Values range to max = 0x0000FFFF */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_SIZE), HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_SIZE),
0x10, /* 16 bits wide */ 0x10, /* 16 bits wide */
HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_CNT), HID_GLOBAL_ITEM_1 (HID_TAG_GLOBAL_REPORT_CNT),
@ -168,7 +161,7 @@ static const uint8_t hid_report_desc[103] = {
HID_MAIN_ITEM_0 (HID_TAG_MAIN_ENDCOLLECTION), HID_MAIN_ITEM_0 (HID_TAG_MAIN_ENDCOLLECTION),
/* 103 bytes to here */ /* 89 bytes to here */
}; };
struct usb_config_hid_cdc { struct usb_config_hid_cdc {