summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-10-14 04:31:03 +0000
committerQMK Bot <hello@qmk.fm>2023-10-14 04:31:03 +0000
commitfd18d95b77aecbb04f307d2f53642f17e10ce98e (patch)
treec37c8b8cbb065b0b93bc6b045c22998bd95aca0f
parent539c8e3b721c82372c39bc49306647f65968fcb9 (diff)
parenta46c7abd01adb941f889d5edd2fc7dd33f8412d6 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/yushakobo/navpad/10/keymaps/via/keymap.c18
-rw-r--r--keyboards/yushakobo/navpad/10/keymaps/via/rules.mk3
2 files changed, 9 insertions, 12 deletions
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
index 790ac9dd83..0f9065a634 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
@@ -53,17 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) { /* First encoder */
- if (clockwise) {
- tap_code16(KC_WH_U);
- } else {
- tap_code16(KC_WH_D);
- }
- }
- return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [_BASE] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+ [_FN1] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+ [_FN2] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+ [_FN3] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+};
#endif
#ifdef RGBLIGHT_LAYERS
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
index 036bd6d1c3..715838ecc5 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes \ No newline at end of file
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes