logo

qmk_firmware

custom branch of QMK firmware git clone https://anongit.hacktivis.me/git/qmk_firmware.git
commit: 3495cbc6382d4fa08ee5b4294527ab66fb7dff59
parent cdbfcb6c148fe1f4b929f148149d3c9d572dff67
Author: Ryan <fauxpark@gmail.com>
Date:   Tue, 23 Jan 2024 00:18:20 +1100

Fix missing joystick.h include (#22946)


Diffstat:

Mkeyboards/handwired/battleship_gamepad/config.h1-
Mkeyboards/handwired/onekey/keymaps/joystick/config.h1-
Mkeyboards/lime/rev1/config.h7+------
Mtmk_core/protocol/report.h4++++
4 files changed, 5 insertions(+), 8 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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 */