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/keycapsss/kimiko/rev1/info.json | 125 ++++++++++++++++-------------- keyboards/keycapsss/kimiko/rev1/rev1.h | 40 ---------- 2 files changed, 65 insertions(+), 100 deletions(-) delete mode 100644 keyboards/keycapsss/kimiko/rev1/rev1.h (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index 160c7517e0..56028f3f81 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -29,70 +29,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.8}, - {"x":1, "y":0.8}, - {"x":2, "y":0.15}, - {"x":3, "y":0}, - {"x":4, "y":0.15}, - {"x":5, "y":0.3}, - {"x":9, "y":0.3}, - {"x":10, "y":0.15}, - {"x":11, "y":0}, - {"x":12, "y":0.15}, - {"x":13, "y":0.8}, - {"x":14, "y":0.8}, + {"matrix": [0, 0], "x": 0, "y": 0.8}, + {"matrix": [0, 1], "x": 1, "y": 0.8}, + {"matrix": [0, 2], "x": 2, "y": 0.15}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + {"matrix": [0, 5], "x": 5, "y": 0.3}, - {"x":0, "y":1.8}, - {"x":1, "y":1.8}, - {"x":2, "y":1.15}, - {"x":3, "y":1}, - {"x":4, "y":1.15}, - {"x":5, "y":1.3}, - {"x":9, "y":1.3}, - {"x":10, "y":1.15}, - {"x":11, "y":1}, - {"x":12, "y":1.15}, - {"x":13, "y":1.8}, - {"x":14, "y":1.8}, + {"matrix": [5, 5], "x": 9, "y": 0.3}, + {"matrix": [5, 4], "x": 10, "y": 0.15}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.15}, + {"matrix": [5, 1], "x": 13, "y": 0.8}, + {"matrix": [5, 0], "x": 14, "y": 0.8}, - {"x":0, "y":2.8}, - {"x":1, "y":2.8}, - {"x":2, "y":2.15}, - {"x":3, "y":2}, - {"x":4, "y":2.15}, - {"x":5, "y":2.3}, - {"x":9, "y":2.3}, - {"x":10, "y":2.15}, - {"x":11, "y":2}, - {"x":12, "y":2.15}, - {"x":13, "y":2.8}, - {"x":14, "y":2.8}, + {"matrix": [1, 0], "x": 0, "y": 1.8}, + {"matrix": [1, 1], "x": 1, "y": 1.8}, + {"matrix": [1, 2], "x": 2, "y": 1.15}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + {"matrix": [1, 5], "x": 5, "y": 1.3}, - {"x":0, "y":3.8}, - {"x":1, "y":3.8}, - {"x":2, "y":3.15}, - {"x":3, "y":3}, - {"x":4, "y":3.15}, - {"x":5, "y":3.3}, - {"x":6.25, "y":3.3}, - {"x":7.75, "y":3.3}, - {"x":9, "y":3.3}, - {"x":10, "y":3.15}, - {"x":11, "y":3}, - {"x":12, "y":3.15}, - {"x":13, "y":3.8}, - {"x":14, "y":3.8}, + {"matrix": [6, 5], "x": 9, "y": 1.3}, + {"matrix": [6, 4], "x": 10, "y": 1.15}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.15}, + {"matrix": [6, 1], "x": 13, "y": 1.8}, + {"matrix": [6, 0], "x": 14, "y": 1.8}, - {"x":2, "y":4.15}, - {"x":3, "y":4}, - {"x":4, "y":4.15}, - {"x":5.25, "y":4.3}, - {"x":6.25, "y":4.25, "h":1.5}, - {"x":7.75, "y":4.25, "h":1.5}, - {"x":8.75, "y":4.3}, - {"x":10, "y":4.15}, - {"x":11, "y":4}, - {"x":12, "y":4.15} + {"matrix": [2, 0], "x": 0, "y": 2.8}, + {"matrix": [2, 1], "x": 1, "y": 2.8}, + {"matrix": [2, 2], "x": 2, "y": 2.15}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + {"matrix": [2, 5], "x": 5, "y": 2.3}, + + {"matrix": [7, 5], "x": 9, "y": 2.3}, + {"matrix": [7, 4], "x": 10, "y": 2.15}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.15}, + {"matrix": [7, 1], "x": 13, "y": 2.8}, + {"matrix": [7, 0], "x": 14, "y": 2.8}, + + {"matrix": [3, 0], "x": 0, "y": 3.8}, + {"matrix": [3, 1], "x": 1, "y": 3.8}, + {"matrix": [3, 2], "x": 2, "y": 3.15}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.15}, + {"matrix": [3, 5], "x": 5, "y": 3.3}, + {"matrix": [4, 5], "x": 6.25, "y": 3.3}, + + {"matrix": [9, 5], "x": 7.75, "y": 3.3}, + {"matrix": [8, 5], "x": 9, "y": 3.3}, + {"matrix": [8, 4], "x": 10, "y": 3.15}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.15}, + {"matrix": [8, 1], "x": 13, "y": 3.8}, + {"matrix": [8, 0], "x": 14, "y": 3.8}, + + {"matrix": [4, 0], "x": 2, "y": 4.15}, + {"matrix": [4, 1], "x": 3, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4.15}, + {"matrix": [4, 3], "x": 5.25, "y": 4.3}, + {"matrix": [4, 4], "x": 6.25, "y": 4.25, "h": 1.5}, + + {"matrix": [9, 4], "x": 7.75, "y": 4.25, "h": 1.5}, + {"matrix": [9, 3], "x": 8.75, "y": 4.3}, + {"matrix": [9, 2], "x": 10, "y": 4.15}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 0], "x": 12, "y": 4.15} ] } } diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.h b/keyboards/keycapsss/kimiko/rev1/rev1.h deleted file mode 100644 index 3359a39838..0000000000 --- a/keyboards/keycapsss/kimiko/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 @ben_roe (keycapsss.com) - * - * 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( \ - 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, \ - L30, L31, L32, L33, L34, L35, L40, R40, R30, R31, R32, R33, R34, R35, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L41, L42, L43, L44, L45, L40 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } - -- cgit v1.2.3