~ruther/qmk_firmware: Merge remote-tracking branch 'origin/master' into develop

3 files changed, 3 insertions(+), 2 deletions(-)

A keyboards/mechlovin/foundation/keymaps/default/rules.mk
M keyboards/mechlovin/foundation/keymaps/via/rules.mk
M keyboards/mechlovin/foundation/rules.mk

A keyboards/mechlovin/foundation/keymaps/default/rules.mk => keyboards/mechlovin/foundation/keymaps/default/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_MAP_ENABLE = yes

M keyboards/mechlovin/foundation/keymaps/via/rules.mk => keyboards/mechlovin/foundation/keymaps/via/rules.mk +2 -1

@@ 1,1 1,2 @@
-VIA_ENABLE = yes>
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

M keyboards/mechlovin/foundation/rules.mk => keyboards/mechlovin/foundation/rules.mk +0 -1

@@ 18,4 18,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes
 AUDIO_ENABLE = no           # Audio output
-ENCODER_MAP_ENABLE = yes