From 0bb55482271982d80b43a87a5777665aa584ab46 Mon Sep 17 00:00:00 2001 From: josh-l-wang <22173775+josh-l-wang@users.noreply.github.com> Date: Sun, 14 Apr 2024 21:39:39 -0400 Subject: [PATCH] changed bruce le clavier encoder configuration (#715) --- keyboards/jlw/bruce_le_clavier/info.json | 9 ++++++-- .../bruce_le_clavier/keymaps/vial/keymap.c | 22 +++++++++++-------- .../bruce_le_clavier/keymaps/vial/rules.mk | 1 + 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/keyboards/jlw/bruce_le_clavier/info.json b/keyboards/jlw/bruce_le_clavier/info.json index d1e5173b81..fa37be65b6 100644 --- a/keyboards/jlw/bruce_le_clavier/info.json +++ b/keyboards/jlw/bruce_le_clavier/info.json @@ -20,10 +20,15 @@ "extrakey": true, "mousekey": true, "nkro": true, - "encoder_map": true + "encoder": true + }, + "bootmagic": { + "matrix": [4, 10] }, "encoder": { - "rotary": [{"pin_a": "B12", "pin_b": "B13"}] + "rotary": [ + {"pin_a": "B12", "pin_b": "B13"} + ] }, "ws2812": { "pin": "B8" diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c b/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c index 01ac81a49b..34ff15f258 100644 --- a/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c +++ b/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c @@ -14,37 +14,41 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_Q, KC_W, KC_F, KC_P, KC_B, QK_BOOT, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, HM_A, HM_R, HM_S, KC_T, KC_G, KC_M, KC_N, HM_E, HM_I, HM_O, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, - LT(3, KC_TAB), SFT_T(KC_BSPC), LT(1, KC_SPC), LT(2,KC_ENT) + LT(3, KC_TAB), SFT_T(KC_BSPC), LT(1, KC_SPC), LT(2,KC_ENT), + KC_MUTE ), [1] = LAYOUT( - KC_GRAVE, KC_F2, XXXXXXX, KC_F4, KC_F5, XXXXXXX, KC_BSLS, KC_MINUS, KC_EQUAL, KC_LBRC, KC_RBRC, + KC_GRAVE, KC_F2, XXXXXXX, KC_F4, KC_F5, KC_BSLS, KC_MINUS, KC_EQUAL, KC_LBRC, KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(1), XXXXXXX, _______, _______, KC_SCLN, - _______, _______, _______, _______ + _______, _______, _______, _______, + XXXXXXX ), [2] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11, KC_F12, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11, KC_F12, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(2), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - _______, _______, _______, _______ + _______, _______, _______, _______, + XXXXXXX ), [3] = LAYOUT( - XXXXXXX, XXXXXXX, LSG(KC_4),LSG(KC_S),XXXXXXX, XXXXXXX, KC_HOME, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, + XXXXXXX, XXXXXXX, LSG(KC_4),LSG(KC_S),XXXXXXX, KC_HOME, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_LGUI, KC_LALT, KC_LCTL, KC_LGUI, XXXXXXX, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(2), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - _______, _______, _______, _______ + _______, _______, _______, _______, + XXXXXXX ) }; // Encoder Map #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(S(KC_F2), KC_F2) }, + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [2] = { ENCODER_CCW_CW(_______, _______) }, [3] = { ENCODER_CCW_CW(_______, _______) } diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk b/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk index 4f7618e9b2..31e3e6a6ec 100644 --- a/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk +++ b/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes VIAL_ENABLE = yes +ENCODER_MAP_ENABLE = yes