diff options
| author | Drashna Jael're <drashna@live.com> | 2021-06-29 12:23:03 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-06-29 12:24:07 -0700 |
| commit | acf2c323e2927f6007b17ded577cf49fd86fec6c (patch) | |
| tree | 8334dc5c71e6ab9bf33c76143eac7bb0e60159b0 /tmk_core/protocol/usb_descriptor.h | |
| parent | ec7a7beeed3046e9144d4c4ce0ef3b2c4f9e4341 (diff) | |
| parent | f55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff) | |
Merge upstream QMK Firmware at '0.12.52~1'
Diffstat (limited to 'tmk_core/protocol/usb_descriptor.h')
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h index e4d5435110..2ea4861f36 100644 --- a/tmk_core/protocol/usb_descriptor.h +++ b/tmk_core/protocol/usb_descriptor.h @@ -49,7 +49,7 @@ # include <hal.h> #endif #ifdef WEBUSB_ENABLE -#include "webusb_descriptor.h" +# include "webusb_descriptor.h" #endif /* @@ -271,6 +271,7 @@ enum usb_endpoints { # define WEBUSB_IN_EPADDR (ENDPOINT_DIR_IN | WEBUSB_IN_EPNUM) # define WEBUSB_OUT_EPADDR (ENDPOINT_DIR_OUT | WEBUSB_OUT_EPNUM) #endif + #ifdef JOYSTICK_ENABLE JOYSTICK_IN_EPNUM = NEXT_EPNUM, # if STM32_USB_USE_OTG1 |