diff options
47 files changed, 2313 insertions, 188 deletions
diff --git a/keyboards/keychron/k9_pro/ansi/info.json b/keyboards/keychron/k9_pro/ansi/info.json new file mode 100644 index 0000000000..c217e0a41d --- /dev/null +++ b/keyboards/keychron/k9_pro/ansi/info.json @@ -0,0 +1,83 @@ +{ + "matrix_pins": { + "rows": ["B4", "B3", "A15", "A14", "A13"], + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "custom": true, + "custom_lite": true + }, + "matrix_size": { + "rows": 5, + "cols": 14 + }, + "layouts": { + "LAYOUT_61_ansi": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0}, + {"matrix":[0,1], "x":1, "y":0}, + {"matrix":[0,2], "x":2, "y":0}, + {"matrix":[0,3], "x":3, "y":0}, + {"matrix":[0,4], "x":4, "y":0}, + {"matrix":[0,5], "x":5, "y":0}, + {"matrix":[0,6], "x":6, "y":0}, + {"matrix":[0,7], "x":7, "y":0}, + {"matrix":[0,8], "x":8, "y":0}, + {"matrix":[0,9], "x":9, "y":0}, + {"matrix":[0,10], "x":10, "y":0}, + {"matrix":[0,11], "x":11, "y":0}, + {"matrix":[0,12], "x":12, "y":0}, + {"matrix":[0,13], "x":13, "y":0, "w":2}, + + {"matrix":[1,0], "x":0, "y":1, "w":1.5}, + {"matrix":[1,1], "x":1.5, "y":1}, + {"matrix":[1,2], "x":2.5, "y":1}, + {"matrix":[1,3], "x":3.5, "y":1}, + {"matrix":[1,4], "x":4.5, "y":1}, + {"matrix":[1,5], "x":5.5, "y":1}, + {"matrix":[1,6], "x":6.5, "y":1}, + {"matrix":[1,7], "x":7.5, "y":1}, + {"matrix":[1,8], "x":8.5, "y":1}, + {"matrix":[1,9], "x":9.5, "y":1}, + {"matrix":[1,10], "x":10.5, "y":1}, + {"matrix":[1,11], "x":11.5, "y":1}, + {"matrix":[1,12], "x":12.5, "y":1}, + {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + + {"matrix":[2,0], "x":0, "y":2, "w":1.75}, + {"matrix":[2,1], "x":1.75, "y":2}, + {"matrix":[2,2], "x":2.75, "y":2}, + {"matrix":[2,3], "x":3.75, "y":2}, + {"matrix":[2,4], "x":4.75, "y":2}, + {"matrix":[2,5], "x":5.75, "y":2}, + {"matrix":[2,6], "x":6.75, "y":2}, + {"matrix":[2,7], "x":7.75, "y":2}, + {"matrix":[2,8], "x":8.75, "y":2}, + {"matrix":[2,9], "x":9.75, "y":2}, + {"matrix":[2,10], "x":10.75, "y":2}, + {"matrix":[2,11], "x":11.75, "y":2}, + {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + + {"matrix":[3,0], "x":0, "y":3, "w":2.25}, + {"matrix":[3,2], "x":2.25, "y":3}, + {"matrix":[3,3], "x":3.25, "y":3}, + {"matrix":[3,4], "x":4.25, "y":3}, + {"matrix":[3,5], "x":5.25, "y":3}, + {"matrix":[3,6], "x":6.25, "y":3}, + {"matrix":[3,7], "x":7.25, "y":3}, + {"matrix":[3,8], "x":8.25, "y":3}, + {"matrix":[3,9], "x":9.25, "y":3}, + {"matrix":[3,10], "x":10.25, "y":3}, + {"matrix":[3,11], "x":11.25, "y":3}, + {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, + {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, + {"matrix":[4,6], "x":3.75, "y":4, "w":6.25}, + {"matrix":[4,10], "x":10, "y":4, "w":1.25}, + {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, + {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, + {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/keychron/k9_pro/ansi/rgb/config.h b/keyboards/keychron/k9_pro/ansi/rgb/config.h index 507ef17232..233d97cf90 100644 --- a/keyboards/keychron/k9_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k9_pro/ansi/rgb/config.h @@ -17,11 +17,12 @@ #pragma once #ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ +/* RGB Matrix Driver Configuration */ # define DRIVER_COUNT 1 # define DRIVER_ADDR_1 0b1110100 -# define DRIVER_1_LED_COUNT 61 -# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_COUNT + +/* RGB Matrix Configuration */ +# define RGB_MATRIX_LED_COUNT 61 /* Set to infinite, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE @@ -32,6 +33,7 @@ /* Turn off backlight on low brightness to save power */ # define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 +/* Indication led index */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 28 # define LOW_BAT_IND_INDEX 56 diff --git a/keyboards/keychron/k9_pro/ansi/rgb/info.json b/keyboards/keychron/k9_pro/ansi/rgb/info.json index f8bfaf0590..a966c90b0c 100644 --- a/keyboards/keychron/k9_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k9_pro/ansi/rgb/info.json @@ -30,6 +30,73 @@ "solid_reactive_multinexus": true, "splash": true, "solid_splash": true - } + }, + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":4, "x":16, "y":0}, + {"matrix":[0, 2], "flags":4, "x":32, "y":0}, + {"matrix":[0, 3], "flags":4, "x":48, "y":0}, + {"matrix":[0, 4], "flags":4, "x":65, "y":0}, + {"matrix":[0, 5], "flags":4, "x":81, "y":0}, + {"matrix":[0, 6], "flags":4, "x":97, "y":0}, + {"matrix":[0, 7], "flags":4, "x":113, "y":0}, + {"matrix":[0, 8], "flags":4, "x":129, "y":0}, + {"matrix":[0, 9], "flags":4, "x":145, "y":0}, + {"matrix":[0, 10], "flags":4, "x":161, "y":0}, + {"matrix":[0, 11], "flags":4, "x":178, "y":0}, + {"matrix":[0, 12], "flags":4, "x":194, "y":0}, + {"matrix":[0, 13], "flags":1, "x":218, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":4, "y":16}, + {"matrix":[1, 1], "flags":8, "x":24, "y":16}, + {"matrix":[1, 2], "flags":8, "x":40, "y":16}, + {"matrix":[1, 3], "flags":8, "x":57, "y":16}, + {"matrix":[1, 4], "flags":4, "x":73, "y":16}, + {"matrix":[1, 5], "flags":4, "x":89, "y":16}, + {"matrix":[1, 6], "flags":4, "x":105, "y":16}, + {"matrix":[1, 7], "flags":4, "x":121, "y":16}, + {"matrix":[1, 8], "flags":4, "x":137, "y":16}, + {"matrix":[1, 9], "flags":4, "x":153, "y":16}, + {"matrix":[1, 10], "flags":4, "x":170, "y":16}, + {"matrix":[1, 11], "flags":4, "x":186, "y":16}, + {"matrix":[1, 12], "flags":4, "x":202, "y":16}, + {"matrix":[1, 13], "flags":1, "x":222, "y":16}, + + {"matrix":[2, 0], "flags":8, "x":6, "y":32}, + {"matrix":[2, 1], "flags":4, "x":28, "y":32}, + {"matrix":[2, 2], "flags":4, "x":44, "y":32}, + {"matrix":[2, 3], "flags":4, "x":61, "y":32}, + {"matrix":[2, 4], "flags":4, "x":77, "y":32}, + {"matrix":[2, 5], "flags":4, "x":93, "y":32}, + {"matrix":[2, 6], "flags":4, "x":109, "y":32}, + {"matrix":[2, 7], "flags":4, "x":125, "y":32}, + {"matrix":[2, 8], "flags":4, "x":141, "y":32}, + {"matrix":[2, 9], "flags":4, "x":157, "y":32}, + {"matrix":[2, 10], "flags":4, "x":174, "y":32}, + {"matrix":[2, 11], "flags":4, "x":190, "y":32}, + {"matrix":[2, 13], "flags":1, "x":216, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":2, "y":48}, + {"matrix":[3, 2], "flags":4, "x":36, "y":48}, + {"matrix":[3, 3], "flags":4, "x":53, "y":48}, + {"matrix":[3, 4], "flags":4, "x":69, "y":48}, + {"matrix":[3, 5], "flags":4, "x":85, "y":48}, + {"matrix":[3, 6], "flags":4, "x":101, "y":48}, + {"matrix":[3, 7], "flags":4, "x":117, "y":48}, + {"matrix":[3, 8], "flags":4, "x":133, "y":48}, + {"matrix":[3, 9], "flags":4, "x":149, "y":48}, + {"matrix":[3, 10], "flags":4, "x":166, "y":48}, + {"matrix":[3, 11], "flags":4, "x":182, "y":48}, + {"matrix":[3, 13], "flags":1, "x":212, "y":48}, + + {"matrix":[4, 0], "flags":1, "x":2, "y":64}, + {"matrix":[4, 1], "flags":1, "x":22, "y":64}, + {"matrix":[4, 2], "flags":1, "x":42, "y":64}, + {"matrix":[4, 6], "flags":4, "x":103, "y":64}, + {"matrix":[4, 10], "flags":1, "x":163, "y":64}, + {"matrix":[4, 11], "flags":1, "x":184, "y":64}, + {"matrix":[4, 12], "flags":1, "x":204, "y":64}, + {"matrix":[4, 13], "flags":1, "x":224, "y":64} + ] } } diff --git a/keyboards/keychron/k9_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k9_pro/ansi/rgb/keymaps/default/keymap.c index af5ac8df62..6752be64b6 100644 --- a/keyboards/keychron/k9_pro/ansi/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k9_pro/ansi/rgb/keymaps/default/keymap.c @@ -16,49 +16,48 @@ #include QMK_KEYBOARD_H -// clang-format off enum layers{ MAC_BASE, WIN_BASE, MAC_FN, WIN_FN, - MAC_FN1, - L_FN1 + L_FN1, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[MAC_BASE] = LAYOUT_ansi_61( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),MO(L_FN1),KC_RCTL), + [MAC_BASE] = LAYOUT_61_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),MO(L_FN1),KC_RCTL), -[WIN_BASE] = LAYOUT_ansi_61( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),MO(L_FN1),KC_RCTL), + [WIN_BASE] = LAYOUT_61_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),MO(L_FN1),KC_RCTL), -[MAC_FN] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______), + [MAC_FN] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), -[WIN_FN] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_FN] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), -[L_FN1] = LAYOUT_ansi_61( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______), -}; + [L_FN1] = LAYOUT_61_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + }; diff --git a/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/keymap.c index 4b90bbd3aa..2477927b1c 100644 --- a/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/keymap.c @@ -16,48 +16,48 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ +enum layers { MAC_BASE, WIN_BASE, MAC_FN, WIN_FN, - L_FN1 + L_FN1, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[MAC_BASE] = LAYOUT_ansi_61( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),MO(L_FN1),KC_RCTL), + [MAC_BASE] = LAYOUT_61_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),MO(L_FN1),KC_RCTL), -[WIN_BASE] = LAYOUT_ansi_61( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),MO(L_FN1),KC_RCTL), + [WIN_BASE] = LAYOUT_61_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),MO(L_FN1),KC_RCTL), -[MAC_FN] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______), + [MAC_FN] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), -[WIN_FN] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_FN] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), -[L_FN1] = LAYOUT_ansi_61( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______), + [L_FN1] = LAYOUT_61_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/rules.mk b/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/rules.mk index 4eae6e776c..1e5b99807c 100644 --- a/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/rules.mk +++ b/keyboards/keychron/k9_pro/ansi/rgb/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 diff --git a/keyboards/keychron/k9_pro/ansi/rgb/rgb.c b/keyboards/keychron/k9_pro/ansi/rgb/rgb.c index 5c21608995..2b67c009c2 100644 --- a/keyboards/keychron/k9_pro/ansi/rgb/rgb.c +++ b/keyboards/keychron/k9_pro/ansi/rgb/rgb.c @@ -91,33 +91,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, L_15, J_15, K_15}, {0, L_16, J_16, K_16}, }; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, - { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40 }, - |