Allow joysticks to be used without analog pins (qmk#10169)

* Allow joysticks to be used without analog pins * change how analog/digital joysticks are specified
zsa · Sep 30, 2020 · db2254c · db2254c
1 parent eb18684
commit db2254c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/common_features.mk b/common_features.mk
@@ -601,9 +601,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