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/ogre/ergo_single/ergo_single.h | 39 --------- keyboards/ogre/ergo_single/info.json | 142 +++++++++++++++---------------- 2 files changed, 70 insertions(+), 111 deletions(-) delete mode 100644 keyboards/ogre/ergo_single/ergo_single.h (limited to 'keyboards/ogre/ergo_single') diff --git a/keyboards/ogre/ergo_single/ergo_single.h b/keyboards/ogre/ergo_single/ergo_single.h deleted file mode 100644 index f8f9ddf65f..0000000000 --- a/keyboards/ogre/ergo_single/ergo_single.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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( \ - k63, k00, k10, k20, k30, k40, k50, k60, k65, k55, k45, k35, k25, k15, k05, k68, \ - k01, k11, k21, k31, k41, k51, k61, k66, k56, k46, k36, k26, k16, k06, \ - k02, k12, k22, k32, k42, k52, k62, k67, k57, k47, k37, k27, k17, k07, \ - k03, k13, k23, k33, k43, k53, k58, k48, k38, k28, k18, k08, \ - k04, k14, k24, k34, k44, k54, k64, k69, k59, k49, k39, k29, k19, k09 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60 }, \ - { k01, k11, k21, k31, k41, k51, k61 }, \ - { k02, k12, k22, k32, k42, k52, k62 }, \ - { k03, k13, k23, k33, k43, k53, k63 }, \ - { k04, k14, k24, k34, k44, k54, k64 }, \ - { k05, k15, k25, k35, k45, k55, k65 }, \ - { k06, k16, k26, k36, k46, k56, k66 }, \ - { k07, k17, k27, k37, k47, k57, k67 }, \ - { k08, k18, k28, k38, k48, k58, k68 }, \ - { k09, k19, k29, k39, k49, k59, k69 }, \ -} diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index b2f4493362..4a5b96b8ad 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -21,87 +21,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.25, "y": 0.5}, - {"x": 1.25, "y": 0.5}, - {"x": 2.25, "y": 0.5}, - {"x": 3.25, "y": 0.25}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0.25}, - {"x": 6.25, "y": 0.5}, - {"x": 7.25, "y": 0.5}, + {"matrix": [3, 6], "x": 0.25, "y": 0.5}, + {"matrix": [0, 0], "x": 1.25, "y": 0.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0.5}, + {"matrix": [0, 2], "x": 3.25, "y": 0.25}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0.5}, + {"matrix": [0, 6], "x": 7.25, "y": 0.5}, - {"x": 11.25, "y": 0.5}, - {"x": 12.25, "y": 0.5}, - {"x": 13.25, "y": 0.25}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0.25}, - {"x": 16.25, "y": 0.5}, - {"x": 17.25, "y": 0.5}, - {"x": 18.25, "y": 0.5}, + {"matrix": [5, 6], "x": 11.25, "y": 0.5}, + {"matrix": [5, 5], "x": 12.25, "y": 0.5}, + {"matrix": [5, 4], "x": 13.25, "y": 0.25}, + {"matrix": [5, 3], "x": 14.25, "y": 0}, + {"matrix": [5, 2], "x": 15.25, "y": 0.25}, + {"matrix": [5, 1], "x": 16.25, "y": 0.5}, + {"matrix": [5, 0], "x": 17.25, "y": 0.5}, + {"matrix": [8, 6], "x": 18.25, "y": 0.5}, - {"x": 0.75, "y": 1.5, "w": 1.5}, - {"x": 2.25, "y": 1.5}, - {"x": 3.25, "y": 1.25}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1.25}, - {"x": 6.25, "y": 1.5}, - {"x": 7.25, "y": 1.5}, + {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 2.25, "y": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.5}, + {"matrix": [1, 6], "x": 7.25, "y": 1.5}, - {"x": 11.25, "y": 1.5}, - {"x": 12.25, "y": 1.5}, - {"x": 13.25, "y": 1.25}, - {"x": 14.25, "y": 1}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5, "w": 1.5}, + {"matrix": [6, 6], "x": 11.25, "y": 1.5}, + {"matrix": [6, 5], "x": 12.25, "y": 1.5}, + {"matrix": [6, 4], "x": 13.25, "y": 1.25}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.25}, + {"matrix": [6, 1], "x": 16.25, "y": 1.5}, + {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5}, - {"x": 0.5, "y": 2.5, "w": 1.75}, - {"x": 2.25, "y": 2.5}, - {"x": 3.25, "y": 2.25}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2.25}, - {"x": 6.25, "y": 2.5}, - {"x": 7.25, "y": 2.5}, + {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75}, + {"matrix": [2, 1], "x": 2.25, "y": 2.5}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2.5}, + {"matrix": [2, 6], "x": 7.25, "y": 2.5}, - {"x": 11.25, "y": 2.5}, - {"x": 12.25, "y": 2.5}, - {"x": 13.25, "y": 2.25}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5, "w": 1.75}, + {"matrix": [7, 6], "x": 11.25, "y": 2.5}, + {"matrix": [7, 5], "x": 12.25, "y": 2.5}, + {"matrix": [7, 4], "x": 13.25, "y": 2.25}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.25}, + {"matrix": [7, 1], "x": 16.25, "y": 2.5}, + {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75}, - {"x": 0, "y": 3.5, "w": 2.25}, - {"x": 2.25, "y": 3.5}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3.25}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, + {"matrix": [8, 5], "x": 12.25, "y": 3.5}, + {"matrix": [8, 4], "x": 13.25, "y": 3.25}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.25}, + {"matrix": [8, 1], "x": 16.25, "y": 3.5}, + {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25}, - {"x": 1, "y": 4.5, "w": 1.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4}, + {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25}, + {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75}, + {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2}, - {"x": 6.25, "y": 5.5, "w": 1.25}, - {"x": 7.5, "y": 3.75, "h": 2.75}, - {"x": 8.5, "y": 4.5, "h": 2}, - - {"x": 10, "y": 5, "h": 1.5}, - {"x": 11, "y": 4.5, "h": 2}, - {"x": 12, "y": 5.5, "w": 1.25}, - - {"x": 14.25, "y": 4}, - {"x": 15.25, "y": 4.25}, - {"x": 16.25, "y": 4.5}, - {"x": 17.25, "y": 4.5, "w": 1.25} + {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5}, + {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2}, + {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.25}, + {"matrix": [9, 1], "x": 16.25, "y": 4.5}, + {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25} ] } } -- cgit v1.2.3