From 35978727022db0da11e3c2ba97965580a4fe119a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 20 Jul 2023 01:37:17 -0700 Subject: [PATCH] Automata02 Alisaie Touch-Up (#21552) * [style] friendly-format info.json * [chore] remove key labels from info.json * [chore] correct layout data Fix a misleading Configurator implementation, and incorrect key sizes and positioning on the bottom row. * [chore] re-add key labels to info.json --- keyboards/automata02/alisaie/info.json | 132 +++++++++++++------------ 1 file changed, 68 insertions(+), 64 deletions(-) diff --git a/keyboards/automata02/alisaie/info.json b/keyboards/automata02/alisaie/info.json index 5c23e4ef1f..6e4c007e00 100644 --- a/keyboards/automata02/alisaie/info.json +++ b/keyboards/automata02/alisaie/info.json @@ -22,70 +22,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "&", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "*", "matrix": [0, 8], "x": 9.5, "y": 0}, - {"label": "(", "matrix": [0, 9], "x": 10.5, "y": 0}, - {"label": ")", "matrix": [0, 10], "x": 11.5, "y": 0}, - {"label": "_", "matrix": [0, 11], "x": 12.5, "y": 0}, - {"label": "+", "matrix": [0, 12], "x": 13.5, "y": 0}, - {"label": "Del", "matrix": [0, 13], "x": 14.5, "y": 0}, - {"label": "Backspace", "matrix": [1, 0], "x": 15.5, "y": 0}, - {"label": "Tab", "matrix": [1, 1], "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1}, - {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1}, - {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1}, - {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1}, - {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1}, - {"label": "Y", "matrix": [1, 7], "x": 8, "y": 1}, - {"label": "U", "matrix": [1, 8], "x": 9, "y": 1}, - {"label": "I", "matrix": [1, 9], "x": 10, "y": 1}, - {"label": "O", "matrix": [1, 10], "x": 11, "y": 1}, - {"label": "P", "matrix": [1, 11], "x": 12, "y": 1}, - {"label": "{", "matrix": [1, 12], "x": 13, "y": 1}, - {"label": "}", "matrix": [1, 13], "x": 14, "y": 1}, - {"label": "|", "matrix": [2, 0], "x": 15, "y": 1, "w": 1.5}, - {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2}, - {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2}, - {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2}, - {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2}, - {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2}, - {"label": "H", "matrix": [2, 7], "x": 8.25, "y": 2}, - {"label": "J", "matrix": [2, 8], "x": 9.25, "y": 2}, - {"label": "K", "matrix": [2, 9], "x": 10.25, "y": 2}, - {"label": "L", "matrix": [2, 10], "x": 11.25, "y": 2}, - {"label": ":", "matrix": [2, 11], "x": 12.25, "y": 2}, - {"label": "\"", "matrix": [2, 12], "x": 13.25, "y": 2}, - {"label": "Enter", "matrix": [3, 0], "x": 14.25, "y": 2, "w": 2.25}, - {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, - {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, - {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, - {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, - {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, - {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, - {"label": "B", "matrix": [3, 7], "x": 7.75, "y": 3}, - {"label": "N", "matrix": [3, 8], "x": 8.75, "y": 3}, - {"label": "M", "matrix": [3, 9], "x": 9.75, "y": 3}, - {"label": "<", "matrix": [3, 10], "x": 10.75, "y": 3}, - {"label": ">", "matrix": [3, 11], "x": 11.75, "y": 3}, - {"label": "?", "matrix": [3, 12], "x": 12.75, "y": 3}, - {"label": "Shift", "matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.75}, - {"label": "Fn", "matrix": [4, 0], "x": 15.5, "y": 3}, - {"label": "Ctrl", "matrix": [4, 1], "x": 0, "y": 4, "w": 1.25}, - {"label": "Win", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "Alt", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, - {"label": "K408", "matrix": [4, 8], "x": 5, "y": 4, "w": 2.25}, - {"label": "K409", "matrix": [4, 9], "x": 7.75, "y": 4, "w": 2.75}, - {"label": "Alt", "matrix": [4, 11], "x": 10.5, "y": 4, "w": 1.25}, - {"label": "Win", "matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25}, - {"label": "Ctrl", "matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25} + {"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": 8.5, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 10.5, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 11.5, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 12.5, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 13.5, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 14.5, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 8, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 9, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 10, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 11, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 12, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 13, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 14, "y": 1}, + {"label": "Backspace", "matrix": [1, 13], "x": 15, "y": 1, "w": 1.5}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 8.25, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 9.25, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 10.25, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 11.25, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 12.25, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 13.25, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 14.25, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 13], "x": 15.5, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 3], "x": 4.75, "y": 4, "w": 2.75}, + {"label": "Space", "matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25}, + {"label": "GUI", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5}, + {"label": "`", "matrix": [4, 11], "x": 15.5, "y": 0}, + {"label": "Alt", "matrix": [4, 12], "x": 14, "y": 4}, + {"label": "Ctrl", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.5} ] } }