From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/tokyokeyboard/alix40/alix40.h | 29 ---- keyboards/tokyokeyboard/alix40/info.json | 284 ++++++------------------------- 2 files changed, 54 insertions(+), 259 deletions(-) delete mode 100644 keyboards/tokyokeyboard/alix40/alix40.h (limited to 'keyboards/tokyokeyboard') diff --git a/keyboards/tokyokeyboard/alix40/alix40.h b/keyboards/tokyokeyboard/alix40/alix40.h deleted file mode 100644 index 4a322a10b4..0000000000 --- a/keyboards/tokyokeyboard/alix40/alix40.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2021 quadcube -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 . -*/ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_40_alix( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K33, K34, K35, K36, K37, K38, K3A, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, KC_NO, K33, K34, K35, K36, K37, K38, KC_NO, K3A, K3B } \ -} diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index d314896095..6109d52078 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -25,236 +25,60 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_40_alix": { - "layout": [{ - "label": "Tab", - "x": 0, - "y": 0 - }, - { - "label": "Q", - "x": 1, - "y": 0 - }, - { - "label": "W", - "x": 2, - "y": 0 - }, - { - "label": "E", - "x": 3, - "y": 0 - }, - { - "label": "R", - "x": 4, - "y": 0 - }, - { - "label": "T", - "x": 5, - "y": 0 - }, - { - "label": "Y", - "x": 7.5, - "y": 0 - }, - { - "label": "U", - "x": 8.5, - "y": 0 - }, - { - "label": "I", - "x": 9.5, - "y": 0 - }, - { - "label": "O", - "x": 10.5, - "y": 0 - }, - { - "label": "P", - "x": 11.5, - "y": 0 - }, - { - "label": "`", - "x": 12.5, - "y": 0 - }, - { - "label": "Esc", - "x": 0.25, - "y": 1 - }, - { - "label": "A", - "x": 1.25, - "y": 1 - }, - { - "label": "S", - "x": 2.25, - "y": 1 - }, - { - "label": "D", - "x": 3.25, - "y": 1 - }, - { - "label": "F", - "x": 4.25, - "y": 1 - }, - { - "label": "G", - "x": 5.25, - "y": 1 - }, - { - "label": "H", - "x": 7.75, - "y": 1 - }, - { - "label": "J", - "x": 8.75, - "y": 1 - }, - { - "label": "K", - "x": 9.75, - "y": 1 - }, - { - "label": "L", - "x": 10.75, - "y": 1 - }, - { - "label": ";", - "x": 11.75, - "y": 1 - }, - { - "label": "'", - "x": 12.75, - "y": 1 - }, - { - "label": "Shift", - "x": 0.75, - "y": 2 - }, - { - "label": "Z", - "x": 1.75, - "y": 2 - }, - { - "label": "X", - "x": 2.75, - "y": 2 - }, - { - "label": "C", - "x": 3.75, - "y": 2 - }, - { - "label": "V", - "x": 4.75, - "y": 2 - }, - { - "label": "B", - "x": 5.75, - "y": 2 - }, - { - "label": "Enter", - "x": 7.25, - "y": 2 - }, - { - "label": "N", - "x": 8.25, - "y": 2 - }, - { - "label": "M", - "x": 9.25, - "y": 2 - }, - { - "label": ",", - "x": 10.25, - "y": 2 - }, - { - "label": ".", - "x": 11.25, - "y": 2 - }, - { - "label": "/", - "x": 12.25, - "y": 2 - }, - { - "label": "Ctrl", - "x": 0.5, - "y": 3 - }, - { - "label": "Alt", - "x": 1.5, - "y": 3 - }, - { - "label": "Gui", - "x": 3.75, - "y": 3 - }, - { - "label": "NO", - "x": 4.75, - "y": 3 - }, - { - "label": "Bksp", - "x": 5.75, - "y": 3 - }, - { - "label": "Space", - "x": 7.25, - "y": 3 - }, - { - "label": "NO", - "x": 8.25, - "y": 3 - }, - { - "label": "Gui", - "x": 9.25, - "y": 3 - }, - { - "label": "[", - "x": 11.5, - "y": 3 - }, - { - "label": "]", - "x": 12.5, - "y": 3 - } + "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": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1}, + + {"matrix": [2, 0], "x": 0.75, "y": 2}, + {"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": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + + {"matrix": [3, 0], "x": 0.5, "y": 3}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3} ] } } -- cgit v1.2.3