From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/scatter42/info.json | 259 ++++++++-------------------------------- keyboards/scatter42/scatter42.h | 44 ------- 2 files changed, 49 insertions(+), 254 deletions(-) delete mode 100644 keyboards/scatter42/scatter42.h (limited to 'keyboards/scatter42') diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json index 748093a516..7c76e98f64 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/info.json @@ -21,216 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Q", - "x": 0, - "y": 0.5 - }, - { - "label": "W", - "x": 1, - "y": 0.25 - }, - { - "label": "E", - "x": 2, - "y": 0 - }, - { - "label": "R", - "x": 3, - "y": 0.25 - }, - { - "label": "T", - "x": 4, - "y": 0.5 - }, - { - "label": "Y", - "x": 9, - "y": 0.5 - }, - { - "label": "U", - "x": 10, - "y": 0.25 - }, - { - "label": "I", - "x": 11, - "y": 0 - }, - { - "label": "O", - "x": 12, - "y": 0.25 - }, - { - "label": "P", - "x": 13, - "y": 0.5 - }, - { - "label": "A", - "x": 0, - "y": 1.5 - }, - { - "label": "S", - "x": 1, - "y": 1.25 - }, - { - "label": "D", - "x": 2, - "y": 1 - }, - { - "label": "F", - "x": 3, - "y": 1.25 - }, - { - "label": "G", - "x": 4, - "y": 1.5 - }, - { - "label": "H", - "x": 9, - "y": 1.5 - }, - { - "label": "J", - "x": 10, - "y": 1.25 - }, - { - "label": "K", - "x": 11, - "y": 1 - }, - { - "label": "L", - "x": 12, - "y": 1.25 - }, - { - "label": ";", - "x": 13, - "y": 1.5 - }, - { - "label": "Z", - "x": 0, - "y": 2.5 - }, - { - "label": "X", - "x": 1, - "y": 2.25 - }, - { - "label": "C", - "x": 2, - "y": 2 - }, - { - "label": "V", - "x": 3, - "y": 2.25 - }, - { - "label": "B", - "x": 4, - "y": 2.5 - }, - { - "label": "N", - "x": 9, - "y": 2.5 - }, - { - "label": "M", - "x": 10, - "y": 2.25 - }, - { - "label": ",", - "x": 11, - "y": 2 - }, - { - "label": ".", - "x": 12, - "y": 2.25 - }, - { - "label": "/", - "x": 13, - "y": 2.5 - }, - { - "label": "Ctrl", - "x": 0, - "y": 3.5 - }, - { - "label": "Shift", - "x": 1, - "y": 3.25 - }, - { - "label": "Tab", - "x": 2, - "y": 3 - }, - { - "label": "Super", - "x": 3.5, - "y": 3.625 - }, - { - "label": "Lower", - "x": 4.5, - "y": 3.875 - }, - { - "label": "Space", - "x": 5.5, - "y": 4.125 - }, - { - "label": "Enter", - "x": 7.45, - "y": 4.125 - }, - { - "label": "Raise", - "x": 8.45, - "y": 3.875 - }, - { - "label": "Alt", - "x": 9.45, - "y": 3.625 - }, - { - "label": "Back", - "x": 11, - "y": 3 - }, - { - "label": "Shift", - "x": 12, - "y": 3.25 - }, - { - "label": "Ctrl", - "x": 13, - "y": 3.5 - } + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + + {"matrix": [4, 4], "x": 9, "y": 0.5}, + {"matrix": [4, 3], "x": 10, "y": 0.25}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + + {"matrix": [5, 4], "x": 9, "y": 1.5}, + {"matrix": [5, 3], "x": 10, "y": 1.25}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 4], "x": 9, "y": 2.5}, + {"matrix": [6, 3], "x": 10, "y": 2.25}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3.625}, + {"matrix": [3, 4], "x": 4.5, "y": 3.875}, + {"matrix": [3, 5], "x": 5.5, "y": 4.125}, + + {"matrix": [7, 5], "x": 7.45, "y": 4.125}, + {"matrix": [7, 4], "x": 8.45, "y": 3.875}, + {"matrix": [7, 3], "x": 9.45, "y": 3.625}, + {"matrix": [7, 2], "x": 11, "y": 3}, + {"matrix": [7, 1], "x": 12, "y": 3.25}, + {"matrix": [7, 0], "x": 13, "y": 3.5} ] } } diff --git a/keyboards/scatter42/scatter42.h b/keyboards/scatter42/scatter42.h deleted file mode 100644 index 2aae6a5e9a..0000000000 --- a/keyboards/scatter42/scatter42.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 bbrfkr - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, KC_NO }, \ - { L10, L11, L12, L13, L14, KC_NO }, \ - { L20, L21, L22, L23, L24, KC_NO }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R04, R03, R02, R01, R00, KC_NO }, \ - { R14, R13, R12, R11, R10, KC_NO }, \ - { R24, R23, R22, R21, R20, KC_NO }, \ - { R35, R34, R33, R32, R31, R30 } \ - } -- cgit v1.2.3