From 7be35553a68aa8779fc03a5a89dda6c2b0e0a1b8 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 17:25:43 -0700 Subject: [PATCH 01/11] add matrix_diagram.md --- .../cherrybstudio/cb65/matrix_diagram.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/cherrybstudio/cb65/matrix_diagram.md diff --git a/keyboards/cherrybstudio/cb65/matrix_diagram.md b/keyboards/cherrybstudio/cb65/matrix_diagram.md new file mode 100644 index 000000000000..850dd2a41d98 --- /dev/null +++ b/keyboards/cherrybstudio/cb65/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for CherryB Works CB65 + +``` + ┌───────┐ + 2u Backspace │16 │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │10 │11 │12 │13 │14 │15 │16 │17 │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ ┌─────┐ +│20 │21 │22 │23 │24 │25 │26 │27 │30 │31 │32 │33 │34 │35 │36 │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐54 │ +│37 │40 │41 │42 │43 │44 │45 │46 │47 │50 │51 │52 │54 │55 │ │53 │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ +│56 │57 │60 │61 │62 │63 │64 │65 │66 │67 │70 │71 │72 │73 │74 │ ISO Enter +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ +│75 │76 │77 │80 │81 │82 │ │83 │84 │85 │ +└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ +┌────────┐ +│56 │ 2.25u LShift +└────────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┐ +│75 │76 │77 │80 │82 │ Blocker Tsangan +└─────┴───┴─────┴───────────────────────────┴─────┘ +``` From e7cdba6fc9a2d5d0a70381173f2b235fc65fc36f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 17:28:59 -0700 Subject: [PATCH 02/11] info.json: apply friendly formatting --- keyboards/cherrybstudio/cb65/info.json | 140 ++++++++++++------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 2d3ce3a2b723..24f871dcc5d2 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -26,81 +26,81 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [1, 0], "x": 8, "y": 0}, - {"matrix": [1, 1], "x": 9, "y": 0}, - {"matrix": [1, 2], "x": 10, "y": 0}, - {"matrix": [1, 3], "x": 11, "y": 0}, - {"matrix": [1, 4], "x": 12, "y": 0}, - {"matrix": [1, 5], "x": 13, "y": 0}, - {"matrix": [1, 6], "x": 14, "y": 0}, - {"matrix": [1, 7], "x": 15, "y": 0}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 5], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, - {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 1}, - {"matrix": [2, 2], "x": 2.5, "y": 1}, - {"matrix": [2, 3], "x": 3.5, "y": 1}, - {"matrix": [2, 4], "x": 4.5, "y": 1}, - {"matrix": [2, 5], "x": 5.5, "y": 1}, - {"matrix": [2, 6], "x": 6.5, "y": 1}, - {"matrix": [2, 7], "x": 7.5, "y": 1}, - {"matrix": [3, 0], "x": 8.5, "y": 1}, - {"matrix": [3, 1], "x": 9.5, "y": 1}, - {"matrix": [3, 2], "x": 10.5, "y": 1}, - {"matrix": [3, 3], "x": 11.5, "y": 1}, - {"matrix": [3, 4], "x": 12.5, "y": 1}, - {"matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [3, 6], "x": 15, "y": 1}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, - {"matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [4, 0], "x": 1.75, "y": 2}, - {"matrix": [4, 1], "x": 2.75, "y": 2}, - {"matrix": [4, 2], "x": 3.75, "y": 2}, - {"matrix": [4, 3], "x": 4.75, "y": 2}, - {"matrix": [4, 4], "x": 5.75, "y": 2}, - {"matrix": [4, 5], "x": 6.75, "y": 2}, - {"matrix": [4, 6], "x": 7.75, "y": 2}, - {"matrix": [4, 7], "x": 8.75, "y": 2}, - {"matrix": [5, 0], "x": 9.75, "y": 2}, - {"matrix": [5, 1], "x": 10.75, "y": 2}, - {"matrix": [5, 2], "x": 11.75, "y": 2}, - {"matrix": [5, 3], "x": 12.75, "y": 2}, - {"matrix": [5, 4], "x": 13.75, "y": 2, "w": 1.25}, - {"matrix": [5, 5], "x": 15, "y": 2}, + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [5, 3], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 13.75, "y": 2, "w": 1.25}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, - {"matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [5, 7], "x": 1.25, "y": 3}, - {"matrix": [6, 0], "x": 2.25, "y": 3}, - {"matrix": [6, 1], "x": 3.25, "y": 3}, - {"matrix": [6, 2], "x": 4.25, "y": 3}, - {"matrix": [6, 3], "x": 5.25, "y": 3}, - {"matrix": [6, 4], "x": 6.25, "y": 3}, - {"matrix": [6, 5], "x": 7.25, "y": 3}, - {"matrix": [6, 6], "x": 8.25, "y": 3}, - {"matrix": [6, 7], "x": 9.25, "y": 3}, - {"matrix": [7, 0], "x": 10.25, "y": 3}, - {"matrix": [7, 1], "x": 11.25, "y": 3}, - {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [7, 3], "x": 14, "y": 3}, - {"matrix": [7, 4], "x": 15, "y": 3}, + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 7], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, - {"matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [8, 3], "x": 13, "y": 4}, - {"matrix": [8, 4], "x": 14, "y": 4}, - {"matrix": [8, 5], "x": 15, "y": 4} + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] } } From 61f3f5dc9b33c21e87adc8c798a7706c6f3067b3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:06:38 -0700 Subject: [PATCH 03/11] add LAYOUT_65_ansi_blocker_split_bs --- keyboards/cherrybstudio/cb65/info.json | 78 ++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 24f871dcc5d2..d8a6715a7b3c 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -98,6 +98,84 @@ {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + + "LAYOUT_65_ansi_blocker_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 5], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} From aafc029159155a8d89fbd21fe77e3529ff6c883a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:18:20 -0700 Subject: [PATCH 04/11] add LAYOUT_65_ansi_blocker --- keyboards/cherrybstudio/cb65/info.json | 77 ++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index d8a6715a7b3c..e33181bb5c50 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -104,6 +104,83 @@ ] }, + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From e218b7a0545adbd69fb397510b082d1b34cd83b2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:49:23 -0700 Subject: [PATCH 05/11] add LAYOUT_65_ansi_blocker_tsangan_split_bs --- keyboards/cherrybstudio/cb65/info.json | 77 ++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index e33181bb5c50..f3cac59b82e3 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -253,6 +253,83 @@ {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 5], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [7, 6], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [8, 0], "x": 4, "y": 4, "w": 7}, + {"label": "Fn", "matrix": [8, 2], "x": 11, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} From d83b2e43b41f02a29e763b8cc4c17f3f394d761f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:49:51 -0700 Subject: [PATCH 06/11] add LAYOUT_65_ansi_blocker_tsangan --- keyboards/cherrybstudio/cb65/info.json | 76 ++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index f3cac59b82e3..8a86f387ad69 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -259,6 +259,82 @@ ] }, + "LAYOUT_65_ansi_blocker_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [7, 6], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [8, 0], "x": 4, "y": 4, "w": 7}, + {"label": "Fn", "matrix": [8, 2], "x": 11, "y": 4, "w": 1.5}, + + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From f99b500a50fda44039cfa560b749e11b678bf192 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:55:27 -0700 Subject: [PATCH 07/11] add LAYOUT_65_iso_blocker_split_bs --- keyboards/cherrybstudio/cb65/info.json | 79 ++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 8a86f387ad69..b50ec94e3548 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -406,6 +406,85 @@ {"label": "Space", "matrix": [8, 0], "x": 4, "y": 4, "w": 7}, {"label": "Fn", "matrix": [8, 2], "x": 11, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + + "LAYOUT_65_iso_blocker_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 5], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [5, 3], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 7], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} From d7e34c0961103e2d47c6f0f8d6d5a0872cfe5960 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:55:48 -0700 Subject: [PATCH 08/11] add LAYOUT_65_iso_blocker --- keyboards/cherrybstudio/cb65/info.json | 78 ++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index b50ec94e3548..7c9ac51e34b1 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -412,6 +412,84 @@ ] }, + "LAYOUT_65_iso_blocker": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [5, 3], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 7], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_iso_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From e1fd362392e0bac4a6ea26beb2f590e0a632116b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:59:41 -0700 Subject: [PATCH 09/11] add LAYOUT_65_iso_blocker_tsangan_split_bs --- keyboards/cherrybstudio/cb65/info.json | 78 ++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 7c9ac51e34b1..d0cca1abcee9 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -563,6 +563,84 @@ {"label": "Alt", "matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, {"label": "Fn", "matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + + "LAYOUT_65_iso_blocker_tsangan_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 5], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [5, 3], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 7], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [7, 6], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [8, 0], "x": 4, "y": 4, "w": 7}, + {"label": "Fn", "matrix": [8, 2], "x": 11, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} From 607e298d8f1448a8a3bf2508f68a2c4a9aada563 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:00:01 -0700 Subject: [PATCH 10/11] add LAYOUT_65_iso_blocker_tsangan --- keyboards/cherrybstudio/cb65/info.json | 77 ++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index d0cca1abcee9..0c5baee81209 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -569,6 +569,83 @@ ] }, + "LAYOUT_65_iso_blocker_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [1, 0], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 1], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 2], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 3], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 4], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"label": "Reset", "matrix": [1, 7], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 3], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 4], "x": 12.5, "y": 1}, + {"label": "Delete", "matrix": [3, 6], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [4, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [4, 4], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 5], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 7], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 0], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [5, 1], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 2], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [5, 3], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [5, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "Home", "matrix": [5, 5], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 7], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 0], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [6, 3], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 4], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 5], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 6], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 7], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [7, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [7, 3], "x": 14, "y": 3}, + {"label": "End", "matrix": [7, 4], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [7, 5], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [7, 6], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [8, 0], "x": 4, "y": 4, "w": 7}, + {"label": "Fn", "matrix": [8, 2], "x": 11, "y": 4, "w": 1.5}, + + {"label": "\u2190", "matrix": [8, 3], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [8, 4], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_iso_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 93b37f7f09d466b10b17a93c1244df174fa02702 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 23 Apr 2023 23:01:03 -0700 Subject: [PATCH 11/11] enable Community Layout support --- keyboards/cherrybstudio/cb65/info.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 0c5baee81209..ed76321c1914 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -23,6 +23,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": [ + "65_ansi_blocker", + "65_ansi_blocker_split_bs", + "65_ansi_blocker_tsangan", + "65_ansi_blocker_tsangan_split_bs", + "65_iso_blocker", + "65_iso_blocker_split_bs", + "65_iso_blocker_tsangan", + "65_iso_blocker_tsangan_split_bs" + ], "layouts": { "LAYOUT_all": { "layout": [