From bea3ed269aaa84dda9cf7b0e3cd72d8426537bf7 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:21:20 -0700 Subject: [PATCH 01/12] add matrix_diagram.md --- .../cherrybstudio/cb87rgb/matrix_diagram.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/cherrybstudio/cb87rgb/matrix_diagram.md diff --git a/keyboards/cherrybstudio/cb87rgb/matrix_diagram.md b/keyboards/cherrybstudio/cb87rgb/matrix_diagram.md new file mode 100644 index 000000000000..e23401760b0d --- /dev/null +++ b/keyboards/cherrybstudio/cb87rgb/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for CherryB.Studio CB87RGB + +``` +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │10 │11 │12 ││91 │ │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 +│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 │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ +│80 │81 │82 │83 │84 │85 │86 │87 │ │88 │89 │90 │ +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ +┌────────┐ ┌──────────┐ +│65 │ 2.25u LShift 2.75u RShift │77 │ +└────────┘ └──────────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│80 │81 │82 │83 │85 │86 │87 │ Tsangan/WKL +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +``` From 717b96c730289e3805c179a51feb66107b710cd4 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:37:58 -0700 Subject: [PATCH 02/12] info.json: apply friendly formatting --- keyboards/cherrybstudio/cb87rgb/info.json | 184 +++++++++++----------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index ee44b895ef99..0b210e3462b0 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -24,112 +24,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": 1.25, "y": 0}, - {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.75, "y": 0}, - {"matrix": [1, 0], "x": 10.75, "y": 0}, - {"matrix": [1, 1], "x": 11.75, "y": 0}, - {"matrix": [1, 2], "x": 12.75, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, - {"matrix": [9, 1], "x": 14, "y": 0}, + {"label": "Reset", "matrix": [9, 1], "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.5}, - {"matrix": [1, 7], "x": 1, "y": 1.5}, - {"matrix": [1, 8], "x": 2, "y": 1.5}, - {"matrix": [1, 9], "x": 3, "y": 1.5}, - {"matrix": [2, 0], "x": 4, "y": 1.5}, - {"matrix": [2, 1], "x": 5, "y": 1.5}, - {"matrix": [2, 2], "x": 6, "y": 1.5}, - {"matrix": [2, 3], "x": 7, "y": 1.5}, - {"matrix": [2, 4], "x": 8, "y": 1.5}, - {"matrix": [2, 5], "x": 9, "y": 1.5}, - {"matrix": [2, 6], "x": 10, "y": 1.5}, - {"matrix": [2, 7], "x": 11, "y": 1.5}, - {"matrix": [2, 8], "x": 12, "y": 1.5}, - {"matrix": [2, 9], "x": 13, "y": 1.5}, - {"matrix": [3, 0], "x": 14, "y": 1.5}, + {"label": "`", "matrix": [1, 6], "x": 0, "y": 1.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.5}, - {"matrix": [3, 1], "x": 15.25, "y": 1.5}, - {"matrix": [3, 2], "x": 16.25, "y": 1.5}, - {"matrix": [3, 3], "x": 17.25, "y": 1.5}, + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, - {"matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, - {"matrix": [3, 5], "x": 1.5, "y": 2.5}, - {"matrix": [3, 6], "x": 2.5, "y": 2.5}, - {"matrix": [3, 7], "x": 3.5, "y": 2.5}, - {"matrix": [3, 8], "x": 4.5, "y": 2.5}, - {"matrix": [3, 9], "x": 5.5, "y": 2.5}, - {"matrix": [4, 0], "x": 6.5, "y": 2.5}, - {"matrix": [4, 1], "x": 7.5, "y": 2.5}, - {"matrix": [4, 2], "x": 8.5, "y": 2.5}, - {"matrix": [4, 3], "x": 9.5, "y": 2.5}, - {"matrix": [4, 4], "x": 10.5, "y": 2.5}, - {"matrix": [4, 5], "x": 11.5, "y": 2.5}, - {"matrix": [4, 6], "x": 12.5, "y": 2.5}, - {"matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, - {"matrix": [4, 8], "x": 15.25, "y": 2.5}, - {"matrix": [4, 9], "x": 16.25, "y": 2.5}, - {"matrix": [5, 0], "x": 17.25, "y": 2.5}, + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, - {"matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, - {"matrix": [5, 2], "x": 1.75, "y": 3.5}, - {"matrix": [5, 3], "x": 2.75, "y": 3.5}, - {"matrix": [5, 4], "x": 3.75, "y": 3.5}, - {"matrix": [5, 5], "x": 4.75, "y": 3.5}, - {"matrix": [5, 6], "x": 5.75, "y": 3.5}, - {"matrix": [5, 7], "x": 6.75, "y": 3.5}, - {"matrix": [5, 8], "x": 7.75, "y": 3.5}, - {"matrix": [5, 9], "x": 8.75, "y": 3.5}, - {"matrix": [6, 0], "x": 9.75, "y": 3.5}, - {"matrix": [6, 1], "x": 10.75, "y": 3.5}, - {"matrix": [6, 2], "x": 11.75, "y": 3.5}, - {"matrix": [6, 3], "x": 12.75, "y": 3.5}, - {"matrix": [6, 4], "x": 13.75, "y": 3.5, "w": 1.25}, + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 3.5, "w": 1.25}, - {"matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, - {"matrix": [6, 6], "x": 1.25, "y": 4.5}, - {"matrix": [6, 7], "x": 2.25, "y": 4.5}, - {"matrix": [6, 8], "x": 3.25, "y": 4.5}, - {"matrix": [6, 9], "x": 4.25, "y": 4.5}, - {"matrix": [7, 0], "x": 5.25, "y": 4.5}, - {"matrix": [7, 1], "x": 6.25, "y": 4.5}, - {"matrix": [7, 2], "x": 7.25, "y": 4.5}, - {"matrix": [7, 3], "x": 8.25, "y": 4.5}, - {"matrix": [7, 4], "x": 9.25, "y": 4.5}, - {"matrix": [7, 5], "x": 10.25, "y": 4.5}, - {"matrix": [7, 6], "x": 11.25, "y": 4.5}, - {"matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, - {"matrix": [7, 8], "x": 14, "y": 4.5}, + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.5}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.5}, - {"matrix": [7, 9], "x": 16.25, "y": 4.5}, + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, - {"matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, - {"matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, - {"matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, - {"matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, - {"matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, - {"matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, - {"matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, - {"matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, - {"matrix": [8, 8], "x": 15.25, "y": 5.5}, - {"matrix": [8, 9], "x": 16.25, "y": 5.5}, - {"matrix": [9, 0], "x": 17.25, "y": 5.5} + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] } } From b0ddfc533a2d014f6458e138cad4ea1d422bc8b9 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:39:11 -0700 Subject: [PATCH 03/12] add LAYOUT_tkl_f13_ansi_split_bs_rshift --- keyboards/cherrybstudio/cb87rgb/info.json | 109 ++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 0b210e3462b0..58e9ee1702da 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -127,6 +127,115 @@ {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + + "LAYOUT_tkl_f13_ansi_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.5}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.5}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} From 02bf38065c8ee64e0951cb6b2d62f2914c1d389a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:39:49 -0700 Subject: [PATCH 04/12] add LAYOUT_tkl_f13_ansi --- keyboards/cherrybstudio/cb87rgb/info.json | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 58e9ee1702da..bc2bc27c3048 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -133,6 +133,113 @@ ] }, + "LAYOUT_tkl_f13_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.5, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 0b7f3f95afdf4ed3ece795dab22a7c6f97da4620 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:40:36 -0700 Subject: [PATCH 05/12] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift --- keyboards/cherrybstudio/cb87rgb/info.json | 108 ++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index bc2bc27c3048..0627562400bf 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -343,6 +343,114 @@ {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + + "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.5}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.5}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.5}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [8, 3], "x": 4, "y": 5.5, "w": 7}, + {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 5.5, "w": 1.5}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} From eb68a54724f92023bef2c9c92a53cecb850dcddc Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:41:09 -0700 Subject: [PATCH 06/12] add LAYOUT_tkl_f13_ansi_tsangan --- keyboards/cherrybstudio/cb87rgb/info.json | 106 ++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 0627562400bf..a1f9faacde7c 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -349,6 +349,112 @@ ] }, + "LAYOUT_tkl_f13_ansi_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.5, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"label": "\\", "matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.5}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [8, 3], "x": 4, "y": 5.5, "w": 7}, + {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 5.5, "w": 1.5}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 09a842d604231f2cdf75a97ddc724012aacbc25d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:42:32 -0700 Subject: [PATCH 07/12] add LAYOUT_tkl_f13_iso_split_bs_rshift --- keyboards/cherrybstudio/cb87rgb/info.json | 110 ++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index a1f9faacde7c..114628fc7d47 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -557,6 +557,116 @@ {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5}, {"label": "Ctrl", "matrix": [8, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + + "LAYOUT_tkl_f13_iso_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.5}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.5}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.5}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} From 85146cedf5c415121cdaf556a43778c94de2e2c9 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:43:05 -0700 Subject: [PATCH 08/12] add LAYOUT_tkl_f13_iso --- keyboards/cherrybstudio/cb87rgb/info.json | 108 ++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 114628fc7d47..ebcf1fc4c9d1 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -563,6 +563,114 @@ ] }, + "LAYOUT_tkl_f13_iso": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.5, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.5}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + "LAYOUT_tkl_f13_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 2456260713796dc29d3f7aaac7850f84f8c97e22 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:43:57 -0700 Subject: [PATCH 09/12] add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift --- keyboards/cherrybstudio/cb87rgb/info.json | 109 ++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index ebcf1fc4c9d1..3854e716d86b 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -775,6 +775,115 @@ {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, {"label": "Ctrl", "matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + + "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [2, 9], "x": 13, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 14, "y": 1.5}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.5}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Shift", "matrix": [7, 8], "x": 14, "y": 4.5}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.5}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [8, 3], "x": 4, "y": 5.5, "w": 7}, + {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 5.5, "w": 1.5}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} From f0d85bf185e59fc6e9ab6b53168b6fc5238c1975 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:44:30 -0700 Subject: [PATCH 10/12] add LAYOUT_tkl_f13_iso_tsangan --- keyboards/cherrybstudio/cb87rgb/info.json | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 3854e716d86b..c7a88ad8db19 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -781,6 +781,113 @@ ] }, + "LAYOUT_tkl_f13_iso_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [1, 0], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 1], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [1, 2], "x": 12.75, "y": 0}, + + {"label": "Reset", "matrix": [9, 1], "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.5}, + {"label": "1", "matrix": [1, 7], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 8], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 9], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [2, 0], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [2, 1], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [2, 2], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [2, 3], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [2, 5], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [2, 6], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [2, 7], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [3, 0], "x": 13, "y": 1.5, "w": 2}, + + {"label": "Insert", "matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"label": "Home", "matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"label": "Page Up", "matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"label": "[", "matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5}, + + {"label": "Delete", "matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"label": "End", "matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"label": "Page Down", "matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"label": "#", "matrix": [6, 3], "x": 12.75, "y": 3.5}, + {"label": "Enter", "matrix": [6, 4], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "\\", "matrix": [6, 6], "x": 1.25, "y": 4.5}, + {"label": "Z", "matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"label": "\u2191", "matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"label": "GUI", "matrix": [8, 1], "x": 1.5, "y": 5.5}, + {"label": "Alt", "matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [8, 3], "x": 4, "y": 5.5, "w": 7}, + {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 5.5, "w": 1.5}, + {"label": "Menu", "matrix": [8, 6], "x": 12.5, "y": 5.5}, + {"label": "Ctrl", "matrix": [8, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"label": "\u2190", "matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"label": "\u2193", "matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} + ] + }, + "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 1d45c5f3a74fd73fbf278c9c8f005c3808acf916 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 24 Apr 2023 00:00:18 -0700 Subject: [PATCH 11/12] enable Community Layout support --- keyboards/cherrybstudio/cb87rgb/info.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index c7a88ad8db19..84a348c19670 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -21,6 +21,16 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": [ + "tkl_f13_ansi", + "tkl_f13_ansi_split_bs_rshift", + "tkl_f13_ansi_tsangan", + "tkl_f13_ansi_tsangan_split_bs_rshift", + "tkl_f13_iso", + "tkl_f13_iso_split_bs_rshift", + "tkl_f13_iso_tsangan", + "tkl_f13_iso_tsangan_split_bs_rshift" + ], "layouts": { "LAYOUT_all": { "layout": [ From aa86fe244282966003a7641a20586aefd98fbd90 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:32:16 -0700 Subject: [PATCH 12/12] correct listed maintainer Maintainer has changed their GitHub username. --- keyboards/cherrybstudio/cb87rgb/info.json | 2 +- keyboards/cherrybstudio/cb87rgb/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 84a348c19670..d2af5bb20e2d 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -2,7 +2,7 @@ "keyboard_name": "CB87RGB", "manufacturer": "CherryB.Studio", "url": "https://discord.gg/qVwv3gcq83", - "maintainer": "duongaanh", + "maintainer": "lunaticwhat", "usb": { "vid": "0x4342", "pid": "0x8785", diff --git a/keyboards/cherrybstudio/cb87rgb/readme.md b/keyboards/cherrybstudio/cb87rgb/readme.md index f7c9985d8c9d..c114d2990926 100644 --- a/keyboards/cherrybstudio/cb87rgb/readme.md +++ b/keyboards/cherrybstudio/cb87rgb/readme.md @@ -4,7 +4,7 @@ A RGB TKL PCB including hotswap and solderable variant for CherryB Studio NEO87 and many compatible TKLs -* Keyboard Maintainer: duongaanh +* Keyboard Maintainer: [lunaticwhat](https://github.com/lunaticwhat) * Hardware Supported: cb87rgb, atmega32u4 * Hardware Availability: [CherryB Studio](https://discord.gg/3gsCa8K)