Move Encoder+Encoder Map from generic features (#18018)

3 years ago · aed82bc6a0
parent 06c7614a71
commit aed82bc6a0
2 changed files with 8 additions and 2 deletions
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@ -893,3 +893,11 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
        QUANTUM_LIB_SRC += uart.c
    endif
 endif
+
+ifeq ($(strip $(ENCODER_ENABLE)), yes)
+    COMMON_VPATH += $(QUANTUM_DIR)/encoder.c
+    OPT_DEFS += -DENCODER_ENABLE
+    ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
+        OPT_DEFS += -DENCODER_MAP_ENABLE
+    endif
+endif
--- a/builddefs/generic_features.mk
+++ b/builddefs/generic_features.mk
@ -25,8 +25,6 @@ GENERIC_FEATURES = \
    DIP_SWITCH \
    DYNAMIC_KEYMAP \
    DYNAMIC_MACRO \
-    ENCODER \
-    ENCODER_MAP \
    GRAVE_ESC \
    HAPTIC \
    KEY_LOCK \