From abe85b2207c700031b8986f5057709215c9af6bf Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:29:05 -0800 Subject: [PATCH 01/11] Add layout/matrix diagram [docs] --- keyboards/ares/matrix_diagram.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/ares/matrix_diagram.md diff --git a/keyboards/ares/matrix_diagram.md b/keyboards/ares/matrix_diagram.md new file mode 100644 index 000000000000..ec1e72d55834 --- /dev/null +++ b/keyboards/ares/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for LSJ Ares + +``` + ┌───────┐ + 2u Backspace │4E │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌─────┐ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ └───┴────┘ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ +│00 │01 │02 │06 │0A │0B │0C │0D │ +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +┌────────┐ ┌──────────┐ +│10 │ 2.25u LShift 2.75u RShift │1C │ +└────────┘ └──────────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│00 │01 │02 │06 │0B │0C │0D │ Tsangan/WKL/HHKB +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +``` From 708ec7e3f34fe2386a9912a8b7af8697355b45d6 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:29:47 -0800 Subject: [PATCH 02/11] Add `LAYOUT_60_ansi` [enhancement] --- keyboards/ares/info.json | 69 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index dceb80da0435..2fa26d9d4f38 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -120,6 +120,75 @@ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, From 02c9d8f4098fcbd2f4025699d8acbc0461502b0b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:30:26 -0800 Subject: [PATCH 03/11] Add `LAYOUT_60_tsangan_hhkb` [enhancement] --- keyboards/ares/info.json | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index 2fa26d9d4f38..64aa2af37f95 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -260,6 +260,76 @@ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "LAYOUT_60_hhkb": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, From b2de9fbe8a98d8d6218c476e941318164b5bbfbd Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:30:56 -0800 Subject: [PATCH 04/11] Add `LAYOUT_60_ansi_tsangan` [enhancement] --- keyboards/ares/info.json | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index 64aa2af37f95..d69be96911d8 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -260,6 +260,74 @@ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "LAYOUT_60_tsangan_hhkb": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, From 22c15396850e7acef73e14a422d2f2f2d44c248c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:31:20 -0800 Subject: [PATCH 05/11] Add `LAYOUT_60_iso_split_bs_rshift` [enhancement] --- keyboards/ares/info.json | 72 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index d69be96911d8..cc888f7495bf 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -465,6 +465,78 @@ {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, {"matrix": [0, 12], "x": 12.5, "y": 4} ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} + ] } } } From 2cb4798582dd19a9e2cc9f37c99dba093ff59a9a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:31:46 -0800 Subject: [PATCH 06/11] Add `LAYOUT_60_iso` [enhancement] --- keyboards/ares/info.json | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index cc888f7495bf..ac19412ac187 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -466,6 +466,76 @@ {"matrix": [0, 12], "x": 12.5, "y": 4} ] }, + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, "LAYOUT_60_iso_split_bs_rshift": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, From 48b51fc808a61853b6589abae152766b56db7db9 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:32:12 -0800 Subject: [PATCH 07/11] Add `LAYOUT_60_iso_tsangan_split_bs_rshift` [enhancement] --- keyboards/ares/info.json | 71 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index ac19412ac187..e7a66e7dbf52 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -607,6 +607,77 @@ {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] } } } From 1d666fb8d7953e2ce1dc4249794e11cac2315b34 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:32:35 -0800 Subject: [PATCH 08/11] Add `LAYOUT_60_iso_tsangan` [enhancement] --- keyboards/ares/info.json | 69 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index e7a66e7dbf52..ed6657586ee4 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -608,6 +608,75 @@ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "LAYOUT_60_iso_tsangan_split_bs_rshift": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, From 3a793a40e25b74fd215e3dd12dfdea71e3626fc5 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:33:01 -0800 Subject: [PATCH 09/11] Extend Community Layout support [enhancement] --- keyboards/ares/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index ed6657586ee4..65e15d29f74f 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -45,7 +45,7 @@ "layout_aliases": { "LAYOUT": "LAYOUT_all" }, - "community_layouts": ["60_ansi_split_bs_rshift", "60_hhkb"], + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift"], "layouts": { "LAYOUT_all": { "layout": [ From 98cf754c8e1958f0fa40387276aee584ba888bc5 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:27:21 -0700 Subject: [PATCH 10/11] Add 60*wkl* layouts per dunk2k - Add: - `LAYOUT_60_ansi_wkl` - `LAYOUT_60_ansi_wkl_split_bs_rshift` - `LAYOUT_60_iso_wkl` - `LAYOUT_60_iso_wkl_split_bs_rshift` - update matrix diagram [enhancement] --- keyboards/ares/info.json | 270 +++++++++++++++++++++++++++++++ keyboards/ares/matrix_diagram.md | 3 + 2 files changed, 273 insertions(+) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index 65e15d29f74f..f053eacc4c9c 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -398,6 +398,140 @@ {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "LAYOUT_60_hhkb": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, @@ -747,6 +881,142 @@ {"matrix": [0, 12], "x": 12.5, "y": 4}, {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/ares/matrix_diagram.md b/keyboards/ares/matrix_diagram.md index ec1e72d55834..5be61c988995 100644 --- a/keyboards/ares/matrix_diagram.md +++ b/keyboards/ares/matrix_diagram.md @@ -21,4 +21,7 @@ ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ │00 │01 │02 │06 │0B │0C │0D │ Tsangan/WKL/HHKB └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +┌─────┬───┬─────┬───────────────────────┬─────┬───┬───┬─────┐ +│00 │01 │02 │06 │0A │0B │0C │0D │ True HHKB +└─────┴───┴─────┴───────────────────────┴─────┴───┴───┴─────┘ ``` From 9e4fe7af02c39678c5aa1e3b0ff16658c12d1bdb Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:35:51 -0700 Subject: [PATCH 11/11] Update Community Layout support [enhancement] --- keyboards/ares/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index f053eacc4c9c..125db97ed28d 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -45,7 +45,7 @@ "layout_aliases": { "LAYOUT": "LAYOUT_all" }, - "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift"], + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"], "layouts": { "LAYOUT_all": { "layout": [