summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2022-08-12 18:04:02 -0700
committerGitHub <noreply@github.com>2022-08-12 18:04:02 -0700
commitaed82bc6a07ab72a3bec7b4b578b6cb644a92d51 (patch)
tree9554f3cd8bbb3da4356b8f16d6cbcc2ff3da7e05
parent06c7614a71ce19772f4cee58ff45ea8a41c0e024 (diff)
downloadqmk_firmware-aed82bc6a07ab72a3bec7b4b578b6cb644a92d51.tar.gz
qmk_firmware-aed82bc6a07ab72a3bec7b4b578b6cb644a92d51.zip
Move Encoder+Encoder Map from generic features (#18018)
-rw-r--r--builddefs/common_features.mk8
-rw-r--r--builddefs/generic_features.mk2
2 files changed, 8 insertions, 2 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 8d31f694a7..1f1f945760 100644
--- 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
diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk
index c3f1ec0f72..f195e9fd75 100644
--- 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 \