From 8ee86df7fbeb960dbb2402da186f4f078cb7511a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:38:09 -0700 Subject: [PATCH 01/12] add matrix_diagram.md --- .../cherrybstudio/cb87v2/matrix_diagram.md | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 keyboards/cherrybstudio/cb87v2/matrix_diagram.md diff --git a/keyboards/cherrybstudio/cb87v2/matrix_diagram.md b/keyboards/cherrybstudio/cb87v2/matrix_diagram.md new file mode 100644 index 000000000000..ea9ea20da88e --- /dev/null +++ b/keyboards/cherrybstudio/cb87v2/matrix_diagram.md @@ -0,0 +1,34 @@ +# Matrix Diagram for CherryB.Studio CB87v2 + + +``` +┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ +│00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │10 │11 │12 │ │13 │14 │15 │ +└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐ +│16 │17 │18 │19 │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │30 │ │31 │32 │33 │ │30 │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤ ┌─────┐ +│34 │35 │36 │37 │38 │39 │40 │41 │42 │43 │44 │45 │46 │47 │ │48 │49 │50 │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐64 │ ISO Enter ┌──┘64 │ BAE Enter +│51 │52 │53 │54 │55 │56 │57 │58 │59 │60 │61 │62 │64 │ │63 │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ┌─┴─┬─┴────┤ └────────┘ +│65 │66 │67 │68 │69 │70 │71 │72 │73 │74 │75 │76 │77 │78 │ │79 │ │77 │78 │ 1u/1.75u RShift +├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └───┴──────┘ +│80 │81 │82 │83 │84 │85 │86 │87 │88 │89 │ │90 │91 │92 │ +└────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘ └───┴───┴───┘ +┌────────┐ ┌──────────┐ +│65 │ 2.25u LShift 2.75u RShift │78 │ +└────────┘ └──────────┘ +┌────┬────┬────┬──────────┬────┬────────┬────┬────┬────┬────┐ +│80 │81 │82 │83 │84 │85 │86 │87 │88 │89 │ +└────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘ +┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐ +│80 │81 │82 │84 │86 │87 │88 │89 │ Standard +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│80 │81 │82 │84 │87 │88 │89 │ Tsangan/WKL +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +┌─────┬───┬─────┬──────────┬─────┬──────────┬─────┬───┬─────┐ +│80 │81 │82 │83 │84 │85 │87 │88 │89 │ Tsangan/WKL Split Space +└─────┴───┴─────┴──────────┴─────┴──────────┴─────┴───┴─────┘ +``` From 4160c6217e30075b5ba26ffd52a5bb0d0f49f35f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:40:57 -0700 Subject: [PATCH 02/12] info.json: apply friendly formatting --- keyboards/cherrybstudio/cb87v2/info.json | 186 +++++++++++------------ 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index a356a47df12c..bc13b17e6bbb 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -29,112 +29,112 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Esc", "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}, + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "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}, + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - {"matrix": [0, 9], "x": 11, "y": 0}, - {"matrix": [1, 0], "x": 12, "y": 0}, - {"matrix": [1, 1], "x": 13, "y": 0}, - {"matrix": [1, 2], "x": 14, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, - {"matrix": [1, 3], "x": 15.25, "y": 0}, - {"matrix": [1, 4], "x": 16.25, "y": 0}, - {"matrix": [1, 5], "x": 17.25, "y": 0}, + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, - {"matrix": [1, 6], "x": 0, "y": 1.25}, - {"matrix": [1, 7], "x": 1, "y": 1.25}, - {"matrix": [1, 8], "x": 2, "y": 1.25}, - {"matrix": [1, 9], "x": 3, "y": 1.25}, - {"matrix": [2, 0], "x": 4, "y": 1.25}, - {"matrix": [2, 1], "x": 5, "y": 1.25}, - {"matrix": [2, 2], "x": 6, "y": 1.25}, - {"matrix": [2, 3], "x": 7, "y": 1.25}, - {"matrix": [2, 4], "x": 8, "y": 1.25}, - {"matrix": [2, 5], "x": 9, "y": 1.25}, - {"matrix": [2, 6], "x": 10, "y": 1.25}, - {"matrix": [2, 7], "x": 11, "y": 1.25}, - {"matrix": [2, 8], "x": 12, "y": 1.25}, - {"matrix": [2, 9], "x": 13, "y": 1.25}, - {"matrix": [3, 0], "x": 14, "y": 1.25}, + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.25}, - {"matrix": [3, 1], "x": 15.25, "y": 1.25}, - {"matrix": [3, 2], "x": 16.25, "y": 1.25}, - {"matrix": [3, 3], "x": 17.25, "y": 1.25}, + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, - {"matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, - {"matrix": [3, 5], "x": 1.5, "y": 2.25}, - {"matrix": [3, 6], "x": 2.5, "y": 2.25}, - {"matrix": [3, 7], "x": 3.5, "y": 2.25}, - {"matrix": [3, 8], "x": 4.5, "y": 2.25}, - {"matrix": [3, 9], "x": 5.5, "y": 2.25}, - {"matrix": [4, 0], "x": 6.5, "y": 2.25}, - {"matrix": [4, 1], "x": 7.5, "y": 2.25}, - {"matrix": [4, 2], "x": 8.5, "y": 2.25}, - {"matrix": [4, 3], "x": 9.5, "y": 2.25}, - {"matrix": [4, 4], "x": 10.5, "y": 2.25}, - {"matrix": [4, 5], "x": 11.5, "y": 2.25}, - {"matrix": [4, 6], "x": 12.5, "y": 2.25}, - {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [4, 8], "x": 15.25, "y": 2.25}, - {"matrix": [4, 9], "x": 16.25, "y": 2.25}, - {"matrix": [5, 0], "x": 17.25, "y": 2.25}, + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, - {"matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, - {"matrix": [5, 2], "x": 1.75, "y": 3.25}, - {"matrix": [5, 3], "x": 2.75, "y": 3.25}, - {"matrix": [5, 4], "x": 3.75, "y": 3.25}, - {"matrix": [5, 5], "x": 4.75, "y": 3.25}, - {"matrix": [5, 6], "x": 5.75, "y": 3.25}, - {"matrix": [5, 7], "x": 6.75, "y": 3.25}, - {"matrix": [5, 8], "x": 7.75, "y": 3.25}, - {"matrix": [5, 9], "x": 8.75, "y": 3.25}, - {"matrix": [6, 0], "x": 9.75, "y": 3.25}, - {"matrix": [6, 1], "x": 10.75, "y": 3.25}, - {"matrix": [6, 2], "x": 11.75, "y": 3.25}, - {"matrix": [6, 3], "x": 12.75, "y": 3.25}, - {"matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, - {"matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [6, 6], "x": 1.25, "y": 4.25}, - {"matrix": [6, 7], "x": 2.25, "y": 4.25}, - {"matrix": [6, 8], "x": 3.25, "y": 4.25}, - {"matrix": [6, 9], "x": 4.25, "y": 4.25}, - {"matrix": [7, 0], "x": 5.25, "y": 4.25}, - {"matrix": [7, 1], "x": 6.25, "y": 4.25}, - {"matrix": [7, 2], "x": 7.25, "y": 4.25}, - {"matrix": [7, 3], "x": 8.25, "y": 4.25}, - {"matrix": [7, 4], "x": 9.25, "y": 4.25}, - {"matrix": [7, 5], "x": 10.25, "y": 4.25}, - {"matrix": [7, 6], "x": 11.25, "y": 4.25}, - {"matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, - {"matrix": [7, 8], "x": 14, "y": 4.25}, + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.25}, - {"matrix": [7, 9], "x": 16.25, "y": 4.25}, + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, - {"matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, - {"matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, - {"matrix": [8, 3], "x": 3.75, "y": 5.25, "w": 2.25}, - {"matrix": [8, 4], "x": 6, "y": 5.25, "w": 1.25}, - {"matrix": [8, 5], "x": 7.25, "y": 5.25, "w": 2.75}, - {"matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 5.25, "w": 2.25}, + {"label": "Space", "matrix": [8, 4], "x": 6, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [8, 5], "x": 7.25, "y": 5.25, "w": 2.75}, + {"label": "Alt", "matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, - {"matrix": [9, 0], "x": 15.25, "y": 5.25}, - {"matrix": [9, 1], "x": 16.25, "y": 5.25}, - {"matrix": [9, 2], "x": 17.25, "y": 5.25} + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] } } From f9c59c7dee9be5788f02cbf5478bac5656effe09 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:42:14 -0700 Subject: [PATCH 03/12] add LAYOUT_tkl_ansi_split_bs_rshift --- keyboards/cherrybstudio/cb87v2/info.json | 107 +++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index bc13b17e6bbb..eaaa3e8afd9b 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -132,6 +132,113 @@ {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + + "LAYOUT_tkl_ansi_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [8, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} From b831be99e95b5b14a71c0e03cf03d5c97680c8bf Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:42:49 -0700 Subject: [PATCH 04/12] add LAYOUT_tkl_ansi --- keyboards/cherrybstudio/cb87v2/info.json | 105 +++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index eaaa3e8afd9b..c581bd9b5218 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -138,6 +138,111 @@ ] }, + "LAYOUT_tkl_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [8, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 8c02bdce2d859b5f3b394c1999c98588e083396d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:43:39 -0700 Subject: [PATCH 05/12] add LAYOUT_tkl_ansi_tsangan_split_bs_rshift --- keyboards/cherrybstudio/cb87v2/info.json | 106 +++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index c581bd9b5218..2be35aeccf26 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -344,6 +344,112 @@ {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [8, 4], "x": 4, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [8, 7], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} From acf65a917b7fedd78f7c1a6cc1a5df5d67d683bd Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:44:19 -0700 Subject: [PATCH 06/12] add LAYOUT_tkl_ansi_tsangan --- keyboards/cherrybstudio/cb87v2/info.json | 104 +++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 2be35aeccf26..18245b312179 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -350,6 +350,110 @@ ] }, + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [8, 4], "x": 4, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [8, 7], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 22ddbfd9331fd2d925091502d82196c3838d185f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:45:34 -0700 Subject: [PATCH 07/12] add LAYOUT_tkl_iso_split_bs_rshift --- keyboards/cherrybstudio/cb87v2/info.json | 108 +++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 18245b312179..f2cc082fd6ca 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -554,6 +554,114 @@ {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25}, {"label": "Ctrl", "matrix": [8, 9], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + + "LAYOUT_tkl_iso_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [8, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} From c604f2691de67a1acb1ae558f31217b640b7d51a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:46:11 -0700 Subject: [PATCH 08/12] add LAYOUT_tkl_iso --- keyboards/cherrybstudio/cb87v2/info.json | 106 +++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index f2cc082fd6ca..4d0d1e2b0a7d 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -560,6 +560,112 @@ ] }, + "LAYOUT_tkl_iso": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [8, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From b66681af209b8d4414f2377f6e624cc4e528d643 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:47:03 -0700 Subject: [PATCH 09/12] add LAYOUT_tkl_iso_tsangan_split_bs_rshift --- keyboards/cherrybstudio/cb87v2/info.json | 107 +++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 4d0d1e2b0a7d..4e83b7fdc06f 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -768,6 +768,113 @@ {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, {"label": "Ctrl", "matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + + "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [8, 4], "x": 4, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [8, 7], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} From 71cf54c8561fcac55c7ebb82d22f63ddbe4f6197 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:47:35 -0700 Subject: [PATCH 10/12] add LAYOUT_tkl_iso_tsangan --- keyboards/cherrybstudio/cb87v2/info.json | 105 +++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 4e83b7fdc06f..493513c5a3e4 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -774,6 +774,111 @@ ] }, + "LAYOUT_tkl_iso_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 12, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 13, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 3], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [1, 4], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [1, 5], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [8, 4], "x": 4, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [8, 7], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "Menu", "matrix": [8, 8], "x": 12.5, "y": 5.25}, + {"label": "Ctrl", "matrix": [8, 9], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 61e9abc2fb2594e4f29b550c78b8822012abd983 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:48:21 -0700 Subject: [PATCH 11/12] enable Community Layout support --- keyboards/cherrybstudio/cb87v2/info.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 493513c5a3e4..6b399b8f80cb 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -26,6 +26,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": [ + "tkl_ansi", + "tkl_ansi_split_bs_rshift", + "tkl_ansi_tsangan", + "tkl_ansi_tsangan_split_bs_rshift", + "tkl_iso", + "tkl_iso_split_bs_rshift", + "tkl_iso_tsangan", + "tkl_iso_tsangan_split_bs_rshift" + ], "layouts": { "LAYOUT_all": { "layout": [ From 639e8ed37f8146f90e669759e7736d1f892bab1e Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:34:09 -0700 Subject: [PATCH 12/12] correct listed maintainer Maintainer has changed their GitHub username. --- keyboards/cherrybstudio/cb87v2/info.json | 2 +- keyboards/cherrybstudio/cb87v2/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 6b399b8f80cb..6bfdf7ce9116 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -2,7 +2,7 @@ "keyboard_name": "CB87v2", "manufacturer": "CherryB.Studio", "url": "https://discord.gg/qVwv3gcq83", - "maintainer": "duongaanh", + "maintainer": "lunaticwhat", "usb": { "vid": "0x4342", "pid": "0x8788", diff --git a/keyboards/cherrybstudio/cb87v2/readme.md b/keyboards/cherrybstudio/cb87v2/readme.md index 0fc32c40c1ce..3ec27bd5ddc2 100644 --- a/keyboards/cherrybstudio/cb87v2/readme.md +++ b/keyboards/cherrybstudio/cb87v2/readme.md @@ -4,7 +4,7 @@ An advance TKL PCB with many configurable layouts -* Keyboard Maintainer: duongaanh +* Keyboard Maintainer: [lunaticwhat](https://github.com/lunaticwhat) * Hardware Supported: cb87v2, atmega32u4 * Hardware Availability: [CherryB Studio](https://discord.gg/qVwv3gcq83)