From dc85bfa82cff32d41e5717ca9f278178e44b709d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:18:06 -0700 Subject: [PATCH 1/8] add matrix_diagram.md --- .../cannonkeys/serenity/matrix_diagram.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/cannonkeys/serenity/matrix_diagram.md diff --git a/keyboards/cannonkeys/serenity/matrix_diagram.md b/keyboards/cannonkeys/serenity/matrix_diagram.md new file mode 100644 index 000000000000..c44d2538dc59 --- /dev/null +++ b/keyboards/cannonkeys/serenity/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Data for CannonKeys Serenity + +``` +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0E │ │0F │0G │0H │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │1G │1H │ │1D │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │ │2F │2G │2H │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐3E │ ISO Enter +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3E │ │3C │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ └───┴────┘ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4E │ │4G │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ +│50 │51 │52 │56 │5A │5B │5C │5E │ │5F │5G │5H │ +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ +┌────────┐ ┌──────────┐ +│40 │ 2.25u LShift 2.75u RShift │4C │ +└────────┘ └──────────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│ │ │ │ │ │ │ │ Tsangan/WKL +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +``` From b5e466fedc5b55c54f1f7ee65f84a570ad3dab04 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:18:13 -0700 Subject: [PATCH 2/8] info.json: apply friendly formatting --- keyboards/cannonkeys/serenity/info.json | 189 ++++++++++++------------ 1 file changed, 97 insertions(+), 92 deletions(-) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index ef5476232831..b0eae5ded037 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -59,98 +59,103 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, - { "label": "F13", "matrix": [0, 14], "x": 14, "y": 0 }, - { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0 }, - { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0 }, - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, - { "label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25 }, - { "label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25 }, - { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 }, - { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 }, - { "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 }, - { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, - { "label": "|", "matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 }, - { "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 }, - { "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 }, - { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, - { "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 }, - { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, - { "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25 }, - { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 }, - { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 }, - { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25 }, - { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25 }, - { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25 }, - { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25 }, - { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25 }, - { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25 }, - { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25 }, - { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25 }, - { "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 }, - { "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 }, - { "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 }, - { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, - { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 }, - { "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 }, - { "label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25 }, - { "label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25 }, - { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25}, + {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 14.75, "y": 4.25, "w": 1.75}, + {"label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25}, + {"label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] } } From 69b402bedf3b7eb471ceebf71394a5cc88ac2439 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:18:20 -0700 Subject: [PATCH 3/8] info.json: correct layout data --- keyboards/cannonkeys/serenity/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index b0eae5ded037..49705006971a 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -141,9 +141,9 @@ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 12], "x": 14.75, "y": 4.25, "w": 1.75}, - {"label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25}, - {"label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Fn", "matrix": [4, 14], "x": 14, "y": 4.25}, + {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25}, {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, From 437547ed1d7d03af582f9daf040f1a553699653c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:18:28 -0700 Subject: [PATCH 4/8] add LAYOUT_tkl_f13_iso_split_bs_rshift --- keyboards/cannonkeys/serenity/info.json | 101 ++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index 49705006971a..70fbcf6b2173 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -145,6 +145,107 @@ {"label": "Fn", "matrix": [4, 14], "x": 14, "y": 4.25}, {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} + ] + }, + + "LAYOUT_tkl_f13_iso_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25}, + {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Fn", "matrix": [4, 14], "x": 14, "y": 4.25}, + {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, From c4cddad95eeb511d46454cad1647ae0aa88818f3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:19:16 -0700 Subject: [PATCH 5/8] add LAYOUT_tkl_f13_iso --- keyboards/cannonkeys/serenity/info.json | 99 +++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index 70fbcf6b2173..cb10e558e511 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -159,6 +159,105 @@ ] }, + "LAYOUT_tkl_f13_iso": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_f13_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 9b4e5d6770e58f38041841f7adbc49de0ca0aaff Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:20:12 -0700 Subject: [PATCH 6/8] add LAYOUT_tkl_f13_ansi_split_bs_rshift --- keyboards/cannonkeys/serenity/info.json | 100 ++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index cb10e558e511..894053c00b43 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -159,6 +159,106 @@ ] }, + "LAYOUT_tkl_f13_ansi_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25}, + {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Fn", "matrix": [4, 14], "x": 14, "y": 4.25}, + {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_f13_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From e05b47859784359f2d50aba421d713ed5725d02b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:20:44 -0700 Subject: [PATCH 7/8] add LAYOUT_tkl_f13_ansi --- keyboards/cannonkeys/serenity/info.json | 98 +++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index 894053c00b43..bcfdd73ecca6 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -159,6 +159,104 @@ ] }, + "LAYOUT_tkl_f13_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, From 311a2ef0995e6f1929e3598f048e7efc447818bf Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:21:07 -0700 Subject: [PATCH 8/8] enable Community Layout support --- keyboards/cannonkeys/serenity/info.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index bcfdd73ecca6..29cf8c7e72ba 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -56,6 +56,12 @@ "scroll_lock": "F0", "on_state": 0 }, + "community_layouts": [ + "tkl_f13_ansi", + "tkl_f13_ansi_split_bs_rshift", + "tkl_f13_iso", + "tkl_f13_iso_split_bs_rshift" + ], "layouts": { "LAYOUT_all": { "layout": [