laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Merge pull request #116 from mbanth/feature/hid_gpi_to_evt

Browse Source 
Feature/hid gpi to evt
This commit is contained in:
oscarbailey-xmos
2020-01-20 09:48:53 +00:00
committed by GitHub
parent 27bf0e4fc4 dac71e8b38
commit b324bb04c8
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.rst
View File

@@ -17,6 +17,9 @@ lib_xua Change Log
customer customer
* CHANGE: HID interface for user to set and clear events from global * CHANGE: HID interface for user to set and clear events from global
variable to function variable to function
* CHANGE HID report descriptor to use generic events instead of GPI
events, to report Key-phrase detection as AC Search, and to report end-call
detection as AC Stop
0.2.1 0.2.1
----- -----

22
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2011-2019, XMOS Ltd, All rights reserved // Copyright (c) 2011-2020, XMOS Ltd, All rights reserved
/** /**
* @file xua_ep0_descriptors.h * @file xua_ep0_descriptors.h
* @brief Device Descriptors * @brief Device Descriptors
@@ -569,13 +569,21 @@ unsigned char hidReportDescriptor[] = /* Voice Command usage as per request #HUT
0xa1, 0x01, /* Collection (Application) */ 0xa1, 0x01, /* Collection (Application) */
0x75, 0x01, /* Report Size (1) */ 0x75, 0x01, /* Report Size (1) */
0x95, 0x04, /* Report Count (4) */ 0x95, 0x04, /* Report Count (4) */
0x05, 0x07, /* Usage Page (Key Codes) */
0x19, 0x70, /* Usage Minimum (Keyboard F21) */
0x29, 0x73, /* Usage Maximum (Keyboard F24) */
0x15, 0x00, /* Logical Minimum (0) */ 0x15, 0x00, /* Logical Minimum (0) */
0x25, 0x01, /* Logical Maximum (1) */ 0x25, 0x00, /* Logical Maximum (0) */
0x81, 0x02, /* Input (Data, Var, Abs, No Wrap, Lin, Pref, No Nul) */
0x81, 0x01, /* Input (Cnst, Ary, Abs, No Wrap, Lin, Pref, No Nul) */ 0x81, 0x01, /* Input (Cnst, Ary, Abs, No Wrap, Lin, Pref, No Nul) */
0x95, 0x01, /* Report Count (1) */
0x25, 0x01, /* Logical Maximum (1) */
0x05, 0x0C, /* Usage Page (Consumer) */
0x0a, 0x21, 0x02, /* Usage (AC Search) */
0x81, 0x02, /* Input (Data, Var, Abs, No Wrap, Lin, Pref, No Nul) */
0x0a, 0x26, 0x02, /* Usage (AC Stop) */
0x81, 0x02, /* Input (Data, Var, Abs, No Wrap, Lin, Pref, No Nul) */
0x95, 0x02, /* Report Count (2) */
0x05, 0x07, /* Usage Page (Key Codes) */
0x19, 0x72, /* Usage Minimum (Keyboard F23) */
0x29, 0x73, /* Usage Maximum (Keyboard F24) */
0x81, 0x02, /* Input (Data, Var, Abs, No Wrap, Lin, Pref, No Nul) */
0xc0 /* End collection (Application) */ 0xc0 /* End collection (Application) */
}; };
#endif #endif
@@ -2882,7 +2890,7 @@ unsigned char cfgDesc_Audio1[] =
0x00, /* 4 bCountryCode */ 0x00, /* 4 bCountryCode */
0x01, /* 5 bNumDescriptors */ 0x01, /* 5 bNumDescriptors */
0x22, /* 6 bDescriptorType[0] (Report) */ 0x22, /* 6 bDescriptorType[0] (Report) */
0x19, /* 7 wDescriptorLength[0] */ 0x2B, /* 7 wDescriptorLength[0] */
0x00, /* 8 wDescriptorLength[0] */ 0x00, /* 8 wDescriptorLength[0] */
/* HID Endpoint descriptor (IN) */ /* HID Endpoint descriptor (IN) */