diff options
| author | Ryan <fauxpark@gmail.com> | 2022-10-13 10:28:49 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 10:28:49 +1100 |
| commit | 2078a56369af376e3275f02e21d48ab6cc39bc36 (patch) | |
| tree | dbbc7e6ba8c81b008da08addd57d5969929c9936 /tmk_core/protocol/usb_descriptor.h | |
| parent | cd5b2e84f50e02a080d2a6743f44ce0c72c35d01 (diff) | |
Fix joystick functionality for ChibiOS and OTG (Blackpill) (#18631)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Diffstat (limited to 'tmk_core/protocol/usb_descriptor.h')
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h index f8b7a863aa..6e842f6984 100644 --- a/tmk_core/protocol/usb_descriptor.h +++ b/tmk_core/protocol/usb_descriptor.h @@ -240,7 +240,7 @@ enum usb_endpoints { # ifdef USB_ENDPOINTS_ARE_REORDERABLE # define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM # else - CONSOLE_OUT_EPNUM = NEXT_EPNUM, + CONSOLE_OUT_EPNUM = NEXT_EPNUM, # endif # else # define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM @@ -265,23 +265,14 @@ enum usb_endpoints { CDC_OUT_EPNUM = NEXT_EPNUM, # endif #endif + #ifdef JOYSTICK_ENABLE JOYSTICK_IN_EPNUM = NEXT_EPNUM, -# ifdef USB_ENDPOINTS_ARE_REORDERABLE - JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM, -# else - JOYSTICK_OUT_EPNUM = NEXT_EPNUM, -# endif #endif #ifdef DIGITIZER_ENABLE # if !defined(DIGITIZER_SHARED_EP) DIGITIZER_IN_EPNUM = NEXT_EPNUM, -# ifdef USB_ENDPOINTS_ARE_REORDERABLE - DIGITIZER_OUT_EPNUM = DIGITIZER_IN_EPNUM, -# else - DIGITIZER_OUT_EPNUM = NEXT_EPNUM, -# endif # else # define DIGITIZER_IN_EPNUM SHARED_IN_EPNUM # endif |