diff options
| author | Nick Brassel <nick@tzarc.org> | 2024-11-27 21:29:12 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2024-11-27 21:29:12 +1100 |
| commit | 9f76541b29056150cf57d69569a14a59e13995c7 (patch) | |
| tree | 66c7398d873fcda88aebe3090603aefe045ff52e /tmk_core/protocol/report.h | |
| parent | 57be4871616ee9a8fe042f6186010d436ec7d4b1 (diff) | |
| parent | eb04b94eecbb9b3e64ca9c74f937b5f762440b17 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'tmk_core/protocol/report.h')
| -rw-r--r-- | tmk_core/protocol/report.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h index 0e4f6e9def..d854f51d5c 100644 --- a/tmk_core/protocol/report.h +++ b/tmk_core/protocol/report.h @@ -199,6 +199,12 @@ typedef int16_t mouse_xy_report_t; typedef int8_t mouse_xy_report_t; #endif +#ifdef WHEEL_EXTENDED_REPORT +typedef int16_t mouse_hv_report_t; +#else +typedef int8_t mouse_hv_report_t; +#endif + typedef struct { #ifdef MOUSE_SHARED_EP uint8_t report_id; @@ -210,8 +216,8 @@ typedef struct { #endif mouse_xy_report_t x; mouse_xy_report_t y; - int8_t v; - int8_t h; + mouse_hv_report_t v; + mouse_hv_report_t h; } PACKED report_mouse_t; typedef struct { @@ -240,6 +246,11 @@ typedef struct { joystick_axis_t axes[JOYSTICK_AXIS_COUNT]; #endif +#ifdef JOYSTICK_HAS_HAT + int8_t hat : 4; + uint8_t reserved : 4; +#endif + #if JOYSTICK_BUTTON_COUNT > 0 uint8_t buttons[(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1]; #endif |