diff options
| author | QMK Bot <hello@qmk.fm> | 2024-10-15 14:06:17 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2024-10-15 14:06:17 +0000 |
| commit | 7e53bb9965fab0695513a779ab0192842e849f55 (patch) | |
| tree | 9fbdde859091e8a11186da997d1e71c8734ddb26 /tmk_core | |
| parent | 13581820b896dd711266dba2e7c031169c45311b (diff) | |
| parent | 85a7627641cbbc71de1a89b0346ee7d92d4fb394 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.c | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/vusb/vusb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c index 0ac02bb19f..e7d12a07d9 100644 --- a/tmk_core/protocol/usb_descriptor.c +++ b/tmk_core/protocol/usb_descriptor.c @@ -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), diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c index 886ee2375e..c269ff2b91 100644 --- a/tmk_core/protocol/vusb/vusb.c +++ b/tmk_core/protocol/vusb/vusb.c @@ -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 |