mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-10-24 09:51:54 +02:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user