From 5cd747b58428f19b9ae08ab694fe64f1b674bf30 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 May 2023 14:24:22 -0700 Subject: [PATCH 1/6] add matrix_diagram.md --- keyboards/fr4/unix60/matrix_diagram.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/fr4/unix60/matrix_diagram.md diff --git a/keyboards/fr4/unix60/matrix_diagram.md b/keyboards/fr4/unix60/matrix_diagram.md new file mode 100644 index 000000000000..c06ad2bf9ac2 --- /dev/null +++ b/keyboards/fr4/unix60/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for FR4Boards unix60 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │10 │11 │12 │13 │14 │16 │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ +│17 │18 │20 │21 │22 │23 │24 │25 │26 │27 │28 │30 │31 │32 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +│33 │34 │35 │36 │37 │38 │40 │41 │42 │43 │44 │45 │47 │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ +│48 │50 │51 │52 │53 │54 │55 │56 │57 │58 │60 │61 │62 │63 │ +└────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘ + │64 │65 │66 │67 │68 │ + └───┴─────┴───────────────────────────┴─────┴───┘ + ┌───────┐ + 2u Backspace │15 │ + └─┬─────┤ + │ │ + ISO Enter ┌──┴┐47 │ + │46 │ │ +┌────────┐ ┌─┴───┴────┤ +│48 │ 2.25u LShift 2.75u RShift │62 │ +└────────┘ └──────────┘ +``` From fbf599cad4a1154d5d86ee7d629a4a45a9a4dc3b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 May 2023 14:29:29 -0700 Subject: [PATCH 2/6] info.json: apply friendly formatting --- keyboards/fr4/unix60/info.json | 126 ++++++++++++++++----------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index cf641d2e017d..c65da71a0f01 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -18,74 +18,74 @@ "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": [0, 8], "x": 8, "y": 0}, - {"matrix": [1, 0], "x": 9, "y": 0}, - {"matrix": [1, 1], "x": 10, "y": 0}, - {"matrix": [1, 2], "x": 11, "y": 0}, - {"matrix": [1, 3], "x": 12, "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": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 0], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 1], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 2], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 3], "x": 12, "y": 0}, - {"matrix": [1, 4], "x": 13, "y": 0, "w": 0.6}, - {"matrix": [1, 5], "x": 13.6, "y": 0, "w": 0.8}, - {"matrix": [1, 6], "x": 14.4, "y": 0, "w": 0.6}, + {"label": "Backspace", "matrix": [1, 4], "x": 13, "y": 0, "w": 0.6}, + {"label": "2u Backspace", "matrix": [1, 5], "x": 13.6, "y": 0, "w": 0.8}, + {"label": "Backspace", "matrix": [1, 6], "x": 14.4, "y": 0, "w": 0.6}, - {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 8], "x": 1.5, "y": 1}, - {"matrix": [2, 0], "x": 2.5, "y": 1}, - {"matrix": [2, 1], "x": 3.5, "y": 1}, - {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [2, 4], "x": 6.5, "y": 1}, - {"matrix": [2, 5], "x": 7.5, "y": 1}, - {"matrix": [2, 6], "x": 8.5, "y": 1}, - {"matrix": [2, 7], "x": 9.5, "y": 1}, - {"matrix": [2, 8], "x": 10.5, "y": 1}, - {"matrix": [3, 0], "x": 11.5, "y": 1}, - {"matrix": [3, 1], "x": 12.5, "y": 1}, - {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Tab", "matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 8], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 0], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 4], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 5], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 6], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [2, 7], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 8], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 0], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 1], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [3, 4], "x": 1.75, "y": 2}, - {"matrix": [3, 5], "x": 2.75, "y": 2}, - {"matrix": [3, 6], "x": 3.75, "y": 2}, - {"matrix": [3, 7], "x": 4.75, "y": 2}, - {"matrix": [3, 8], "x": 5.75, "y": 2}, - {"matrix": [4, 0], "x": 6.75, "y": 2}, - {"matrix": [4, 1], "x": 7.75, "y": 2}, - {"matrix": [4, 2], "x": 8.75, "y": 2}, - {"matrix": [4, 3], "x": 9.75, "y": 2}, - {"matrix": [4, 4], "x": 10.75, "y": 2}, - {"matrix": [4, 5], "x": 11.75, "y": 2}, - {"matrix": [4, 6], "x": 12.75, "y": 2}, - {"matrix": [4, 7], "x": 13.75, "y": 2, "w": 1.25}, + {"label": "Caps Lock", "matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [3, 4], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [3, 5], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [3, 6], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [3, 7], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [3, 8], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 0], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 1], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 2], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [4, 3], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 4], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [4, 5], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [4, 7], "x": 13.75, "y": 2, "w": 1.25}, - {"matrix": [4, 8], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [5, 0], "x": 1.25, "y": 3}, - {"matrix": [5, 1], "x": 2.25, "y": 3}, - {"matrix": [5, 2], "x": 3.25, "y": 3}, - {"matrix": [5, 3], "x": 4.25, "y": 3}, - {"matrix": [5, 4], "x": 5.25, "y": 3}, - {"matrix": [5, 5], "x": 6.25, "y": 3}, - {"matrix": [5, 6], "x": 7.25, "y": 3}, - {"matrix": [5, 7], "x": 8.25, "y": 3}, - {"matrix": [5, 8], "x": 9.25, "y": 3}, - {"matrix": [6, 0], "x": 10.25, "y": 3}, - {"matrix": [6, 1], "x": 11.25, "y": 3}, - {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 3], "x": 14, "y": 3}, + {"label": "Shift", "matrix": [4, 8], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 0], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [5, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [5, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [5, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [5, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [5, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [5, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [5, 7], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [5, 8], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [6, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, - {"matrix": [6, 4], "x": 1.5, "y": 4}, - {"matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [6, 6], "x": 4, "y": 4, "w": 7}, - {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [6, 8], "x": 12.5, "y": 4} + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, + {"label": "GUI", "matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [6, 8], "x": 12.5, "y": 4} ] } } From 25d3f46c21b316e3cc1d448ea1b67c5a196ed920 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 May 2023 14:29:46 -0700 Subject: [PATCH 3/6] add LAYOUT_60_hhkb --- keyboards/fr4/unix60/info.json | 68 ++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index c65da71a0f01..758976de21c9 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -81,6 +81,74 @@ {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, + {"label": "GUI", "matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [6, 8], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb": { + "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": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 0], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 1], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 2], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 3], "x": 12, "y": 0}, + {"label": "\\", "matrix": [1, 4], "x": 13, "y": 0}, + {"label": "`", "matrix": [1, 6], "x": 14, "y": 0}, + + {"label": "Tab", "matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 8], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 0], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 4], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 5], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 6], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [2, 7], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 8], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 0], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 1], "x": 12.5, "y": 1}, + {"label": "Backspace", "matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + + {"label": "Caps Lock", "matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [3, 4], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [3, 5], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [3, 6], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [3, 7], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [3, 8], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 0], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 1], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 2], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [4, 3], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 4], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [4, 5], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [4, 8], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [5, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [5, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [5, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [5, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [5, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [5, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [5, 7], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [5, 8], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [6, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, From ffd9737a8bd7c299b62305c3ff50024bbbc6b34e Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 May 2023 14:32:46 -0700 Subject: [PATCH 4/6] add LAYOUT_60_hhkb_iso --- keyboards/fr4/unix60/info.json | 69 ++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index 758976de21c9..72e31f8f8398 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -149,6 +149,75 @@ {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, + {"label": "GUI", "matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [6, 8], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_iso": { + "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": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 0], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 1], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 2], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 3], "x": 12, "y": 0}, + {"label": "\\", "matrix": [1, 4], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + + {"label": "Tab", "matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 8], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 0], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 4], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 5], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 6], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [2, 7], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 8], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 0], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 1], "x": 12.5, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [3, 4], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [3, 5], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [3, 6], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [3, 7], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [3, 8], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 0], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 1], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 2], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [4, 3], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 4], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [4, 5], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [4, 7], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [4, 8], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 0], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [5, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [5, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [5, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [5, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [5, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [5, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [5, 7], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [5, 8], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [6, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, From efb1ee8b8557f2ff6c7014926afb9c88d3a87b21 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 May 2023 14:34:17 -0700 Subject: [PATCH 5/6] add reference keymaps --- .../fr4/unix60/keymaps/default_hhkb/keymap.c | 38 +++++++++++++++++++ .../unix60/keymaps/default_hhkb_iso/keymap.c | 38 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c create mode 100644 keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c diff --git a/keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c b/keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c new file mode 100644 index 000000000000..53ab6602c268 --- /dev/null +++ b/keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c @@ -0,0 +1,38 @@ + /* + Copyright 2020 Lasse Küchenmeister + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) + ), + + [1] = LAYOUT_60_hhkb( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F11, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c b/keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c new file mode 100644 index 000000000000..f9cf5d62a3c8 --- /dev/null +++ b/keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c @@ -0,0 +1,38 @@ + /* + Copyright 2020 Lasse Küchenmeister + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_hhkb_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) + ), + + [1] = LAYOUT_60_hhkb_iso( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F11, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; From bfdb368c9feaf6a5f2e7eae620e9f42024633284 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 May 2023 14:35:55 -0700 Subject: [PATCH 6/6] enable Community Layout support --- keyboards/fr4/unix60/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index 72e31f8f8398..14c686a0407a 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -15,6 +15,9 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "community_layouts": [ + "60_hhkb" + ], "layouts": { "LAYOUT_all": { "layout": [