From 7753249d3d284afcc4b164f808dfaafdd02b3e8c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 20 Jun 2023 19:29:44 -0700 Subject: [PATCH] NovelKeys NK+: correct layout data (#21317) * NovelKeys NK+: correct layout data Add key sizes to the layout data. * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan --- keyboards/novelkeys/nk_plus/info.json | 31 ++++++++++++------- .../nk_plus/keymaps/default/keymap.c | 4 +-- .../novelkeys/nk_plus/keymaps/via/keymap.c | 4 +-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json index 6444b82d37..4fdbf80f5c 100755 --- a/keyboards/novelkeys/nk_plus/info.json +++ b/keyboards/novelkeys/nk_plus/info.json @@ -111,8 +111,11 @@ "ws2812": { "pin": "B4" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_65_xt_ansi_blocker_tsangan" + }, "layouts": { - "LAYOUT": { + "LAYOUT_65_xt_ansi_blocker_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -129,11 +132,12 @@ {"matrix": [0, 12], "x": 12.5, "y": 0}, {"matrix": [0, 13], "x": 13.5, "y": 0}, {"matrix": [0, 14], "x": 14.5, "y": 0}, - {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2}, {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, {"matrix": [1, 3], "x": 4, "y": 1}, {"matrix": [1, 4], "x": 5, "y": 1}, {"matrix": [1, 5], "x": 6, "y": 1}, @@ -146,11 +150,12 @@ {"matrix": [1, 12], "x": 13, "y": 1}, {"matrix": [1, 13], "x": 14, "y": 1}, {"matrix": [1, 14], "x": 15, "y": 1}, - {"matrix": [1, 15], "x": 16, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, {"matrix": [2, 3], "x": 4.25, "y": 2}, {"matrix": [2, 4], "x": 5.25, "y": 2}, {"matrix": [2, 5], "x": 6.25, "y": 2}, @@ -162,11 +167,12 @@ {"matrix": [2, 11], "x": 12.25, "y": 2}, {"matrix": [2, 12], "x": 13.25, "y": 2}, {"matrix": [2, 13], "x": 14.25, "y": 2}, - {"matrix": [2, 15], "x": 15.25, "y": 2}, + {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25}, {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, {"matrix": [3, 4], "x": 4.75, "y": 3}, {"matrix": [3, 5], "x": 5.75, "y": 3}, {"matrix": [3, 6], "x": 6.75, "y": 3}, @@ -177,16 +183,17 @@ {"matrix": [3, 11], "x": 11.75, "y": 3}, {"matrix": [3, 12], "x": 12.75, "y": 3}, {"matrix": [3, 13], "x": 13.75, "y": 3}, - {"matrix": [3, 14], "x": 14.75, "y": 3}, + {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75}, {"matrix": [3, 15], "x": 16.5, "y": 3}, {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, {"matrix": [4, 3], "x": 4, "y": 4}, - {"matrix": [4, 4], "x": 5, "y": 4}, - {"matrix": [4, 8], "x": 6.5, "y": 4}, - {"matrix": [4, 13], "x": 13.5, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 6.5, "y": 4, "w": 7}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}, {"matrix": [4, 14], "x": 15.5, "y": 4}, {"matrix": [4, 15], "x": 16.5, "y": 4}, {"matrix": [4, 16], "x": 17.5, "y": 4} diff --git a/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c b/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c index b5697a731d..358ea8b18b 100644 --- a/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c +++ b/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ +[0] = LAYOUT_65_xt_ansi_blocker_tsangan( /* Base */ KC_F1, KC_F2, QK_GESC, 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_F3, KC_F4, 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_F5, KC_F6, 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_F7, KC_F8, 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_END, KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT( /* FN */ +[1] = LAYOUT_65_xt_ansi_blocker_tsangan( /* FN */ 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c b/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c index 9e877b9804..0d29c5da82 100644 --- a/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c +++ b/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ +[0] = LAYOUT_65_xt_ansi_blocker_tsangan( /* Base */ KC_F1, KC_F2, QK_GESC, 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_F3, KC_F4, 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_F5, KC_F6, 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_F7, KC_F8, 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_END, KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT( /* FN */ +[1] = LAYOUT_65_xt_ansi_blocker_tsangan( /* FN */ 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,