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

2024-01-22 13:18:51 +00:00
parent 2655ce58f9 3495cbc638
commit 61ed48edc3
4 changed files with 5 additions and 8 deletions
@@ -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 */
@@ -1,4 +1,3 @@
 #pragma once

-#define JOYSTICK_AXIS_COUNT 2
 #define JOYSTICK_BUTTON_COUNT 1
@@ -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