diff options
| author | lokher <lokher@gmail.com> | 2023-04-26 16:32:15 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2023-04-26 16:32:15 +0800 |
| commit | e4f4ceaf3f2e3d25fb282273a81f9b58790fc427 (patch) | |
| tree | c0a257eab0ffe5238fdf2c04882e8ee1fe8fc46e /keyboards/keychron/k2_pro/jis | |
| parent | 103badc87cb50db1ff3851c84331e86ba78fb681 (diff) | |
merge upstream 713427c
Diffstat (limited to 'keyboards/keychron/k2_pro/jis')
14 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/keychron/k2_pro/jis/rgb/config.h b/keyboards/keychron/k2_pro/jis/rgb/config.h index e43dd9d52a..e43dd9d52a 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/config.h +++ b/keyboards/keychron/k2_pro/jis/rgb/config.h diff --git a/keyboards/keychron/k2_pro/jis/rgb/info.json b/keyboards/keychron/k2_pro/jis/rgb/info.json index a7fb5bcdbf..a7fb5bcdbf 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/info.json +++ b/keyboards/keychron/k2_pro/jis/rgb/info.json diff --git a/keyboards/keychron/k2_pro/jis/rgb/keymaps/default/keymap.c b/keyboards/keychron/k2_pro/jis/rgb/keymaps/default/keymap.c index 92dfaf4ce4..2861265e44 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k2_pro/jis/rgb/keymaps/default/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD, KC_GRV, 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_INT3, KC_BSPC, KC_PGUP, // 32 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_PGDN, // 46 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_NUHS, KC_ENT, KC_HOME, // 61 diff --git a/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/keymap.c b/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/keymap.c index 92dfaf4ce4..2861265e44 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD, KC_GRV, 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_INT3, KC_BSPC, KC_PGUP, // 32 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_PGDN, // 46 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_NUHS, KC_ENT, KC_HOME, // 61 diff --git a/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/rules.mk b/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/rules.mk +++ b/keyboards/keychron/k2_pro/jis/rgb/keymaps/via/rules.mk diff --git a/keyboards/keychron/k2_pro/jis/rgb/rgb.c b/keyboards/keychron/k2_pro/jis/rgb/rgb.c index 5ed4c3a0de..5ed4c3a0de 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/rgb.c +++ b/keyboards/keychron/k2_pro/jis/rgb/rgb.c diff --git a/keyboards/keychron/k2_pro/jis/rgb/rules.mk b/keyboards/keychron/k2_pro/jis/rgb/rules.mk index f5f4192470..f5f4192470 100755..100644 --- a/keyboards/keychron/k2_pro/jis/rgb/rules.mk +++ b/keyboards/keychron/k2_pro/jis/rgb/rules.mk diff --git a/keyboards/keychron/k2_pro/jis/white/config.h b/keyboards/keychron/k2_pro/jis/white/config.h index 0dfb6ab8eb..0dfb6ab8eb 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/config.h +++ b/keyboards/keychron/k2_pro/jis/white/config.h diff --git a/keyboards/keychron/k2_pro/jis/white/info.json b/keyboards/keychron/k2_pro/jis/white/info.json index a1356e3eab..a1356e3eab 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/info.json +++ b/keyboards/keychron/k2_pro/jis/white/info.json diff --git a/keyboards/keychron/k2_pro/jis/white/keymaps/default/keymap.c b/keyboards/keychron/k2_pro/jis/white/keymaps/default/keymap.c index 8fc7ec7e4e..effa4605f9 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/keymaps/default/keymap.c +++ b/keyboards/keychron/k2_pro/jis/white/keymaps/default/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, KC_GRV, 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_INT3, KC_BSPC, KC_PGUP, // 32 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_PGDN, // 46 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_NUHS, KC_ENT, KC_HOME, // 61 diff --git a/keyboards/keychron/k2_pro/jis/white/keymaps/via/keymap.c b/keyboards/keychron/k2_pro/jis/white/keymaps/via/keymap.c index 8fc7ec7e4e..effa4605f9 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/keymaps/via/keymap.c +++ b/keyboards/keychron/k2_pro/jis/white/keymaps/via/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, KC_GRV, 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_INT3, KC_BSPC, KC_PGUP, // 32 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_PGDN, // 46 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_NUHS, KC_ENT, KC_HOME, // 61 diff --git a/keyboards/keychron/k2_pro/jis/white/keymaps/via/rules.mk b/keyboards/keychron/k2_pro/jis/white/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/keymaps/via/rules.mk +++ b/keyboards/keychron/k2_pro/jis/white/keymaps/via/rules.mk diff --git a/keyboards/keychron/k2_pro/jis/white/rules.mk b/keyboards/keychron/k2_pro/jis/white/rules.mk index 6b0c2a0769..6b0c2a0769 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/rules.mk +++ b/keyboards/keychron/k2_pro/jis/white/rules.mk diff --git a/keyboards/keychron/k2_pro/jis/white/white.c b/keyboards/keychron/k2_pro/jis/white/white.c index 67b6330864..67b6330864 100755..100644 --- a/keyboards/keychron/k2_pro/jis/white/white.c +++ b/keyboards/keychron/k2_pro/jis/white/white.c |