diff --git a/keyboards/keychron/x5/ansi/red/keymaps/default/keymap.c b/keyboards/keychron/x5/ansi/red/keymaps/default/keymap.c index 9f2a1daddaae..2142c52e65d9 100755 --- a/keyboards/keychron/x5/ansi/red/keymaps/default/keymap.c +++ b/keyboards/keychron/x5/ansi/red/keymaps/default/keymap.c @@ -29,15 +29,15 @@ enum layers{ // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_82_ansi( - KC_ESC, 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_DEL, KC_INS, - 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_BSPC, KC_HOME, - 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_PGUP, - 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_PGDN, + KC_ESC, 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_PSCR, KC_DEL, + 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_BSPC, KC_PGUP, + 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_PGDN, + 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_HOME, 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_UP, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_82_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/x5/ansi/red/keymaps/keychron/keymap.c b/keyboards/keychron/x5/ansi/red/keymaps/keychron/keymap.c index 42be842fe864..2edcdfb226ce 100755 --- a/keyboards/keychron/x5/ansi/red/keymaps/keychron/keymap.c +++ b/keyboards/keychron/x5/ansi/red/keymaps/keychron/keymap.c @@ -28,15 +28,15 @@ enum layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_82_ansi( - KC_ESC, 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_DEL, KC_INS, - 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_BSPC, KC_HOME, - 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_PGUP, - 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_PGDN, + KC_ESC, 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_PSCR, KC_DEL, + 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_BSPC, KC_PGUP, + 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_PGDN, + 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_HOME, 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_UP, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_82_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/x5/ansi/red/keymaps/via/keymap.c b/keyboards/keychron/x5/ansi/red/keymaps/via/keymap.c index 42423049f50b..51417d302ec4 100755 --- a/keyboards/keychron/x5/ansi/red/keymaps/via/keymap.c +++ b/keyboards/keychron/x5/ansi/red/keymaps/via/keymap.c @@ -29,15 +29,15 @@ enum layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_82_ansi( - KC_ESC, 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_DEL, KC_INS, - 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_BSPC, KC_HOME, - 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_PGUP, - 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_PGDN, + KC_ESC, 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_PSCR, KC_DEL, + 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_BSPC, KC_PGUP, + 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_PGDN, + 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_HOME, 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_UP, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_82_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/x5/info.json b/keyboards/keychron/x5/info.json index fd0915b23770..7c6e5eba2ca0 100755 --- a/keyboards/keychron/x5/info.json +++ b/keyboards/keychron/x5/info.json @@ -15,8 +15,6 @@ "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B14", - "num_lock": "B13", - "scroll_lock": "B12", "on_state": 0 }, "features": { diff --git a/keyboards/keychron/x5/via_json/x5_ansi_red.json b/keyboards/keychron/x5/via_json/x5_ansi_red.json index b349a6e0a11a..bc13d9d5e9f1 100644 --- a/keyboards/keychron/x5/via_json/x5_ansi_red.json +++ b/keyboards/keychron/x5/via_json/x5_ansi_red.json @@ -1,5 +1,5 @@ { - "name": "Lemokey X5 ANSI Knob Red", + "name": "Lemokey X5 ANSI Red", "vendorId": "0x362D", "productId": "0x0250", "keycodes": ["qmk_lighting"], @@ -16,7 +16,7 @@ {"name": "Screen Shot","title": "Screenshot in macOS","shortName": "SShot"}, {"name": "Cortana","title": "Cortana in windows","shortName": "Cortana"} ], - "matrix": {"rows": 6, "cols": 16}, + "matrix": {"rows": 6, "cols": 15}, "layouts": { "keymap": [ [ @@ -54,7 +54,7 @@ { "x": 0.25 }, - "0,14\n\n\n\n\n\n\n\n\ne0" + "0,14" ], [ { @@ -110,7 +110,7 @@ "c": "#aaaaaa", "w": 1.5 }, - "2,13", + "2,12", { "x": 0.25 }, @@ -139,7 +139,7 @@ "c": "#777777", "w": 2.25 }, - "3,13", + "3,12", { "x": 0.25, "c": "#aaaaaa" @@ -154,6 +154,7 @@ { "c": "#cccccc" }, + "4,1", "4,2", "4,3", "4,4", @@ -163,20 +164,19 @@ "4,8", "4,9", "4,10", - "4,11", { "c": "#aaaaaa", "w": 1.75 }, - "4,13" + "4,11" ], [ { "y": -0.75, "x": 14.25, - "c": "#777777" + "c": "#cccccc" }, - "4,14" + "4,12" ], [ { @@ -194,26 +194,26 @@ }, "5,2", { - "c": "#cccccc", + "c": "#777777", "w": 6.25 }, - "5,6", + "5,5", { "c": "#aaaaaa" }, + "5,9", "5,10", - "5,11", - "5,12" + "5,11" ], [ { "y": -0.75, "x": 13.25, - "c": "#777777" + "c": "#cccccc" }, + "5,12", "5,13", - "5,14", - "5,15" + "5,14" ] ] } diff --git a/keyboards/keychron/x5/x5.c b/keyboards/keychron/x5/x5.c index 8fa649b61902..4853cd52f60d 100755 --- a/keyboards/keychron/x5/x5.c +++ b/keyboards/keychron/x5/x5.c @@ -44,6 +44,13 @@ void eeconfig_init_kb(void) { eeconfig_init_user(); } +void keyboard_post_init_kb(void) { + setPinOutputPushPull(LED_WIN_LOCK_PIN); + eeconfig_read_user_datablock(&win_lock_state); + + keyboard_post_init_user(); +} + void housekeeping_task_kb() { set_led_win_lock_state(); } diff --git a/keyboards/keychron/x6/ansi/red/config.h b/keyboards/keychron/x6/ansi/red/config.h index acc49e001a17..5439411cc237 100755 --- a/keyboards/keychron/x6/ansi/red/config.h +++ b/keyboards/keychron/x6/ansi/red/config.h @@ -22,10 +22,8 @@ # define DRIVER_ADDR_1 0b1110100 /* RGB Matrix Configuration */ -# define LED_MATRIX_LED_COUNT 104 +# define LED_MATRIX_LED_COUNT 101 -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */ -# define PHASE_CHANNEL MSKPHASE_9CHANNEL # define CKLED2001_CURRENT_TUNE \ { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 } diff --git a/keyboards/keychron/x6/ansi/red/info.json b/keyboards/keychron/x6/ansi/red/info.json index 4929b60316ac..fb682f649867 100755 --- a/keyboards/keychron/x6/ansi/red/info.json +++ b/keyboards/keychron/x6/ansi/red/info.json @@ -1,6 +1,6 @@ { "usb": { - "pid": "0x0220", + "pid": "0x0260", "device_version": "1.0.0" }, "features": { @@ -27,114 +27,111 @@ }, "layout": [ {"matrix":[0,0], "flags":1, "x":0, "y":0}, - {"matrix":[0,1], "flags":1, "x":21, "y":0}, - {"matrix":[0,2], "flags":1, "x":31, "y":0}, - {"matrix":[0,3], "flags":1, "x":42, "y":0}, - {"matrix":[0,4], "flags":1, "x":52, "y":0}, - {"matrix":[0,5], "flags":1, "x":68, "y":0}, - {"matrix":[0,6], "flags":1, "x":78, "y":0}, - {"matrix":[0,7], "flags":1, "x":88, "y":0}, + {"matrix":[0,2], "flags":1, "x":23, "y":0}, + {"matrix":[0,3], "flags":1, "x":35, "y":0}, + {"matrix":[0,4], "flags":1, "x":47, "y":0}, + {"matrix":[0,5], "flags":1, "x":58, "y":0}, + {"matrix":[0,6], "flags":1, "x":76, "y":0}, + {"matrix":[0,7], "flags":1, "x":87, "y":0}, {"matrix":[0,8], "flags":1, "x":99, "y":0}, - {"matrix":[0,9], "flags":1, "x":114, "y":0}, - {"matrix":[0,10], "flags":1, "x":125, "y":0}, - {"matrix":[0,11], "flags":1, "x":135, "y":0}, - {"matrix":[0,12], "flags":1, "x":146, "y":0}, - {"matrix":[0,14], "flags":1, "x":159, "y":0}, - {"matrix":[0,15], "flags":1, "x":169, "y":0}, - {"matrix":[0,16], "flags":1, "x":180, "y":0}, + {"matrix":[0,9], "flags":1, "x":111, "y":0}, + {"matrix":[0,10], "flags":1, "x":128, "y":0}, + {"matrix":[0,11], "flags":1, "x":140, "y":0}, + {"matrix":[0,12], "flags":1, "x":152, "y":0}, + {"matrix":[0,13], "flags":1, "x":163, "y":0}, + {"matrix":[0,14], "flags":1, "x":176, "y":0}, + {"matrix":[0,15], "flags":1, "x":189, "y":0}, + {"matrix":[0,16], "flags":1, "x":201, "y":0}, + {"matrix":[0,17], "flags":1, "x":212, "y":0}, + {"matrix":[0,18], "flags":1, "x":224, "y":0}, - {"matrix":[1,0], "flags":1, "x":0, "y":16}, - {"matrix":[1,1], "flags":4, "x":10, "y":16}, - {"matrix":[1,2], "flags":4, "x":21, "y":16}, - {"matrix":[1,3], "flags":4, "x":31, "y":16}, - {"matrix":[1,4], "flags":4, "x":42, "y":16}, - {"matrix":[1,5], "flags":4, "x":52, "y":16}, - {"matrix":[1,6], "flags":4, "x":62, "y":16}, - {"matrix":[1,7], "flags":4, "x":73, "y":16}, - {"matrix":[1,8], "flags":4, "x":83, "y":16}, - {"matrix":[1,9], "flags":4, "x":94, "y":16}, - {"matrix":[1,10], "flags":4, "x":104, "y":16}, - {"matrix":[1,11], "flags":4, "x":114, "y":16}, - {"matrix":[1,12], "flags":4, "x":125, "y":16}, - {"matrix":[1,13], "flags":1, "x":140, "y":16}, - {"matrix":[1,14], "flags":1, "x":159, "y":16}, - {"matrix":[1,15], "flags":1, "x":169, "y":16}, - {"matrix":[1,16], "flags":1, "x":180, "y":16}, - {"matrix":[1,17], "flags":4, "x":193, "y":16}, - {"matrix":[1,18], "flags":4, "x":203, "y":16}, - {"matrix":[1,19], "flags":4, "x":214, "y":16}, - {"matrix":[1,20], "flags":4, "x":224, "y":16}, + {"matrix":[1,0], "flags":1, "x":0, "y":13}, + {"matrix":[1,1], "flags":4, "x":12, "y":13}, + {"matrix":[1,2], "flags":4, "x":23, "y":13}, + {"matrix":[1,3], "flags":4, "x":35, "y":13}, + {"matrix":[1,4], "flags":4, "x":47, "y":13}, + {"matrix":[1,5], "flags":4, "x":58, "y":13}, + {"matrix":[1,6], "flags":4, "x":70, "y":13}, + {"matrix":[1,7], "flags":4, "x":82, "y":13}, + {"matrix":[1,8], "flags":4, "x":93, "y":13}, + {"matrix":[1,9], "flags":4, "x":105, "y":13}, + {"matrix":[1,10], "flags":4, "x":117, "y":13}, + {"matrix":[1,11], "flags":4, "x":128, "y":13}, + {"matrix":[1,12], "flags":4, "x":140, "y":13}, + {"matrix":[1,13], "flags":1, "x":157, "y":13}, + {"matrix":[1,14], "flags":1, "x":176, "y":13}, + {"matrix":[1,15], "flags":4, "x":189, "y":13}, + {"matrix":[1,16], "flags":4, "x":201, "y":13}, + {"matrix":[1,17], "flags":4, "x":212, "y":13}, + {"matrix":[1,18], "flags":4, "x":224, "y":13}, - {"matrix":[2,0], "flags":1, "x":3, "y":28}, - {"matrix":[2,1], "flags":4, "x":16, "y":28}, - {"matrix":[2,2], "flags":4, "x":26, "y":28}, - {"matrix":[2,3], "flags":4, "x":36, "y":28}, - {"matrix":[2,4], "flags":4, "x":47, "y":28}, - {"matrix":[2,5], "flags":4, "x":57, "y":28}, - {"matrix":[2,6], "flags":4, "x":68, "y":28}, - {"matrix":[2,7], "flags":4, "x":78, "y":28}, - {"matrix":[2,8], "flags":4, "x":88, "y":28}, - {"matrix":[2,9], "flags":4, "x":98, "y":28}, - {"matrix":[2,10], "flags":4, "x":109, "y":28}, - {"matrix":[2,11], "flags":4, "x":120, "y":28}, - {"matrix":[2,12], "flags":4, "x":130, "y":28}, - {"matrix":[2,13], "flags":1, "x":143, "y":28}, - {"matrix":[2,14], "flags":1, "x":159, "y":28}, - {"matrix":[2,15], "flags":1, "x":169, "y":28}, - {"matrix":[2,16], "flags":1, "x":180, "y":28}, - {"matrix":[2,17], "flags":4, "x":193, "y":28}, - {"matrix":[2,18], "flags":4, "x":203, "y":28}, - {"matrix":[2,19], "flags":4, "x":214, "y":28}, - {"matrix":[2,20], "flags":4, "x":224, "y":34}, + {"matrix":[2,0], "flags":1, "x":3, "y":25}, + {"matrix":[2,1], "flags":4, "x":17, "y":25}, + {"matrix":[2,2], "flags":4, "x":29, "y":25}, + {"matrix":[2,3], "flags":4, "x":41, "y":25}, + {"matrix":[2,4], "flags":4, "x":52, "y":25}, + {"matrix":[2,5], "flags":4, "x":64, "y":25}, + {"matrix":[2,6], "flags":4, "x":76, "y":25}, + {"matrix":[2,7], "flags":4, "x":87, "y":25}, + {"matrix":[2,8], "flags":4, "x":99, "y":25}, + {"matrix":[2,9], "flags":4, "x":111, "y":25}, + {"matrix":[2,10], "flags":4, "x":122, "y":25}, + {"matrix":[2,11], "flags":4, "x":134, "y":25}, + {"matrix":[2,12], "flags":4, "x":146, "y":25}, + {"matrix":[2,13], "flags":1, "x":160, "y":25}, + {"matrix":[2,14], "flags":1, "x":176, "y":25}, + {"matrix":[2,15], "flags":4, "x":189, "y":25}, + {"matrix":[2,16], "flags":4, "x":201, "y":25}, + {"matrix":[2,17], "flags":4, "x":212, "y":25}, + {"matrix":[3,18], "flags":4, "x":224, "y":31}, - {"matrix":[3,0], "flags":1, "x":4, "y":40}, - {"matrix":[3,1], "flags":4, "x":18, "y":40}, - {"matrix":[3,2], "flags":4, "x":29, "y":40}, - {"matrix":[3,3], "flags":4, "x":39, "y":40}, - {"matrix":[3,4], "flags":4, "x":49, "y":40}, - {"matrix":[3,5], "flags":4, "x":60, "y":40}, - {"matrix":[3,6], "flags":4, "x":70, "y":40}, - {"matrix":[3,7], "flags":4, "x":81, "y":40}, - {"matrix":[3,8], "flags":4, "x":91, "y":40}, - {"matrix":[3,9], "flags":4, "x":101, "y":40}, - {"matrix":[3,10], "flags":4, "x":112, "y":40}, - {"matrix":[3,11], "flags":4, "x":122, "y":40}, - {"matrix":[3,13], "flags":1, "x":139, "y":40}, - {"matrix":[3,17], "flags":4, "x":193, "y":40}, - {"matrix":[3,18], "flags":4, "x":203, "y":40}, - {"matrix":[3,19], "flags":4, "x":214, "y":40}, + {"matrix":[3,0], "flags":1, "x":4, "y":38}, + {"matrix":[3,1], "flags":4, "x":20, "y":38}, + {"matrix":[3,2], "flags":4, "x":32, "y":38}, + {"matrix":[3,3], "flags":4, "x":44, "y":38}, + {"matrix":[3,4], "flags":4, "x":55, "y":38}, + {"matrix":[3,5], "flags":4, "x":67, "y":38}, + {"matrix":[3,6], "flags":4, "x":79, "y":38}, + {"matrix":[3,7], "flags":4, "x":90, "y":38}, + {"matrix":[3,8], "flags":4, "x":102, "y":38}, + {"matrix":[3,9], "flags":4, "x":114, "y":38}, + {"matrix":[3,10], "flags":4, "x":125, "y":38}, + {"matrix":[3,11], "flags":4, "x":137, "y":38}, + {"matrix":[3,13], "flags":1, "x":156, "y":38}, + {"matrix":[3,15], "flags":4, "x":189, "y":38}, + {"matrix":[3,16], "flags":4, "x":201, "y":38}, + {"matrix":[3,17], "flags":4, "x":212, "y":38}, - {"matrix":[4,0], "flags":1, "x":7, "y":52}, - {"matrix":[4,2], "flags":4, "x":23, "y":52}, - {"matrix":[4,3], "flags":4, "x":34, "y":52}, - {"matrix":[4,4], "flags":4, "x":44, "y":52}, - {"matrix":[4,5], "flags":4, "x":55, "y":52}, - {"matrix":[4,6], "flags":4, "x":65, "y":52}, - {"matrix":[4,7], "flags":4, "x":75, "y":52}, - {"matrix":[4,8], "flags":4, "x":86, "y":52}, - {"matrix":[4,9], "flags":4, "x":96, "y":52}, - {"matrix":[4,10], "flags":4, "x":107, "y":52}, - {"matrix":[4,11], "flags":4, "x":117, "y":52}, - {"matrix":[4,13], "flags":1, "x":137, "y":52}, - {"matrix":[4,15], "flags":1, "x":169, "y":52}, - {"matrix":[4,17], "flags":4, "x":193, "y":52}, - {"matrix":[4,18], "flags":4, "x":203, "y":52}, - {"matrix":[4,19], "flags":4, "x":214, "y":52}, - {"matrix":[4,20], "flags":4, "x":224, "y":58}, + {"matrix":[4,0], "flags":1, "x":7, "y":50}, + {"matrix":[4,1], "flags":4, "x":26, "y":50}, + {"matrix":[4,2], "flags":4, "x":38, "y":50}, + {"matrix":[4,3], "flags":4, "x":50, "y":50}, + {"matrix":[4,4], "flags":4, "x":61, "y":50}, + {"matrix":[4,5], "flags":4, "x":73, "y":50}, + {"matrix":[4,6], "flags":4, "x":85, "y":50}, + {"matrix":[4,7], "flags":4, "x":96, "y":50}, + {"matrix":[4,8], "flags":4, "x":108, "y":50}, + {"matrix":[4,9], "flags":4, "x":120, "y":50}, + {"matrix":[4,10], "flags":4, "x":131, "y":50}, + {"matrix":[4,11], "flags":1, "x":147, "y":50}, + {"matrix":[4,13], "flags":1, "x":164, "y":51}, + {"matrix":[4,15], "flags":4, "x":189, "y":50}, + {"matrix":[4,16], "flags":4, "x":201, "y":50}, + {"matrix":[4,17], "flags":4, "x":212, "y":50}, + {"matrix":[5,18], "flags":4, "x":224, "y":56}, - {"matrix":[5,0], "flags":1, "x":1, "y":64}, - {"matrix":[5,1], "flags":1, "x":14, "y":64}, - {"matrix":[5,2], "flags":1, "x":27, "y":64}, - {"matrix":[5,6], "flags":4, "x":66, "y":64}, - {"matrix":[5,10], "flags":1, "x":105, "y":64}, - {"matrix":[5,11], "flags":1, "x":118, "y":64}, - {"matrix":[5,12], "flags":1, "x":131, "y":64}, - {"matrix":[5,13], "flags":1, "x":144, "y":64}, - {"matrix":[5,14], "flags":1, "x":159, "y":64}, - {"matrix":[5,15], "flags":1, "x":169, "y":64}, - {"matrix":[5,16], "flags":1, "x":180, "y":64}, - {"matrix":[5,17], "flags":4, "x":198, "y":64}, - {"matrix":[5,18], "flags":4, "x":214, "y":64} + {"matrix":[5,0], "flags":1, "x":1, "y":63}, + {"matrix":[5,1], "flags":1, "x":16, "y":63}, + {"matrix":[5,2], "flags":1, "x":31, "y":63}, + {"matrix":[5,5], "flags":4, "x":74, "y":63}, + {"matrix":[5,9], "flags":1, "x":117, "y":63}, + {"matrix":[5,10], "flags":1, "x":128, "y":63}, + {"matrix":[5,11], "flags":1, "x":140, "y":63}, + {"matrix":[5,12], "flags":1, "x":153, "y":64}, + {"matrix":[5,13], "flags":1, "x":164, "y":64}, + {"matrix":[5,14], "flags":1, "x":176, "y":64}, + {"matrix":[5,15], "flags":4, "x":195, "y":63}, + {"matrix":[5,17], "flags":4, "x":212, "y":63} ] } } diff --git a/keyboards/keychron/x6/ansi/red/keymaps/default/keymap.c b/keyboards/keychron/x6/ansi/red/keymaps/default/keymap.c index cf7d70a1fa55..a281e5e4fcf3 100755 --- a/keyboards/keychron/x6/ansi/red/keymaps/default/keymap.c +++ b/keyboards/keychron/x6/ansi/red/keymaps/default/keymap.c @@ -16,11 +16,11 @@ #include QMK_KEYBOARD_H -enum layers{ - WIN_BASE, - WIN_FN, - WIN_L2, - WIN_L3, +enum layers { + WIN_BASE, + WIN_FN, + WIN_L2, + WIN_L3, }; #define KC_TASK LGUI(KC_TAB) @@ -28,34 +28,34 @@ enum layers{ // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS, - 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_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - 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_P4, KC_P5, KC_P6, - 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_BASE] = LAYOUT_101_ansi( + KC_ESC, 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_PGUP, KC_HOME, KC_END, KC_PSCR, KC_CALC, + 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_BSPC, KC_PGDN, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, _______, BL_STEP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_FN] = LAYOUT_101_ansi( + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_L2] = LAYOUT_104_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_L3] = LAYOUT_104_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_L2] = LAYOUT_101_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_L3] = LAYOUT_101_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/x6/ansi/red/keymaps/keychron/keymap.c b/keyboards/keychron/x6/ansi/red/keymaps/keychron/keymap.c index 8d3cd1aaedef..cc51f70d7946 100755 --- a/keyboards/keychron/x6/ansi/red/keymaps/keychron/keymap.c +++ b/keyboards/keychron/x6/ansi/red/keymaps/keychron/keymap.c @@ -27,36 +27,36 @@ enum layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS, - 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_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - 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_P4, KC_P5, KC_P6, - 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_BASE] = LAYOUT_101_ansi( + KC_ESC, 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_PGUP, KC_HOME, KC_END, KC_PSCR, KC_CALC, + 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_BSPC, KC_PGDN, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, _______, BL_STEP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_FN] = LAYOUT_101_ansi( + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_L2] = LAYOUT_104_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_L3] = LAYOUT_104_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_L2] = LAYOUT_101_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_L3] = LAYOUT_101_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; // clang-format on diff --git a/keyboards/keychron/x6/ansi/red/keymaps/via/keymap.c b/keyboards/keychron/x6/ansi/red/keymaps/via/keymap.c index 01e9a4d6ff2c..bbfbd7166081 100755 --- a/keyboards/keychron/x6/ansi/red/keymaps/via/keymap.c +++ b/keyboards/keychron/x6/ansi/red/keymaps/via/keymap.c @@ -28,34 +28,34 @@ enum layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS, - 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_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - 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_P4, KC_P5, KC_P6, - 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_BASE] = LAYOUT_101_ansi( + KC_ESC, 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_PGUP, KC_HOME, KC_END, KC_PSCR, KC_CALC, + 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_BSPC, KC_PGDN, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, _______, BL_STEP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_FN] = LAYOUT_101_ansi( + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_L2] = LAYOUT_104_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_L3] = LAYOUT_104_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_L2] = LAYOUT_101_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [WIN_L3] = LAYOUT_101_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/x6/ansi/red/red.c b/keyboards/keychron/x6/ansi/red/red.c index 4c3123feaad6..19f790671505 100755 --- a/keyboards/keychron/x6/ansi/red/red.c +++ b/keyboards/keychron/x6/ansi/red/red.c @@ -24,7 +24,6 @@ const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { * | LED address * | | */ {0, F_1 }, - {0, F_2 }, {0, F_3 }, {0, F_4 }, {0, F_5 }, @@ -36,9 +35,12 @@ const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, F_11}, {0, F_12}, {0, F_13}, + {0, F_14}, {0, F_15}, {0, F_16}, - {0, G_1 }, + {0, L_16}, + {0, L_15}, + {0, L_14}, {0, E_1 }, {0, E_2 }, @@ -56,11 +58,9 @@ const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, E_14}, {0, E_15}, {0, E_16}, - {0, H_1 }, - {0, H_2 }, - {0, H_3 }, - {0, H_4 }, - {0, H_5 }, + {0, K_16}, + {0, K_15}, + {0, K_14}, {0, D_1 }, {0, D_2 }, @@ -78,11 +78,9 @@ const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, D_14}, {0, D_15}, {0, D_16}, - {0, G_6 }, - {0, G_7 }, - {0, G_8 }, - {0, G_9 }, - {0, G_10}, + {0, J_16}, + {0, J_15}, + {0, I_14}, {0, C_1 }, {0, C_2 }, @@ -96,12 +94,13 @@ const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, C_10}, {0, C_11}, {0, C_12}, - {0, C_14}, - {0, H_7 }, - {0, H_8 }, - {0, H_9 }, + {0, C_13}, + {0, C_16}, + {0, I_16}, + {0, I_15}, {0, B_1 }, + {0, B_2 }, {0, B_3 }, {0, B_4 }, {0, B_5 }, @@ -112,25 +111,23 @@ const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, B_10}, {0, B_11}, {0, B_12}, - {0, B_14}, + {0, B_13}, {0, B_16}, - {0, H_6 }, - {0, H_11}, - {0, H_12}, - {0, H_10}, + {0, H_16}, + {0, H_15}, + {0, G_14}, {0, A_1 }, {0, A_2 }, {0, A_3 }, - {0, A_7 }, + {0, A_6 }, + {0, A_10}, {0, A_11}, {0, A_12}, {0, A_13}, {0, A_14}, {0, A_15}, {0, A_16}, - {0, G_13}, - {0, G_11}, - {0, G_12}, + {0, G_15}, }; #endif diff --git a/keyboards/keychron/x6/config.h b/keyboards/keychron/x6/config.h index 5e5e0e31788a..05d700e22abd 100755 --- a/keyboards/keychron/x6/config.h +++ b/keyboards/keychron/x6/config.h @@ -27,8 +27,8 @@ #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) /* Winlock indicator */ -#define LED_WIN_LOCK_PIN A5 -#define LED_PIN_ON_STATE 1 +#define LED_WIN_LOCK_PIN B15 +#define LED_WIN_LOCK_PIN_ON_STATE 1 /* User used eeprom */ #define EECONFIG_USER_DATA_SIZE 1 diff --git a/keyboards/keychron/x6/info.json b/keyboards/keychron/x6/info.json index a33a54a59018..c62095c36848 100755 --- a/keyboards/keychron/x6/info.json +++ b/keyboards/keychron/x6/info.json @@ -14,9 +14,8 @@ }, "diode_direction": "ROW2COL", "indicators": { - "caps_lock": "A3", - "scroll_lock": "A6", - "num_lock": "A4" + "caps_lock": "C9", + "num_lock": "B14" }, "features": { "bootmagic": true, @@ -27,24 +26,26 @@ "nkro": true }, "layouts": { - "LAYOUT_104_ansi": { + "LAYOUT_101_ansi": { "layout": [ {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,1], "x":2, "y":0}, - {"matrix":[0,2], "x":3, "y":0}, - {"matrix":[0,3], "x":4, "y":0}, - {"matrix":[0,4], "x":5, "y":0}, - {"matrix":[0,5], "x":6.5, "y":0}, - {"matrix":[0,6], "x":7.5, "y":0}, - {"matrix":[0,7], "x":8.5, "y":0}, - {"matrix":[0,8], "x":9.5, "y":0}, - {"matrix":[0,9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "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.5, "y":0}, + {"matrix":[0,7], "x":7.5, "y":0}, + {"matrix":[0,8], "x":8.5, "y":0}, + {"matrix":[0,9], "x":9.5, "y":0}, + {"matrix":[0,10], "x":11, "y":0}, + {"matrix":[0,11], "x":12, "y":0}, + {"matrix":[0,12], "x":13, "y":0}, + {"matrix":[0,13], "x":14, "y":0}, {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,15], "x":16.5, "y":0}, + {"matrix":[0,16], "x":17.5, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, {"matrix":[1,0], "x":0, "y":1.25}, {"matrix":[1,1], "x":1, "y":1.25}, @@ -61,12 +62,10 @@ {"matrix":[1,12], "x":12, "y":1.25}, {"matrix":[1,13], "x":13, "y":1.25, "w":2}, {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,15], "x":16.5, "y":1.25}, + {"matrix":[1,16], "x":17.5, "y":1.25}, {"matrix":[1,17], "x":18.5, "y":1.25}, {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[1,19], "x":20.5, "y":1.25}, - {"matrix":[1,20], "x":21.5, "y":1.25}, {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2,1], "x":1.5, "y":2.25}, @@ -83,12 +82,10 @@ {"matrix":[2,12], "x":12.5, "y":2.25}, {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,15], "x":16.5, "y":2.25}, + {"matrix":[2,16], "x":17.5, "y":2.25}, {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[2,19], "x":20.5, "y":2.25}, - {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3,18], "x":19.5, "y":2.25, "h":2}, {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3,1], "x":1.75, "y":3.25}, @@ -102,42 +99,41 @@ {"matrix":[3,9], "x":9.75, "y":3.25}, {"matrix":[3,10], "x":10.75, "y":3.25}, {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3,12], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3,15], "x":16.5, "y":3.25}, + {"matrix":[3,16], "x":17.5, "y":3.25}, {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,19], "x":20.5, "y":3.25}, {"matrix":[4,0], "x":0, "y":4.25, "w":2.25}, - {"matrix":[4,2], "x":2.25, "y":4.25}, - {"matrix":[4,3], "x":3.25, "y":4.25}, - {"matrix":[4,4], "x":4.25, "y":4.25}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4,1], "x":2.25, "y":4.25}, + {"matrix":[4,2], "x":3.25, "y":4.25}, + {"matrix":[4,3], "x":4.25, "y":4.25}, + {"matrix":[4,4], "x":5.25, "y":4.25}, + {"matrix":[4,5], "x":6.25, "y":4.25}, + {"matrix":[4,6], "x":7.25, "y":4.25}, + {"matrix":[4,7], "x":8.25, "y":4.25}, + {"matrix":[4,8], "x":9.25, "y":4.25}, + {"matrix":[4,9], "x":10.25, "y":4.25}, + {"matrix":[4,10], "x":11.25, "y":4.25}, + {"matrix":[4,11], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4,12], "x":14.25, "y":4.25}, + {"matrix":[4,15], "x":16.5, "y":4.25}, + {"matrix":[4,16], "x":17.5, "y":4.25}, {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,19], "x":20.5, "y":4.25}, - {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, + {"matrix":[5,18], "x":19.5, "y":4.25, "h":2}, {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5,5], "x":3.75, "y":5.25, "w":6.25}, + {"matrix":[5,9], "x":10, "y":5.25}, + {"matrix":[5,10], "x":11, "y":5.25}, + {"matrix":[5,11], "x":12, "y":5.25}, + {"matrix":[5,12], "x":13.25, "y":5.25}, + {"matrix":[5,13], "x":14.25, "y":5.25}, {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25} + {"matrix":[5,15], "x":16.5, "y":5.25, "w":2}, + {"matrix":[5,17], "x":18.5, "y":5.25} ] } } diff --git a/keyboards/keychron/x6/via_json/x6_ansi_red.json b/keyboards/keychron/x6/via_json/x6_ansi_red.json index 933d384b5088..6be481fd33b3 100755 --- a/keyboards/keychron/x6/via_json/x6_ansi_red.json +++ b/keyboards/keychron/x6/via_json/x6_ansi_red.json @@ -16,7 +16,7 @@ {"name": "Screen Shot","title": "Screenshot in macOS","shortName": "SShot"}, {"name": "Cortana","title": "Cortana in windows","shortName": "Cortana"} ], - "matrix": {"rows": 6, "cols": 21}, + "matrix": {"rows": 6, "cols": 19}, "layouts": { "keymap": [ [ @@ -28,37 +28,40 @@ "x": 1, "c": "#cccccc" }, - "0,1", "0,2", "0,3", "0,4", + "0,5", { - "x": 0.5, - "c": "#aaaaaa" + "x": 0.5 }, - "0,5", "0,6", "0,7", "0,8", + "0,9", { - "x": 0.5, - "c": "#cccccc" + "x": 0.5 }, - "0,9", "0,10", "0,11", "0,12", + "0,13", { - "x": 0.25, - "c": "#aaaaaa" + "x": 0.25 }, "0,14", + { + "x": 0.25 + }, "0,15", - "0,16" + "0,16", + "0,17", + "0,18" ], [ { - "y": 0.25 + "y": 0.25, + "c": "#aaaaaa" }, "1,0", { @@ -82,19 +85,17 @@ }, "1,13", { - "x": 0.25 + "x": 0.25, + "c": "#cccccc" }, "1,14", - "1,15", - "1,16", { - "x": 0.25, - "c": "#cccccc" + "x": 0.25 }, + "1,15", + "1,16", "1,17", - "1,18", - "1,19", - "1,20" + "1,18" ], [ { @@ -123,22 +124,20 @@ }, "2,13", { - "x": 0.25 + "x": 0.25, + "c": "#cccccc" }, "2,14", - "2,15", - "2,16", { - "x": 0.25, - "c": "#cccccc" + "x": 0.25 }, + "2,15", + "2,16", "2,17", - "2,18", - "2,19", { "h": 2 }, - "2,20" + "3,18" ], [ { @@ -164,14 +163,14 @@ "c": "#777777", "w": 2.25 }, - "3,13", + "3,12", { - "x": 3.5, + "x": 1.5, "c": "#cccccc" }, - "3,17", - "3,18", - "3,19" + "3,15", + "3,16", + "3,17" ], [ { @@ -182,6 +181,7 @@ { "c": "#cccccc" }, + "4,1", "4,2", "4,3", "4,4", @@ -191,29 +191,27 @@ "4,8", "4,9", "4,10", - "4,11", { "c": "#aaaaaa", - "w": 2.75 + "w": 1.75 }, - "4,13", + "4,11", { - "x": 1.25, - "c": "#777777" + "x": 0.25, + "c": "#cccccc" }, - "4,15", + "4,12", { - "x": 1.25, - "c": "#cccccc" + "x": 1.25 }, + "4,15", + "4,16", "4,17", - "4,18", - "4,19", { "c": "#777777", "h": 2 }, - "4,20" + "5,18" ], [ { @@ -230,41 +228,29 @@ }, "5,2", { - "c": "#cccccc", + "c": "#777777", "w": 6.25 }, - "5,6", + "5,5", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, + "5,9", "5,10", - { - "w": 1.25 - }, "5,11", { - "w": 1.25 + "x": 0.25, + "c": "#cccccc" }, "5,12", - { - "w": 1.25 - }, "5,13", - { - "x": 0.25, - "c": "#777777" - }, "5,14", - "5,15", - "5,16", { "x": 0.25, - "c": "#cccccc", "w": 2 }, - "5,17", - "5,18" + "5,15", + "5,17" ] ] } diff --git a/keyboards/keychron/x6/x6.c b/keyboards/keychron/x6/x6.c index 80edadabe0f4..0c7355cf260f 100755 --- a/keyboards/keychron/x6/x6.c +++ b/keyboards/keychron/x6/x6.c @@ -18,8 +18,8 @@ static uint8_t win_lock_state = 0; -#define SET_LED_WIN_LOCK_ON writePin(LED_WIN_LOCK_PIN, LED_PIN_ON_STATE) -#define SET_LED_WIN_LOCK_OFF writePin(LED_WIN_LOCK_PIN, !LED_PIN_ON_STATE) +#define SET_LED_WIN_LOCK_ON writePin(LED_WIN_LOCK_PIN, LED_WIN_LOCK_PIN_ON_STATE) +#define SET_LED_WIN_LOCK_OFF writePin(LED_WIN_LOCK_PIN, !LED_WIN_LOCK_PIN_ON_STATE) static void set_led_win_lock_state(void) { if (win_lock_state) { @@ -65,9 +65,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { win_lock_state = !win_lock_state; eeconfig_update_user_datablock(&win_lock_state); if (win_lock_state) { - writePin(LED_WIN_LOCK_PIN, LED_PIN_ON_STATE); + writePin(LED_WIN_LOCK_PIN, LED_WIN_LOCK_PIN_ON_STATE); } else { - writePin(LED_WIN_LOCK_PIN, !LED_PIN_ON_STATE); + writePin(LED_WIN_LOCK_PIN, !LED_WIN_LOCK_PIN_ON_STATE); } } return true;