summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-24 18:11:55 +0000
committerQMK Bot <hello@qmk.fm>2022-08-24 18:11:55 +0000
commit5f371104bce10e8033f83b25f7caef5223c725a6 (patch)
tree8f930daba3f1ec2f15cd4fec193d28405ccd95c7
parentcf41c24db853f825150802d30dce73ba507b69c0 (diff)
parent7fab889696423376712f996af393dd1830d3bb70 (diff)
downloadqmk_firmware-5f371104bce10e8033f83b25f7caef5223c725a6.tar.gz
qmk_firmware-5f371104bce10e8033f83b25f7caef5223c725a6.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/mechwild/clunker/info.json1
-rw-r--r--keyboards/mechwild/clunker/keymaps/default/rules.mk1
-rw-r--r--keyboards/mechwild/clunker/keymaps/via/rules.mk1
3 files changed, 2 insertions, 1 deletions
diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json
index 6b10a04f13..cc9b8a1c59 100644
--- a/keyboards/mechwild/clunker/info.json
+++ b/keyboards/mechwild/clunker/info.json
@@ -12,7 +12,6 @@
"mousekey": true,
"nkro": true,
"encoder": true,
- "encoder_map": true,
"haptic": true
},
"matrix_pins": {
diff --git a/keyboards/mechwild/clunker/keymaps/default/rules.mk b/keyboards/mechwild/clunker/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/mechwild/clunker/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechwild/clunker/keymaps/via/rules.mk b/keyboards/mechwild/clunker/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/mechwild/clunker/keymaps/via/rules.mk
+++ b/keyboards/mechwild/clunker/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes