From b5181e3d0633bfa891c1dd7d4967a131847baa3b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 17 Sep 2023 20:17:51 -0700 Subject: [PATCH] Viktus Styrka Topre Layout Standardization and Touch-Up (#22044) * Add layout/matrix diagram [docs] * Alias `LAYOUT_all` to `LAYOUT_split_6u` `LAYOUT_all` and `LAYOUT_split_6u` represent the same matrix positions and sequence, so implement the former as an alias. [refactor] * Touch-up keymaps - grid-align keycodes - use QMK-native keycode aliases [chore] * Friendly-format `info.json` [style] * Correct layout data Correct key sizes/positioning on the bottom row. [chore] * Rename `LAYOUT_2u_6u` to `LAYOUT_65_xt_ansi_blocker` [refactor] * Rename `LAYOUT_2u_7u` to `LAYOUT_65_xt_ansi_blocker_tsangan` [refactor] * Rename `LAYOUT_split_6u` to `LAYOUT_65_xt_ansi_blocker_split_bs` [refactor] * Rename `LAYOUT_split_7u` to `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs` [refactor] --- keyboards/viktus/styrka_topre/info.json | 158 +++++++----------- .../styrka_topre/keymaps/default/keymap.c | 12 +- .../viktus/styrka_topre/keymaps/via/keymap.c | 12 +- .../viktus/styrka_topre/matrix_diagram.md | 21 +++ 4 files changed, 92 insertions(+), 111 deletions(-) create mode 100644 keyboards/viktus/styrka_topre/matrix_diagram.md diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/info.json index f6d3560985..7095a8f484 100644 --- a/keyboards/viktus/styrka_topre/info.json +++ b/keyboards/viktus/styrka_topre/info.json @@ -26,93 +26,19 @@ "cols": ["B5", "B4", "D7", "D6", "F6", "F5", "F4", "C7", "C6", "B6", "F7", "B1", "B2", "B3", "B7", "F1", "F0", "E6"], "rows": ["A7", "A6", "A4", "A5", "A3"] }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_split_bs", + "LAYOUT_2u_6u": "LAYOUT_65_xt_ansi_blocker", + "LAYOUT_2u_7u": "LAYOUT_65_xt_ansi_blocker_tsangan", + "LAYOUT_split_6u": "LAYOUT_65_xt_ansi_blocker_split_bs", + "LAYOUT_split_7u": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs" + }, "layouts": { - "LAYOUT_all": { - "layout": [ - {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "K002", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "K003", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "K004", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "K005", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "K006", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "K007", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "K008", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "K009", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "K00A", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "K00B", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "K00C", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "K00D", "matrix": [0, 13], "x": 13, "y": 0}, - {"label": "K00E", "matrix": [0, 14], "x": 14, "y": 0}, - {"label": "K00F", "matrix": [0, 15], "x": 15, "y": 0}, - {"label": "K010", "matrix": [0, 16], "x": 16, "y": 0}, - {"label": "K011", "matrix": [0, 17], "x": 17, "y": 0}, - {"label": "K100", "matrix": [1, 0], "x": 18, "y": 0}, - {"label": "K101", "matrix": [1, 1], "x": 19, "y": 0}, - {"label": "K102", "matrix": [1, 2], "x": 20, "y": 0}, - {"label": "K103", "matrix": [1, 3], "x": 21, "y": 0}, - {"label": "K104", "matrix": [1, 4], "x": 22, "y": 0}, - {"label": "K105", "matrix": [1, 5], "x": 23, "y": 0}, - {"label": "K106", "matrix": [1, 6], "x": 24, "y": 0}, - {"label": "K107", "matrix": [1, 7], "x": 25, "y": 0}, - {"label": "K108", "matrix": [1, 8], "x": 26, "y": 0}, - {"label": "K109", "matrix": [1, 9], "x": 27, "y": 0}, - {"label": "K10A", "matrix": [1, 10], "x": 28, "y": 0}, - {"label": "K10B", "matrix": [1, 11], "x": 29, "y": 0}, - {"label": "K10C", "matrix": [1, 12], "x": 30, "y": 0}, - {"label": "K10D", "matrix": [1, 13], "x": 31, "y": 0}, - {"label": "K10E", "matrix": [1, 14], "x": 32, "y": 0}, - {"label": "K110", "matrix": [1, 16], "x": 33, "y": 0}, - {"label": "K111", "matrix": [1, 17], "x": 34, "y": 0}, - {"label": "K200", "matrix": [2, 0], "x": 35, "y": 0}, - {"label": "K201", "matrix": [2, 1], "x": 36, "y": 0}, - {"label": "K202", "matrix": [2, 2], "x": 37, "y": 0}, - {"label": "K203", "matrix": [2, 3], "x": 38, "y": 0}, - {"label": "K204", "matrix": [2, 4], "x": 39, "y": 0}, - {"label": "K205", "matrix": [2, 5], "x": 40, "y": 0}, - {"label": "K206", "matrix": [2, 6], "x": 41, "y": 0}, - {"label": "K207", "matrix": [2, 7], "x": 42, "y": 0}, - {"label": "K208", "matrix": [2, 8], "x": 43, "y": 0}, - {"label": "K209", "matrix": [2, 9], "x": 44, "y": 0}, - {"label": "K20A", "matrix": [2, 10], "x": 45, "y": 0}, - {"label": "K20B", "matrix": [2, 11], "x": 46, "y": 0}, - {"label": "K20C", "matrix": [2, 12], "x": 47, "y": 0}, - {"label": "K20D", "matrix": [2, 13], "x": 48, "y": 0}, - {"label": "K20F", "matrix": [2, 15], "x": 49, "y": 0}, - {"label": "K211", "matrix": [2, 17], "x": 50, "y": 0}, - {"label": "K300", "matrix": [3, 0], "x": 51, "y": 0}, - {"label": "K301", "matrix": [3, 1], "x": 52, "y": 0}, - {"label": "K302", "matrix": [3, 2], "x": 53, "y": 0}, - {"label": "K304", "matrix": [3, 4], "x": 54, "y": 0}, - {"label": "K305", "matrix": [3, 5], "x": 55, "y": 0}, - {"label": "K306", "matrix": [3, 6], "x": 56, "y": 0}, - {"label": "K307", "matrix": [3, 7], "x": 57, "y": 0}, - {"label": "K308", "matrix": [3, 8], "x": 58, "y": 0}, - {"label": "K309", "matrix": [3, 9], "x": 59, "y": 0}, - {"label": "K30A", "matrix": [3, 10], "x": 60, "y": 0}, - {"label": "K30B", "matrix": [3, 11], "x": 61, "y": 0}, - {"label": "K30C", "matrix": [3, 12], "x": 62, "y": 0}, - {"label": "K30D", "matrix": [3, 13], "x": 63, "y": 0}, - {"label": "K30E", "matrix": [3, 14], "x": 64, "y": 0}, - {"label": "K310", "matrix": [3, 16], "x": 65, "y": 0}, - {"label": "K311", "matrix": [3, 17], "x": 66, "y": 0}, - {"label": "K400", "matrix": [4, 0], "x": 67, "y": 0}, - {"label": "K401", "matrix": [4, 1], "x": 68, "y": 0}, - {"label": "K402", "matrix": [4, 2], "x": 69, "y": 0}, - {"label": "K403", "matrix": [4, 3], "x": 70, "y": 0}, - {"label": "K404", "matrix": [4, 4], "x": 71, "y": 0}, - {"label": "K408", "matrix": [4, 8], "x": 72, "y": 0}, - {"label": "K40C", "matrix": [4, 12], "x": 73, "y": 0}, - {"label": "K40D", "matrix": [4, 13], "x": 74, "y": 0}, - {"label": "K40E", "matrix": [4, 14], "x": 75, "y": 0}, - {"label": "K410", "matrix": [4, 16], "x": 76, "y": 0}, - {"label": "K411", "matrix": [4, 17], "x": 77, "y": 0} - ] - }, - "LAYOUT_2u_6u": { + "LAYOUT_65_xt_ansi_blocker": { "layout": [ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0}, {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0}, {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0}, @@ -128,8 +54,10 @@ {"label": "K00E", "matrix": [0, 14], "x": 14.25, "y": 0}, {"label": "K010", "matrix": [0, 16], "x": 15.25, "y": 0, "w": 2}, {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0}, + {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1}, {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1}, @@ -145,8 +73,10 @@ {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1}, {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5}, {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1}, + {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2}, {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2}, @@ -161,8 +91,10 @@ {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2}, {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25}, {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2}, + {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3}, {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3}, @@ -177,23 +109,26 @@ {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75}, {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3}, {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3}, + {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4}, - {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, - {"label": "K403", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, - {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, - {"label": "K408", "matrix": [4, 8], "x": 6, "y": 4, "w": 6.25}, - {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4}, - {"label": "K40D", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5}, + + {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, + {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4}, + {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5}, + {"label": "K408", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6}, + {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5}, + {"label": "K40D", "matrix": [4, 13], "x": 13.75, "y": 4}, {"label": "K40E", "matrix": [4, 14], "x": 15.25, "y": 4}, {"label": "K410", "matrix": [4, 16], "x": 16.25, "y": 4}, {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4} ] }, - "LAYOUT_2u_7u": { + "LAYOUT_65_xt_ansi_blocker_tsangan": { "layout": [ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0}, {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0}, {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0}, @@ -209,8 +144,10 @@ {"label": "K00E", "matrix": [0, 14], "x": 14.25, "y": 0}, {"label": "K010", "matrix": [0, 16], "x": 15.25, "y": 0, "w": 2}, {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0}, + {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1}, {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1}, @@ -226,8 +163,10 @@ {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1}, {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5}, {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1}, + {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2}, {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2}, @@ -242,8 +181,10 @@ {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2}, {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25}, {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2}, + {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3}, {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3}, @@ -258,8 +199,10 @@ {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75}, {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3}, {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3}, + {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4}, {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5}, @@ -270,11 +213,11 @@ {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4} ] }, - - "LAYOUT_split_6u": { + "LAYOUT_65_xt_ansi_blocker_split_bs": { "layout": [ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0}, {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0}, {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0}, @@ -291,8 +234,10 @@ {"label": "K00F", "matrix": [0, 15], "x": 15.25, "y": 0}, {"label": "K010", "matrix": [0, 16], "x": 16.25, "y": 0}, {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0}, + {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1}, {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1}, @@ -308,8 +253,10 @@ {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1}, {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5}, {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1}, + {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2}, {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2}, @@ -324,8 +271,10 @@ {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2}, {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25}, {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2}, + {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3}, {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3}, @@ -340,23 +289,26 @@ {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75}, {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3}, {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3}, + {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4}, - {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, - {"label": "K403", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, - {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, - {"label": "K408", "matrix": [4, 8], "x": 6, "y": 4, "w": 6.25}, - {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4}, - {"label": "K40D", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5}, + + {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, + {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4}, + {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5}, + {"label": "K408", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6}, + {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5}, + {"label": "K40D", "matrix": [4, 13], "x": 13.75, "y": 4}, {"label": "K40E", "matrix": [4, 14], "x": 15.25, "y": 4}, {"label": "K410", "matrix": [4, 16], "x": 16.25, "y": 4}, {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4} ] }, - "LAYOUT_split_7u": { + "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": { "layout": [ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K001", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K002", "matrix": [0, 2], "x": 2.25, "y": 0}, {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0}, {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0}, @@ -373,8 +325,10 @@ {"label": "K00F", "matrix": [0, 15], "x": 15.25, "y": 0}, {"label": "K010", "matrix": [0, 16], "x": 16.25, "y": 0}, {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0}, + {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1}, {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1}, @@ -390,8 +344,10 @@ {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1}, {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5}, {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1}, + {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2}, {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2}, @@ -406,8 +362,10 @@ {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2}, {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25}, {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2}, + {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3}, {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3}, @@ -422,8 +380,10 @@ {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75}, {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3}, {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3}, + {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4}, {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5}, diff --git a/keyboards/viktus/styrka_topre/keymaps/default/keymap.c b/keyboards/viktus/styrka_topre/keymaps/default/keymap.c index 5c3f8fa031..38a4530905 100644 --- a/keyboards/viktus/styrka_topre/keymaps/default/keymap.c +++ b/keyboards/viktus/styrka_topre/keymaps/default/keymap.c @@ -17,11 +17,11 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_2u_7u( - KC_F1, KC_F2, 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_DEL, - 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, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + [0] = LAYOUT_65_xt_ansi_blocker_tsangan( + KC_F1, KC_F2, 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_DEL, + 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, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) }; diff --git a/keyboards/viktus/styrka_topre/keymaps/via/keymap.c b/keyboards/viktus/styrka_topre/keymaps/via/keymap.c index 5c3f8fa031..38a4530905 100644 --- a/keyboards/viktus/styrka_topre/keymaps/via/keymap.c +++ b/keyboards/viktus/styrka_topre/keymaps/via/keymap.c @@ -17,11 +17,11 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_2u_7u( - KC_F1, KC_F2, 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_DEL, - 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, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + [0] = LAYOUT_65_xt_ansi_blocker_tsangan( + KC_F1, KC_F2, 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_DEL, + 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, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) }; diff --git a/keyboards/viktus/styrka_topre/matrix_diagram.md b/keyboards/viktus/styrka_topre/matrix_diagram.md new file mode 100644 index 0000000000..6289d2387a --- /dev/null +++ b/keyboards/viktus/styrka_topre/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for Viktus Design LLC Styrka - Topre + +``` + ┌───────┐ + 2u Backspace │0G │ + └───────┘ +┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 ││02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │0G │0H │ +├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 │11 ││12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1G │1H │ +├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 │21 ││22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F │2H │ +├───┼───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 │31 ││32 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3G │3H │ +├───┼───┤├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤ +│40 │41 ││42 │43 │44 │48 │4C │4D │ │4E │4G │4H │ +└───┴───┘└─────┴───┴─────┴───────────────────────┴─────┴───┘ └───┴───┴───┘ + ┌─────┬───┬─────┬───────────────────────────┬─────┐ + │42 │43 │44 │48 │4D │ Blocker Tsangan + └─────┴───┴─────┴───────────────────────────┴─────┘ +```