Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						7e53bb9965
					
				| @ -305,7 +305,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = { | ||||
|             HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF), | ||||
|             HID_RI_REPORT_COUNT(8, 0x02), | ||||
|             HID_RI_REPORT_SIZE(8, 0x10), | ||||
|             HID_RI_UNIT(8, 0x33),          // Inch, English Linear
 | ||||
|             HID_RI_UNIT(8, 0x13),          // Inch, English Linear
 | ||||
|             HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
 | ||||
|             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), | ||||
|         HID_RI_END_COLLECTION(0), | ||||
|  | ||||
| @ -673,7 +673,7 @@ const PROGMEM uchar shared_hid_report[] = { | ||||
|     0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
 | ||||
|     0x95, 0x02,       //     Report Count (2)
 | ||||
|     0x75, 0x10,       //     Report Size (16)
 | ||||
|     0x65, 0x33,       //     Unit (Inch, English Linear)
 | ||||
|     0x65, 0x13,       //     Unit (Inch, English Linear)
 | ||||
|     0x55, 0x0E,       //     Unit Exponent (-2)
 | ||||
|     0x81, 0x02,       //     Input (Data, Variable, Absolute)
 | ||||
|     0xC0,             //   End Collection
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user