locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2024-01-22 13:18:51 +00:00
commit 61ed48edc3
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keyboards/handwired/battleship_gamepad/config.h
View File

@ -18,7 +18,6 @@
/* joystick configuration */ /* joystick configuration */
#define JOYSTICK_BUTTON_COUNT 25 #define JOYSTICK_BUTTON_COUNT 25
#define JOYSTICK_AXIS_COUNT 2
#define JOYSTICK_AXIS_RESOLUTION 10 #define JOYSTICK_AXIS_RESOLUTION 10
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */

1
keyboards/handwired/onekey/keymaps/joystick/config.h
View File

@ -1,4 +1,3 @@
#pragma once #pragma once
#define JOYSTICK_AXIS_COUNT 2
#define JOYSTICK_BUTTON_COUNT 1 #define JOYSTICK_BUTTON_COUNT 1

5
keyboards/lime/rev1/config.h
View File

@ -16,11 +16,6 @@
#pragma once #pragma once
/* joystick support */
#ifdef JOYSTICK_ENABLE
# define JOYSTICK_AXIS_COUNT 2
#define JOYSTICK_BUTTON_COUNT 1 #define JOYSTICK_BUTTON_COUNT 1
# define JOYSTICK_AXIS_RESOLUTION 8
#endif
#define SPLIT_USB_DETECT #define SPLIT_USB_DETECT

4
tmk_core/protocol/report.h
View File

@ -22,6 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keycode.h" #include "keycode.h"
#include "util.h" #include "util.h"
#ifdef JOYSTICK_ENABLE
# include "joystick.h"
#endif
// clang-format off // clang-format off
/* HID report IDs */ /* HID report IDs */