Merge branch 'develop' into feature/pendragon

This commit is contained in:
Michael Banther
2019-11-06 15:20:36 +00:00
committed by GitHub
3 changed files with 8 additions and 2 deletions

View File

@@ -1,6 +1,11 @@
lib_xua Change Log lib_xua Change Log
================== ==================
0.2.1
-----
* HOTFIX: Fix descriptors for XUA_ADAPTIVE
0.2.0_demo 0.2.0_demo
---------- ----------
* ADDED: UAC1 HID support with simulated Voice Command detection reported * ADDED: UAC1 HID support with simulated Voice Command detection reported

View File

@@ -1,4 +1,4 @@
VERSION = 0.2.0 VERSION = 0.2.1
DEPENDENT_MODULES = lib_logging(>=3.0.0) \ DEPENDENT_MODULES = lib_logging(>=3.0.0) \
lib_xassert(>=4.0.0) \ lib_xassert(>=4.0.0) \

View File

@@ -1639,7 +1639,8 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
.bmAttributes = ISO_EP_ATTRIBUTES_ADAPTIVE, /* (bitmap) */ .bmAttributes = ISO_EP_ATTRIBUTES_ADAPTIVE, /* (bitmap) */
#else #else
.bmAttributes = ISO_EP_ATTRIBUTES_ASYNCH, /* (bitmap) */ .bmAttributes = ISO_EP_ATTRIBUTES_ASYNCH, /* (bitmap) */
#endif .wMaxPacketSize = HS_STREAM_FORMAT_OUTPUT_3_MAXPACKETSIZE, #endif
.wMaxPacketSize = HS_STREAM_FORMAT_OUTPUT_3_MAXPACKETSIZE,
.bInterval = 1, .bInterval = 1,
}, },