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/splitography/info.json | 315 +++++----------------------------- keyboards/splitography/splitography.h | 33 ---- 2 files changed, 47 insertions(+), 301 deletions(-) delete mode 100644 keyboards/splitography/splitography.h (limited to 'keyboards/splitography') diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json index aab9d3f22f..45ee7beed8 100644 --- a/keyboards/splitography/info.json +++ b/keyboards/splitography/info.json @@ -29,274 +29,53 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0, - "h": 0.6, - "matrix": [0, 0], - "label": "Esc" - }, - { - "x": 1, - "y": 0, - "h": 0.6, - "matrix": [0, 1], - "label": "Q" - }, - { - "x": 2, - "y": 0, - "h": 0.6, - "matrix": [0, 2], - "label": "W" - }, - { - "x": 3, - "y": 0, - "h": 0.6, - "matrix": [0, 3], - "label": "E" - }, - { - "x": 4, - "y": 0, - "h": 0.6, - "matrix": [0, 4], - "label": "R" - }, - { - "x": 5, - "y": 0, - "h": 0.6, - "matrix": [0, 5], - "label": "T" - }, - { - "x": 8, - "y": 0, - "h": 0.6, - "matrix": [0, 6], - "label": "Y" - }, - { - "x": 9, - "y": 0, - "h": 0.6, - "matrix": [0, 7], - "label": "U" - }, - { - "x": 10, - "y": 0, - "h": 0.6, - "matrix": [0, 8], - "label": "I" - }, - { - "x": 11, - "y": 0, - "h": 0.6, - "matrix": [0, 9], - "label": "O" - }, - { - "x": 12, - "y": 0, - "h": 0.6, - "matrix": [0, 10], - "label": "P" - }, - { - "x": 13, - "y": 0, - "h": 0.6, - "matrix": [0, 11], - "label": "Backspace" - }, - { - "x": 0, - "y": 0.6, - "matrix": [1, 0], - "label": "Alt" - }, - { - "x": 1, - "y": 0.6, - "matrix": [1, 1], - "label": "A" - }, - { - "x": 2, - "y": 0.6, - "matrix": [1, 2], - "label": "S" - }, - { - "x": 3, - "y": 0.6, - "matrix": [1, 3], - "label": "D" - }, - { - "x": 4, - "y": 0.6, - "matrix": [1, 4], - "label": "F" - }, - { - "x": 5, - "y": 0.6, - "matrix": [1, 5], - "label": "G" - }, - { - "x": 8, - "y": 0.6, - "matrix": [1, 6], - "label": "H" - }, - { - "x": 9, - "y": 0.6, - "matrix": [1, 7], - "label": "J" - }, - { - "x": 10, - "y": 0.6, - "matrix": [1, 8], - "label": "K" - }, - { - "x": 11, - "y": 0.6, - "matrix": [1, 9], - "label": "L" - }, - { - "x": 12, - "y": 0.6, - "matrix": [1, 10], - "label": ";" - }, - { - "x": 13, - "y": 0.6, - "matrix": [1, 11], - "label": "Enter" - }, - { - "x": 0, - "y": 1.6, - "h": 1.2, - "matrix": [2, 0], - "label": "Shift" - }, - { - "x": 1, - "y": 1.6, - "h": 1.2, - "matrix": [2, 1], - "label": "Z" - }, - { - "x": 2, - "y": 1.6, - "h": 1.2, - "matrix": [2, 2], - "label": "X" - }, - { - "x": 3, - "y": 1.6, - "h": 1.2, - "matrix": [2, 3], - "label": "C" - }, - { - "x": 4, - "y": 1.6, - "h": 1.2, - "matrix": [2, 4], - "label": "V" - }, - { - "x": 5, - "y": 1.6, - "h": 1.2, - "matrix": [2, 5], - "label": "B" - }, - { - "x": 8, - "y": 1.6, - "h": 1.2, - "matrix": [2, 6], - "label": "N" - }, - { - "x": 9, - "y": 1.6, - "h": 1.2, - "matrix": [2, 7], - "label": "M" - }, - { - "x": 10, - "y": 1.6, - "h": 1.2, - "matrix": [2, 8], - "label": "," - }, - { - "x": 11, - "y": 1.6, - "h": 1.2, - "matrix": [2, 9], - "label": "c" - }, - { - "x": 12, - "y": 1.6, - "h": 1.2, - "matrix": [2, 10], - "label": "/" - }, - { - "x": 13, - "y": 1.6, - "h": 1.2, - "matrix": [2, 11], - "label": "Super" - }, - { - "x": 3.5, - "y": 3, - "h": 1.2, - "matrix": [3, 4], - "label": "Orange" - }, - { - "x": 4.5, - "y": 3, - "h": 1.2, - "matrix": [3, 5], - "label": "Blue" - }, - { - "x": 8.5, - "y": 3, - "h": 1.2, - "matrix": [3, 6], - "label": "Space" - }, - { - "x": 9.5, - "y": 3, - "h": 1.2, - "matrix": [3, 7], - "label": "Ctrl" - } + {"matrix": [0, 0], "x": 0, "y": 0, "h": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0, "h": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0, "h": 0.6}, + {"matrix": [0, 3], "x": 3, "y": 0, "h": 0.6}, + {"matrix": [0, 4], "x": 4, "y": 0, "h": 0.6}, + {"matrix": [0, 5], "x": 5, "y": 0, "h": 0.6}, + + {"matrix": [0, 6], "x": 8, "y": 0, "h": 0.6}, + {"matrix": [0, 7], "x": 9, "y": 0, "h": 0.6}, + {"matrix": [0, 8], "x": 10, "y": 0, "h": 0.6}, + {"matrix": [0, 9], "x": 11, "y": 0, "h": 0.6}, + {"matrix": [0, 10], "x": 12, "y": 0, "h": 0.6}, + {"matrix": [0, 11], "x": 13, "y": 0, "h": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 0.6}, + {"matrix": [1, 1], "x": 1, "y": 0.6}, + {"matrix": [1, 2], "x": 2, "y": 0.6}, + {"matrix": [1, 3], "x": 3, "y": 0.6}, + {"matrix": [1, 4], "x": 4, "y": 0.6}, + {"matrix": [1, 5], "x": 5, "y": 0.6}, + + {"matrix": [1, 6], "x": 8, "y": 0.6}, + {"matrix": [1, 7], "x": 9, "y": 0.6}, + {"matrix": [1, 8], "x": 10, "y": 0.6}, + {"matrix": [1, 9], "x": 11, "y": 0.6}, + {"matrix": [1, 10], "x": 12, "y": 0.6}, + {"matrix": [1, 11], "x": 13, "y": 0.6}, + + {"matrix": [2, 0], "x": 0, "y": 1.6, "h": 1.2}, + {"matrix": [2, 1], "x": 1, "y": 1.6, "h": 1.2}, + {"matrix": [2, 2], "x": 2, "y": 1.6, "h": 1.2}, + {"matrix": [2, 3], "x": 3, "y": 1.6, "h": 1.2}, + {"matrix": [2, 4], "x": 4, "y": 1.6, "h": 1.2}, + {"matrix": [2, 5], "x": 5, "y": 1.6, "h": 1.2}, + + {"matrix": [2, 6], "x": 8, "y": 1.6, "h": 1.2}, + {"matrix": [2, 7], "x": 9, "y": 1.6, "h": 1.2}, + {"matrix": [2, 8], "x": 10, "y": 1.6, "h": 1.2}, + {"matrix": [2, 9], "x": 11, "y": 1.6, "h": 1.2}, + {"matrix": [2, 10], "x": 12, "y": 1.6, "h": 1.2}, + {"matrix": [2, 11], "x": 13, "y": 1.6, "h": 1.2}, + + {"matrix": [3, 4], "x": 3.5, "y": 3, "h": 1.2}, + {"matrix": [3, 5], "x": 4.5, "y": 3, "h": 1.2}, + + {"matrix": [3, 6], "x": 8.5, "y": 3, "h": 1.2}, + {"matrix": [3, 7], "x": 9.5, "y": 3, "h": 1.2} ] } } diff --git a/keyboards/splitography/splitography.h b/keyboards/splitography/splitography.h deleted file mode 100644 index cfef33363d..0000000000 --- a/keyboards/splitography/splitography.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Alexis Jeandeau - * - * 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" - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L34, L35, R30, R31 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05 }, \ - { L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15 }, \ - { L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, L34, L35, R30, R31, KC_NO, KC_NO, KC_NO, KC_NO } \ -} -- cgit v1.2.3