Merge branch 'hathach:master' into master
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| /*  | ||||
| /* | ||||
|  * The MIT License (MIT) | ||||
|  * | ||||
|  * Copyright (c) 2019 Ha Thach (tinyusb.org) | ||||
| @@ -722,6 +722,7 @@ enum { | ||||
|   HID_USAGE_PAGE_MSR             = 0x8e, | ||||
|   HID_USAGE_PAGE_CAMERA          = 0x90, | ||||
|   HID_USAGE_PAGE_ARCADE          = 0x91, | ||||
|   HID_USAGE_PAGE_FIDO            = 0xF1D0, // FIDO alliance HID usage page | ||||
|   HID_USAGE_PAGE_VENDOR          = 0xFF00 // 0xFF00 - 0xFFFF | ||||
| }; | ||||
|  | ||||
| @@ -858,6 +859,14 @@ enum | ||||
|   HID_USAGE_CONSUMER_AC_PAN                            = 0x0238, | ||||
| }; | ||||
|  | ||||
| /// HID Usage Table: FIDO Alliance Page (0xF1D0) | ||||
| enum | ||||
| { | ||||
|   HID_USAGE_FIDO_U2FHID   = 0x01, // U2FHID usage for top-level collection | ||||
|   HID_USAGE_FIDO_DATA_IN  = 0x20, // Raw IN data report | ||||
|   HID_USAGE_FIDO_DATA_OUT = 0x21  // Raw OUT data report | ||||
| }; | ||||
|  | ||||
| /*-------------------------------------------------------------------- | ||||
|  * ASCII to KEYCODE Conversion | ||||
|  *  Expand to array of [128][2] (shift, keycode) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 tobozo
					tobozo