qmk_firmware

commit: 61ed48edc393d2b3295e32d68263b31da946cd64
parent 2655ce58f92801773789793759b0133c650a29e5
Author: QMK Bot <hello@qmk.fm>
Date:   Mon, 22 Jan 2024 13:18:51 +0000

Merge remote-tracking branch 'origin/master' into develop

Diffstat:
M
keyboards/handwired/battleship_gamepad/config.h
1
-
M
keyboards/handwired/onekey/keymaps/joystick/config.h
1
-
M
keyboards/lime/rev1/config.h
7
+------
M
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
@@ -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 */