diff options
| author | QMK Bot <hello@qmk.fm> | 2024-01-22 13:18:51 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2024-01-22 13:18:51 +0000 |
| commit | 61ed48edc393d2b3295e32d68263b31da946cd64 (patch) | |
| tree | 55c664ebe0bd9238f296075504bb5e1b562a2915 | |
| parent | 2655ce58f92801773789793759b0133c650a29e5 (diff) | |
| parent | 3495cbc6382d4fa08ee5b4294527ab66fb7dff59 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/handwired/battleship_gamepad/config.h | 1 | ||||
| -rw-r--r-- | keyboards/handwired/onekey/keymaps/joystick/config.h | 1 | ||||
| -rw-r--r-- | keyboards/lime/rev1/config.h | 7 | ||||
| -rw-r--r-- | tmk_core/protocol/report.h | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h index f2eee84a57..9853f7f39d 100644 --- a/keyboards/handwired/battleship_gamepad/config.h +++ b/keyboards/handwired/battleship_gamepad/config.h @@ -18,7 +18,6 @@ /* joystick configuration */ #define JOYSTICK_BUTTON_COUNT 25 -#define JOYSTICK_AXIS_COUNT 2 #define JOYSTICK_AXIS_RESOLUTION 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h index 8a4e461b27..589e4dbf3d 100644 --- a/keyboards/handwired/onekey/keymaps/joystick/config.h +++ b/keyboards/handwired/onekey/keymaps/joystick/config.h @@ -1,4 +1,3 @@ #pragma once -#define JOYSTICK_AXIS_COUNT 2 #define JOYSTICK_BUTTON_COUNT 1 diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h index ec2c061372..a87c01b938 100644 --- a/keyboards/lime/rev1/config.h +++ b/keyboards/lime/rev1/config.h @@ -16,11 +16,6 @@ #pragma once -/* joystick support */ -#ifdef JOYSTICK_ENABLE -# define JOYSTICK_AXIS_COUNT 2 -# define JOYSTICK_BUTTON_COUNT 1 -# define JOYSTICK_AXIS_RESOLUTION 8 -#endif +#define JOYSTICK_BUTTON_COUNT 1 #define SPLIT_USB_DETECT diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h index 3028cf9426..47bc4f2f2b 100644 --- a/tmk_core/protocol/report.h +++ b/tmk_core/protocol/report.h @@ -22,6 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "keycode.h" #include "util.h" +#ifdef JOYSTICK_ENABLE +# include "joystick.h" +#endif + // clang-format off /* HID report IDs */ |