summaryrefslogtreecommitdiffstats
path: root/keyboards/macro3/keymaps
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-06-12 14:35:07 +0000
committerQMK Bot <hello@qmk.fm>2022-06-12 14:35:07 +0000
commit191c180644def94a8fff1f6c0c93c9ef76e91f12 (patch)
tree36e154adf69b3fc5e9d90b4453ee03dc9db6387b /keyboards/macro3/keymaps
parent90765aaefda4983b0c32201cdf3b75cafca090bf (diff)
parentb5a53a994652e1fda5dbb5a3af2fd85e4ecaa951 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/macro3/keymaps')
-rw-r--r--keyboards/macro3/keymaps/default/keymap.c7
-rw-r--r--keyboards/macro3/keymaps/default/rules.mk1
2 files changed, 8 insertions, 0 deletions
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c
index e866d481df..8881612a3f 100644
--- a/keyboards/macro3/keymaps/default/keymap.c
+++ b/keyboards/macro3/keymaps/default/keymap.c
@@ -16,3 +16,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
+ [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
+};
+#endif
+
diff --git a/keyboards/macro3/keymaps/default/rules.mk b/keyboards/macro3/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/macro3/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes