Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
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
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue