aboutsummaryrefslogtreecommitdiffstats
path: root/common_features.mk
diff options
context:
space:
mode:
authorGravatar Zach White <skullydazed@gmail.com>2020-08-27 09:38:04 -0700
committerGravatar James Young <18669334+noroadsleft@users.noreply.github.com>2020-08-29 14:30:02 -0700
commitbdd8d2679ba74715b38f958b071fd57eaf092b9d (patch)
tree734407eaf72d2f408a6c0ab7ffb539df0c62bdc3 /common_features.mk
parent629cfc7f5ebd815231c9e3f969170995db1481c6 (diff)
downloadqmk_firmware-bdd8d2679ba74715b38f958b071fd57eaf092b9d.tar.gz
Allow joysticks to be used without analog pins (#10169)
* Allow joysticks to be used without analog pins * change how analog/digital joysticks are specified
Diffstat (limited to 'common_features.mk')
-rw-r--r--common_features.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/common_features.mk b/common_features.mk
index 088db89ca..1f110d081 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -536,9 +536,18 @@ ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
endif
endif
-ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
+JOYSTICK_ENABLE ?= no
+ifneq ($(strip $(JOYSTICK_ENABLE)), no)
OPT_DEFS += -DJOYSTICK_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_joystick.c
SRC += $(QUANTUM_DIR)/joystick.c
+endif
+
+ifeq ($(strip $(JOYSTICK_ENABLE)), analog)
+ OPT_DEFS += -DANALOG_JOYSTICK_ENABLE
SRC += analog.c
endif
+
+ifeq ($(strip $(JOYSTICK_ENABLE)), digital)
+ OPT_DEFS += -DDIGITAL_JOYSTICK_ENABLE
+endif