Merge remote-tracking branch 'origin/master' into develop

3 years ago · 5f371104bc
parent cf41c24db8 7fab889696
commit 5f371104bc
3 changed files with 2 additions and 1 deletions
--- 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": {
--- a/keyboards/mechwild/clunker/keymaps/default/rules.mk
+++ b/keyboards/mechwild/clunker/keymaps/default/rules.mk
@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
--- 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