diff options
34 files changed, 4727 insertions, 4588 deletions
diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json index 0301d74da8..a63cc2a3c4 100644 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json @@ -80,257 +80,265 @@ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 21}, -"layouts":{ - "keymap":[ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 1.0, - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.5 - }, - "0,5", - "0,6", - "0,7", - "0,8", - { - "x": 0.5 - }, - "0,9", - "0,10", - "0,11", - "0,12", - { - "x": 0.25 - }, - "0,14", - "0,15", - "0,16", - { - "x": 0.25 - }, - "0,17", - "0,18", - "0,19", - "0,20" - ], - [ - { - "y": 0.25 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13", - { - "x": 0.25 - }, - "1,14", - "1,15", - "1,16", - { - "x": 0.25 - }, - "1,17", - "1,18", - "1,19", - "1,20" - ], - [ - { - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "w": 1.5 - }, - "2,13", - { - "c": "#aaaaaa" - }, - { - "x": 0.25 - }, - "2,14", - "2,15", - "2,16", - { - "x": 0.25 - }, - "2,17", - "2,18", - "2,19", - { - "h": 2 - }, - "2,20" ], - [ - { - "w":1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w":2.25 - }, - "3,13", - { - "c": "#cccccc", - "x": 3.5 - }, - "3,17", - "3,18", - "3,19" - ], - [ - { - "c": "#aaaaaa", - "w":2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "4,13", - { - "x": 1.25, - "c": "#777777" - }, - "4,15", - { - "c": "#cccccc", - "x": 1.25 - }, - "4,17", - "4,18", - "4,19", - { - "h": 2 - }, - "4,20" - ], - [ - { - "c": "#aaaaaa", - "w":1.25 - }, - "5,0", - { - "w":1.25 - }, - "5,1", - { - "w":1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5,10", - { - "w": 1.25 - }, - "5,11", - { - "w": 1.25, - "c": "#cccccc" - }, - "5,12", - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5,13", - { - "x": 0.25, - "c": "#777777" - }, - "5,14", - "5,15", - "5,16", - { - "c": "#cccccc", - "x": 0.25 - }, - "5,17", - "5,18", - "5,19" - ] -] + "matrix": {"rows": 6, "cols": 21}, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "0,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,17", + "0,18", + "0,19", + "0,20" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,17", + "1,18", + "1,19", + "1,20" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,17", + "2,18", + "2,19", + { + "h": 2 + }, + "2,20" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,13", + { + "x": 3.5, + "c": "#cccccc" + }, + "3,17", + "3,18", + "3,19" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,13", + { + "x": 1.25, + "c": "#777777" + }, + "4,15", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,17", + "4,18", + "4,19", + { + "h": 2 + }, + "4,20" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10", + { + "w": 1.25 + }, + "5,11", + { + "w": 1.25 + }, + "5,12", + { + "w": 1.25 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,17", + "5,18", + "5,19" + ] + ] } } diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json index 1efc78fb18..a3ba225638 100644 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json @@ -20,257 +20,265 @@ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 21}, -"layouts":{ - "keymap":[ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 1.0, - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.5 - }, - "0,5", - "0,6", - "0,7", - "0,8", - { - "x": 0.5 - }, - "0,9", - "0,10", - "0,11", - "0,12", - { - "x": 0.25 - }, - "0,14", - "0,15", - "0,16", - { - "x": 0.25 - }, - "0,17", - "0,18", - "0,19", - "0,20" - ], - [ - { - "y": 0.25 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13", - { - "x": 0.25 - }, - "1,14", - "1,15", - "1,16", - { - "x": 0.25 - }, - "1,17", - "1,18", - "1,19", - "1,20" - ], - [ - { - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "w": 1.5 - }, - "2,13", - { - "c": "#aaaaaa" - }, - { - "x": 0.25 - }, - "2,14", - "2,15", - "2,16", - { - "x": 0.25 - }, - "2,17", - "2,18", - "2,19", - { - "h": 2 - }, - "2,20" ], - [ - { - "w":1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w":2.25 - }, - "3,13", - { - "c": "#cccccc", - "x": 3.5 - }, - "3,17", - "3,18", - "3,19" - ], - [ - { - "c": "#aaaaaa", - "w":2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "4,13", - { - "x": 1.25, - "c": "#777777" - }, - "4,15", - { - "c": "#cccccc", - "x": 1.25 - }, - "4,17", - "4,18", - "4,19", - { - "h": 2 - }, - "4,20" - ], - [ - { - "c": "#aaaaaa", - "w":1.25 - }, - "5,0", - { - "w":1.25 - }, - "5,1", - { - "w":1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5,10", - { - "w": 1.25 - }, - "5,11", - { - "w": 1.25, - "c": "#cccccc" - }, - "5,12", - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5,13", - { - "x": 0.25, - "c": "#777777" - }, - "5,14", - "5,15", - "5,16", - { - "c": "#cccccc", - "x": 0.25 - }, - "5,17", - "5,18", - "5,19" - ] -] + "matrix": {"rows": 6, "cols": 21}, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "0,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,17", + "0,18", + "0,19", + "0,20" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,17", + "1,18", + "1,19", + "1,20" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,17", + "2,18", + "2,19", + { + "h": 2 + }, + "2,20" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,13", + { + "x": 3.5, + "c": "#cccccc" + }, + "3,17", + "3,18", + "3,19" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,13", + { + "x": 1.25, + "c": "#777777" + }, + "4,15", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,17", + "4,18", + "4,19", + { + "h": 2 + }, + "4,20" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10", + { + "w": 1.25 + }, + "5,11", + { + "w": 1.25 + }, + "5,12", + { + "w": 1.25 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,17", + "5,18", + "5,19" + ] + ] } } diff --git a/keyboards/keychron/k2_pro/jis/rgb/info.json b/keyboards/keychron/k2_pro/jis/rgb/info.json index 8910572942..a7fb5bcdbf 100755 --- a/keyboards/keychron/k2_pro/jis/rgb/info.json +++ b/keyboards/keychron/k2_pro/jis/rgb/info.json @@ -5,7 +5,7 @@ "maintainer": "lokher", "usb": { "vid": "0x3434", - "pid": "0x0223", + "pid": "0x0222", "device_version": "1.0.0" }, "processor": "STM32L432", diff --git a/keyboards/keychron/k2_pro/jis/white/info.json b/keyboards/keychron/k2_pro/jis/white/info.json index 8910572942..a1356e3eab 100755 --- a/keyboards/keychron/k2_pro/jis/white/info.json +++ b/keyboards/keychron/k2_pro/jis/white/info.json @@ -5,7 +5,7 @@ "maintainer": "lokher", "usb": { "vid": "0x3434", - "pid": "0x0223", + "pid": "0x0225", "device_version": "1.0.0" }, "processor": "STM32L432", 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 92dfaf4ce4..8fc7ec7e4e 100755 --- 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, 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_LNPD, 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 @@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),KC_LEFT, KC_UP, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT( - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_TOG, + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, BL_TOGG, KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_BASE] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, |