mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-07-19 11:55:17 +02:00
Code Issues Projects Releases Wiki Activity

Update tmk_core/protocol/usb_descriptor.c

Browse Source 
Co-Authored-By: Ryan <fauxpark@gmail.com>
This commit is contained in:
a-chol 2020-03-22 11:09:30 +01:00 committed by a-chol
parent 86853a4110
commit c6c01f9eff
1 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
tmk_core/protocol/usb_descriptor.c
View File

@ -282,57 +282,56 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
#if JOYSTICK_AXES_COUNT == 0 && JOYSTICK_BUTTON_COUNT == 0 #if JOYSTICK_AXES_COUNT == 0 && JOYSTICK_BUTTON_COUNT == 0
#error Need at least one axis or button for joystick #error Need at least one axis or button for joystick
#endif #endif
const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = {
{ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */ HID_RI_USAGE(8, 0x04), // Joystick
HID_RI_USAGE(8, 0x04), /* Joystick */ HID_RI_COLLECTION(8, 0x01), // Application
HID_RI_COLLECTION(8, 0x01), /* Application */ HID_RI_COLLECTION(8, 0x00), // Physical
HID_RI_COLLECTION(8, 0x00), /* Physical */ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */ # if JOYSTICK_AXES_COUNT >= 1
#if JOYSTICK_AXES_COUNT >= 1 HID_RI_USAGE(8, 0x30), // X
HID_RI_USAGE(8, 0x30), // USAGE (X) # endif
#endif # if JOYSTICK_AXES_COUNT >= 2
#if JOYSTICK_AXES_COUNT >= 2 HID_RI_USAGE(8, 0x31), // Y
HID_RI_USAGE(8, 0x31), // USAGE (Y) # endif
#endif # if JOYSTICK_AXES_COUNT >= 3
#if JOYSTICK_AXES_COUNT >= 3 HID_RI_USAGE(8, 0x32), // Z
HID_RI_USAGE(8, 0x32), // USAGE (Z) # endif
#endif # if JOYSTICK_AXES_COUNT >= 4
#if JOYSTICK_AXES_COUNT >= 4 HID_RI_USAGE(8, 0x33), // Rx
HID_RI_USAGE(8, 0x33), // USAGE (RX) # endif
#endif # if JOYSTICK_AXES_COUNT >= 5
#if JOYSTICK_AXES_COUNT >= 5 HID_RI_USAGE(8, 0x34), // Ry
HID_RI_USAGE(8, 0x34), // USAGE (RY) # endif
#endif # if JOYSTICK_AXES_COUNT >= 6
#if JOYSTICK_AXES_COUNT >= 6 HID_RI_USAGE(8, 0x35), // Rz
HID_RI_USAGE(8, 0x35), // USAGE (RZ) # endif
#endif # if JOYSTICK_AXES_COUNT >= 1
#if JOYSTICK_AXES_COUNT >= 1 HID_RI_LOGICAL_MINIMUM(8, -127),
HID_RI_LOGICAL_MINIMUM(8, -127), HID_RI_LOGICAL_MAXIMUM(8, 127),
HID_RI_LOGICAL_MAXIMUM(8, 127), HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT), HID_RI_REPORT_SIZE(8, 0x08),
HID_RI_REPORT_SIZE(8, 0x08), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), # endif
#endif
#if JOYSTICK_BUTTON_COUNT >= 1 # if JOYSTICK_BUTTON_COUNT >= 1
HID_RI_USAGE_PAGE(8, 0x09), /* Button */ HID_RI_USAGE_PAGE(8, 0x09), // Button
HID_RI_USAGE_MINIMUM(8, 0x01), /* Button 1 */ HID_RI_USAGE_MINIMUM(8, 0x01),
HID_RI_USAGE_MAXIMUM(8, JOYSTICK_BUTTON_COUNT), /* Button max */ HID_RI_USAGE_MAXIMUM(8, JOYSTICK_BUTTON_COUNT),
HID_RI_LOGICAL_MINIMUM(8, 0x00), HID_RI_LOGICAL_MINIMUM(8, 0x00),
HID_RI_LOGICAL_MAXIMUM(8, 0x01), HID_RI_LOGICAL_MAXIMUM(8, 0x01),
HID_RI_REPORT_COUNT(8, JOYSTICK_BUTTON_COUNT), HID_RI_REPORT_COUNT(8, JOYSTICK_BUTTON_COUNT),
HID_RI_REPORT_SIZE(8, 0x01), HID_RI_REPORT_SIZE(8, 0x01),
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
#if (JOYSTICK_BUTTON_COUNT % 8) != 0 # if (JOYSTICK_BUTTON_COUNT % 8) != 0
HID_RI_REPORT_SIZE(8, 0x01), HID_RI_REPORT_COUNT(8, 8 - (JOYSTICK_BUTTON_COUNT % 8)),
HID_RI_REPORT_COUNT(8, 8 - (JOYSTICK_BUTTON_COUNT % 8)), HID_RI_REPORT_SIZE(8, 0x01),
HID_RI_INPUT(8, HID_IOF_CONSTANT), HID_RI_INPUT(8, HID_IOF_CONSTANT),
#endif # endif
#endif # endif
HID_RI_END_COLLECTION(0), HID_RI_END_COLLECTION(0),
HID_RI_END_COLLECTION(0), HID_RI_END_COLLECTION(0)
}; };
#endif #endif