Cutieguwu/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-06-20 14:23:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Align Mouse USB descriptor (#26230)

Browse Source
This commit is contained in:
Joel Challis
2026-05-27 00:43:26 +01:00
committed by GitHub
parent d19204824d
commit 05c4322c65
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tmk_core/protocol/usb_descriptor.c
+4 -4
View File
@@ -202,13 +202,13 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
HID_RI_USAGE_PAGE(8, 0x0C),// Consumer HID_RI_USAGE_PAGE(8, 0x0C),// Consumer
HID_RI_USAGE(16, 0x0238), // AC Pan HID_RI_USAGE(16, 0x0238), // AC Pan
# ifndef WHEEL_EXTENDED_REPORT # ifndef WHEEL_EXTENDED_REPORT
HID_RI_LOGICAL_MINIMUM(8, -127), HID_RI_LOGICAL_MINIMUM(8, MOUSE_REPORT_HV_MIN),
HID_RI_LOGICAL_MAXIMUM(8, 127), HID_RI_LOGICAL_MAXIMUM(8, MOUSE_REPORT_HV_MAX),
HID_RI_REPORT_COUNT(8, 0x01), HID_RI_REPORT_COUNT(8, 0x01),
HID_RI_REPORT_SIZE(8, 0x08), HID_RI_REPORT_SIZE(8, 0x08),
# else # else
HID_RI_LOGICAL_MINIMUM(16, -32767), HID_RI_LOGICAL_MINIMUM(16, MOUSE_REPORT_HV_MIN),
HID_RI_LOGICAL_MAXIMUM(16, 32767), HID_RI_LOGICAL_MAXIMUM(16, MOUSE_REPORT_HV_MAX),
HID_RI_REPORT_COUNT(8, 0x01), HID_RI_REPORT_COUNT(8, 0x01),
HID_RI_REPORT_SIZE(8, 0x10), HID_RI_REPORT_SIZE(8, 0x10),
# endif # endif
tmk_core/protocol/vusb/vusb.c
+24 -24
View File
@@ -515,15 +515,15 @@ const PROGMEM uchar shared_hid_report[] = {
0x09, 0x30, // Usage (X) 0x09, 0x30, // Usage (X)
0x09, 0x31, // Usage (Y) 0x09, 0x31, // Usage (Y)
# ifndef MOUSE_EXTENDED_REPORT # ifndef MOUSE_EXTENDED_REPORT
0x15, 0x81, // Logical Minimum (-127) 0x15, MOUSE_REPORT_XY_MIN, // Logical Minimum (-127)
0x25, 0x7F, // Logical Maximum (127) 0x25, MOUSE_REPORT_XY_MAX, // Logical Maximum (127)
0x95, 0x02, // Report Count (2) 0x95, 0x02, // Report Count (2)
0x75, 0x08, // Report Size (8) 0x75, 0x08, // Report Size (8)
# else # else
0x16, 0x01, 0x80, // Logical Minimum (-32767) 0x16, 0x01, HID_VALUE_16(MOUSE_REPORT_XY_MIN), // Logical Minimum (-32767)
0x26, 0xFF, 0x7F, // Logical Maximum (32767) 0x26, 0xFF, HID_VALUE_16(MOUSE_REPORT_XY_MAX), // Logical Maximum (32767)
0x95, 0x02, // Report Count (2) 0x95, 0x02, // Report Count (2)
0x75, 0x10, // Report Size (16) 0x75, 0x10, // Report Size (16)
# endif # endif
0x81, 0x06, // Input (Data, Variable, Relative) 0x81, 0x06, // Input (Data, Variable, Relative)
@@ -548,15 +548,15 @@ const PROGMEM uchar shared_hid_report[] = {
// Vertical wheel (1 or 2 bytes) // Vertical wheel (1 or 2 bytes)
0x09, 0x38, // Usage (Wheel) 0x09, 0x38, // Usage (Wheel)
# ifndef WHEEL_EXTENDED_REPORT # ifndef WHEEL_EXTENDED_REPORT
0x15, 0x81, // Logical Minimum (-127) 0x15, MOUSE_REPORT_HV_MIN, // Logical Minimum (-127)
0x25, 0x7F, // Logical Maximum (127) 0x25, MOUSE_REPORT_HV_MAX, // Logical Maximum (127)
0x95, 0x01, // Report Count (1) 0x95, 0x01, // Report Count (1)
0x75, 0x08, // Report Size (8) 0x75, 0x08, // Report Size (8)
# else # else
0x16, 0x01, 0x80, // Logical Minimum (-32767) 0x16, 0x01, HID_VALUE_16(MOUSE_REPORT_HV_MIN), // Logical Minimum (-32767)
0x26, 0xFF, 0x7F, // Logical Maximum (32767) 0x26, 0xFF, HID_VALUE_16(MOUSE_REPORT_HV_MAX), // Logical Maximum (32767)
0x95, 0x01, // Report Count (1) 0x95, 0x01, // Report Count (1)
0x75, 0x10, // Report Size (16) 0x75, 0x10, // Report Size (16)
# endif # endif
0x81, 0x06, // Input (Data, Variable, Relative) 0x81, 0x06, // Input (Data, Variable, Relative)
@@ -564,15 +564,15 @@ const PROGMEM uchar shared_hid_report[] = {
0x05, 0x0C, // Usage Page (Consumer) 0x05, 0x0C, // Usage Page (Consumer)
0x0A, 0x38, 0x02, // Usage (AC Pan) 0x0A, 0x38, 0x02, // Usage (AC Pan)
# ifndef WHEEL_EXTENDED_REPORT # ifndef WHEEL_EXTENDED_REPORT
0x15, 0x81, // Logical Minimum (-127) 0x15, MOUSE_REPORT_HV_MIN, // Logical Minimum (-127)
0x25, 0x7F, // Logical Maximum (127) 0x25, MOUSE_REPORT_HV_MAX, // Logical Maximum (127)
0x95, 0x01, // Report Count (1) 0x95, 0x01, // Report Count (1)
0x75, 0x08, // Report Size (8) 0x75, 0x08, // Report Size (8)
# else # else
0x16, 0x01, 0x80, // Logical Minimum (-32767) 0x16, 0x01, HID_VALUE_16(MOUSE_REPORT_HV_MIN), // Logical Minimum (-32767)
0x26, 0xFF, 0x7F, // Logical Maximum (32767) 0x26, 0xFF, HID_VALUE_16(MOUSE_REPORT_HV_MAX), // Logical Maximum (32767)
0x95, 0x01, // Report Count (1) 0x95, 0x01, // Report Count (1)
0x75, 0x10, // Report Size (16) 0x75, 0x10, // Report Size (16)
# endif # endif
0x81, 0x06, // Input (Data, Variable, Relative) 0x81, 0x06, // Input (Data, Variable, Relative)