From 172a40686b84af7f887350a20c526855c7f7649c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:08:15 +1000 Subject: Move single `LAYOUT_all`s to data driven (#20430) --- keyboards/ymdk/wings/info.json | 135 ++++++++++++++++++------------------ keyboards/ymdk/wings/wings.h | 34 --------- keyboards/ymdk/wingshs/info.json | 133 ++++++++++++++++++------------------ keyboards/ymdk/wingshs/wingshs.h | 34 --------- keyboards/ymdk/ym68/info.json | 144 ++++++++++++++++++++------------------- keyboards/ymdk/ym68/ym68.h | 35 ---------- 6 files changed, 208 insertions(+), 307 deletions(-) delete mode 100644 keyboards/ymdk/wings/wings.h delete mode 100644 keyboards/ymdk/wingshs/wingshs.h delete mode 100644 keyboards/ymdk/ym68/ym68.h (limited to 'keyboards/ymdk') diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 090c8bc4d7..e669e746df 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -29,87 +29,86 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":0.25, "y":0.25}, - {"x":1.25, "y":0.25}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0.25}, - {"x":4.25, "y":0.25}, - {"x":5.25, "y":0.25}, - {"x":6.25, "y":0.25}, + {"matrix": [0, 0], "x": 0.25, "y": 0.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0.25}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0.25}, + {"matrix": [0, 4], "x": 4.25, "y": 0.25}, + {"matrix": [0, 5], "x": 5.25, "y": 0.25}, + {"matrix": [0, 6], "x": 6.25, "y": 0.25}, - {"x":9.5, "y":0.25}, - {"x":10.5, "y":0.25}, - {"x":11.5, "y":0.25}, - {"x":12.5, "y":0.25}, - {"x":13.5, "y":0}, - {"x":14.5, "y":0.25}, - {"x":15.5, "y":0.25}, - {"x":16.5, "y":0.25}, + {"matrix": [0, 7], "x": 9.5, "y": 0.25}, + {"matrix": [0, 8], "x": 10.5, "y": 0.25}, + {"matrix": [0, 9], "x": 11.5, "y": 0.25}, + {"matrix": [0, 10], "x": 12.5, "y": 0.25}, + {"matrix": [0, 11], "x": 13.5, "y": 0}, + {"matrix": [0, 12], "x": 14.5, "y": 0.25}, + {"matrix": [0, 13], "x": 15.5, "y": 0.25}, + {"matrix": [0, 14], "x": 16.5, "y": 0.25}, - {"x":18.25, "y":0}, + {"matrix": [4, 14], "x": 18.25, "y": 0}, - {"x":0, "y":1.25, "w":1.5}, - {"x":1.5, "y":1.25}, - {"x":2.75, "y":1.25}, - {"x":3.75, "y":1.25}, - {"x":4.75, "y":1.25}, - {"x":5.75, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.25}, + {"matrix": [1, 2], "x": 2.75, "y": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1.25}, + {"matrix": [1, 4], "x": 4.75, "y": 1.25}, + {"matrix": [1, 5], "x": 5.75, "y": 1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13.25, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25, "w":1.5}, + {"matrix": [1, 6], "x": 9, "y": 1.25}, + {"matrix": [1, 7], "x": 10, "y": 1.25}, + {"matrix": [1, 8], "x": 11, "y": 1.25}, + {"matrix": [1, 9], "x": 12, "y": 1.25}, + {"matrix": [1, 10], "x": 13.25, "y": 1.25}, + {"matrix": [1, 11], "x": 14.25, "y": 1.25}, + {"matrix": [1, 12], "x": 15.25, "y": 1.25}, + {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5}, - {"x":18.5, "y":1}, + {"matrix": [1, 14], "x": 18.5, "y": 1}, - {"x":0, "y":2.25, "w":1.75}, - {"x":1.75, "y":2.25}, - {"x":3, "y":2.25}, - {"x":4, "y":2.25}, - {"x":5, "y":2.25}, - {"x":6, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2.25}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, - {"x":9.25, "y":2.25}, - {"x":10.25, "y":2.25}, - {"x":11.25, "y":2.25}, - {"x":12.25, "y":2.25}, - {"x":13.75, "y":2.25}, - {"x":14.75, "y":2.25}, - {"x":15.75, "y":2.25, "w":2.25}, + {"matrix": [2, 6], "x": 9.25, "y": 2.25}, + {"matrix": [2, 7], "x": 10.25, "y": 2.25}, + {"matrix": [2, 8], "x": 11.25, "y": 2.25}, + {"matrix": [2, 9], "x": 12.25, "y": 2.25}, + {"matrix": [2, 10], "x": 13.75, "y": 2.25}, + {"matrix": [2, 11], "x": 14.75, "y": 2.25}, + {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25}, - {"x":18.75, "y":2}, + {"matrix": [2, 14], "x": 18.75, "y": 2}, - {"x":0, "y":3.25, "w":2.25}, - {"x":2.25, "y":3.25}, - {"x":3.5, "y":3.25}, - {"x":4.5, "y":3.25}, - {"x":5.5, "y":3.25}, - {"x":6.5, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.25}, + {"matrix": [3, 5], "x": 5.5, "y": 3.25}, + {"matrix": [3, 6], "x": 6.5, "y": 3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":13.5, "y":3.25}, - {"x":14.5, "y":3.25}, - {"x":15.5, "y":3.25, "w":1.75}, + {"matrix": [3, 7], "x": 9.75, "y": 3.25}, + {"matrix": [3, 8], "x": 10.75, "y": 3.25}, + {"matrix": [3, 9], "x": 11.75, "y": 3.25}, + {"matrix": [3, 10], "x": 13.5, "y": 3.25}, + {"matrix": [3, 11], "x": 14.5, "y": 3.25}, + {"matrix": [3, 12], "x": 15.5, "y": 3.25, "w": 1.75}, + {"matrix": [3, 13], "x": 17.5, "y": 3.25}, - {"x":17.5, "y":3.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5}, + {"matrix": [4, 6], "x": 5, "y": 4.25, "w": 2}, + {"matrix": [4, 8], "x": 7, "y": 4.25}, - {"x":0, "y":4.25, "w":1.5}, - {"x":3.5, "y":4.25, "w":1.5}, - {"x":5, "y":4.25, "w":2}, - {"x":7, "y":4.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4.25, "w": 2.75}, + {"matrix": [4, 10], "x": 12.5, "y": 4.25, "w": 1.5}, - {"x":9.75, "y":4.25, "w":2.75}, - {"x":12.5, "y":4.25, "w":1.5}, - - {"x":16.5, "y":4.25}, - {"x":17.5, "y":4.25}, - {"x":18.5, "y":4.25} + {"matrix": [4, 11], "x": 16.5, "y": 4.25}, + {"matrix": [4, 12], "x": 17.5, "y": 4.25}, + {"matrix": [4, 13], "x": 18.5, "y": 4.25} ] } } diff --git a/keyboards/ymdk/wings/wings.h b/keyboards/ymdk/wings/wings.h deleted file mode 100644 index d9416157f1..0000000000 --- a/keyboards/ymdk/wings/wings.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 alittlepeace - * - * 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 . - */ -#include "quantum.h" -#pragma once - - -#define XXX KC_NO -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k4E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ - k40, k42, k46, k48, k49, k4A, k4B, k4C, k4D \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E}, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX}, \ - { k40, XXX, k42, XXX, XXX, XXX, k46, XXX, k48, k49, k4A, k4B, k4C, k4D, k4E} \ -} diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index ec532eff87..4823e6911a 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -29,84 +29,85 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":0.25, "y":0.25}, - {"x":1.25, "y":0.25}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0.25}, - {"x":4.25, "y":0.25}, - {"x":5.25, "y":0.25}, - {"x":6.25, "y":0.25}, + {"matrix": [0, 0], "x": 0.25, "y": 0.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0.25}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0.25}, + {"matrix": [0, 4], "x": 4.25, "y": 0.25}, + {"matrix": [0, 5], "x": 5.25, "y": 0.25}, + {"matrix": [0, 6], "x": 6.25, "y": 0.25}, - {"x":9.5, "y":0.25}, - {"x":10.5, "y":0.25}, - {"x":11.5, "y":0.25}, - {"x":12.5, "y":0.25}, - {"x":13.5, "y":0}, - {"x":14.5, "y":0.25}, - {"x":15.5, "y":0.25, "w":2}, + {"matrix": [0, 7], "x": 9.5, "y": 0.25}, + {"matrix": [0, 8], "x": 10.5, "y": 0.25}, + {"matrix": [0, 9], "x": 11.5, "y": 0.25}, + {"matrix": [0, 10], "x": 12.5, "y": 0.25}, + {"matrix": [0, 11], "x": 13.5, "y": 0}, + {"matrix": [0, 12], "x": 14.5, "y": 0.25}, + {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2}, - {"x":18.25, "y":0}, + {"matrix": [4, 14], "x": 18.25, "y": 0}, - {"x":0, "y":1.25, "w":1.5}, - {"x":1.5, "y":1.25}, - {"x":2.75, "y":1.25}, - {"x":3.75, "y":1.25}, - {"x":4.75, "y":1.25}, - {"x":5.75, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.25}, + {"matrix": [1, 2], "x": 2.75, "y": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1.25}, + {"matrix": [1, 4], "x": 4.75, "y": 1.25}, + {"matrix": [1, 5], "x": 5.75, "y": 1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13.25, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25, "w":1.5}, + {"matrix": [1, 6], "x": 9, "y": 1.25}, + {"matrix": [1, 7], "x": 10, "y": 1.25}, + {"matrix": [1, 8], "x": 11, "y": 1.25}, + {"matrix": [1, 9], "x": 12, "y": 1.25}, + {"matrix": [1, 10], "x": 13.25, "y": 1.25}, + {"matrix": [1, 11], "x": 14.25, "y": 1.25}, + {"matrix": [1, 12], "x": 15.25, "y": 1.25}, + {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5}, - {"x":18.5, "y":1}, + {"matrix": [1, 14], "x": 18.5, "y": 1}, - {"x":0, "y":2.25, "w":1.75}, - {"x":1.75, "y":2.25}, - {"x":3, "y":2.25}, - {"x":4, "y":2.25}, - {"x":5, "y":2.25}, - {"x":6, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2.25}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, - {"x":9.25, "y":2.25}, - {"x":10.25, "y":2.25}, - {"x":11.25, "y":2.25}, - {"x":12.25, "y":2.25}, - {"x":13.75, "y":2.25}, - {"x":14.75, "y":2.25}, - {"x":15.75, "y":2.25, "w":2.25}, + {"matrix": [2, 6], "x": 9.25, "y": 2.25}, + {"matrix": [2, 7], "x": 10.25, "y": 2.25}, + {"matrix": [2, 8], "x": 11.25, "y": 2.25}, + {"matrix": [2, 9], "x": 12.25, "y": 2.25}, + {"matrix": [2, 10], "x": 13.75, "y": 2.25}, + {"matrix": [2, 11], "x": 14.75, "y": 2.25}, + {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25}, - {"x":18.75, "y":2}, + {"matrix": [2, 14], "x": 18.75, "y": 2}, - {"x":0, "y":3.25, "w":2.25}, - {"x":2.25, "y":3.25}, - {"x":3.5, "y":3.25}, - {"x":4.5, "y":3.25}, - {"x":5.5, "y":3.25}, - {"x":6.5, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3.25}, + {"matrix": [3, 3], "x": 4.5, "y": 3.25}, + {"matrix": [3, 4], "x": 5.5, "y": 3.25}, + {"matrix": [3, 5], "x": 6.5, "y": 3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":13.5, "y":3.25}, - {"x":14.5, "y":3.25}, - {"x":15.5, "y":3.25, "w":1.75}, - {"x":17.5, "y":3.25}, + {"matrix": [3, 6], "x": 9.75, "y": 3.25}, + {"matrix": [3, 7], "x": 10.75, "y": 3.25}, + {"matrix": [3, 8], "x": 11.75, "y": 3.25}, + {"matrix": [3, 9], "x": 13.5, "y": 3.25}, + {"matrix": [3, 10], "x": 14.5, "y": 3.25}, + {"matrix": [3, 11], "x": 15.5, "y": 3.25, "w": 1.75}, + {"matrix": [3, 13], "x": 17.5, "y": 3.25}, - {"x":0, "y":4.25, "w":1.5}, - {"x":3.5, "y":4.25, "w":1.5}, - {"x":5, "y":4.25, "w":2}, - {"x":7, "y":4.25}, - {"x":9.75, "y":4.25, "w":2.75}, - {"x":12.5, "y":4.25, "w":1.5}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5}, + {"matrix": [4, 4], "x": 5, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 7, "y": 4.25}, - {"x":16.5, "y":4.25}, - {"x":17.5, "y":4.25}, - {"x":18.5, "y":4.25} + {"matrix": [4, 6], "x": 9.75, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 12.5, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 11], "x": 16.5, "y": 4.25}, + {"matrix": [4, 12], "x": 17.5, "y": 4.25}, + {"matrix": [4, 13], "x": 18.5, "y": 4.25} ] } } diff --git a/keyboards/ymdk/wingshs/wingshs.h b/keyboards/ymdk/wingshs/wingshs.h deleted file mode 100644 index 3321f48fc1..0000000000 --- a/keyboards/ymdk/wingshs/wingshs.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 alittlepeace - * - * 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 . - */ -#include "quantum.h" -#pragma once - - -#define XXX KC_NO -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ - k40, k42, k44, k45, k46, k49, k4B, k4C, k4D \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX}, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E}, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX}, \ - { k40, XXX, k42, XXX, k44, k45, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E} \ -} diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index e7490d59dd..95bd25d398 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -26,76 +26,80 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"K00 (B0,D0)", "x":0, "y":0}, - {"label":"K01 (B0,D1)", "x":1, "y":0}, - {"label":"K02 (B0,D2)", "x":2, "y":0}, - {"label":"K03 (B0,D3)", "x":3, "y":0}, - {"label":"K04 (B0,D5)", "x":4, "y":0}, - {"label":"K05 (B0,D4)", "x":5, "y":0}, - {"label":"K06 (B0,D6)", "x":6, "y":0}, - {"label":"K07 (B0,D7)", "x":7, "y":0}, - {"label":"K08 (B0,B4)", "x":8, "y":0}, - {"label":"K09 (B0,F7)", "x":9, "y":0}, - {"label":"K0A (B0,F6)", "x":10, "y":0}, - {"label":"K0B (B0,F5)", "x":11, "y":0}, - {"label":"K0C (B0,F4)", "x":12, "y":0}, - {"label":"K0D (B0,F1)", "x":13, "y":0}, - {"label":"K0E (B0,F0)", "x":14, "y":0}, - {"label":"K4E (B7,F0)", "x":15, "y":0}, - {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,D1)", "x":1.5, "y":1}, - {"label":"K12 (B1,D2)", "x":2.5, "y":1}, - {"label":"K13 (B1,D3)", "x":3.5, "y":1}, - {"label":"K14 (B1,D5)", "x":4.5, "y":1}, - {"label":"K15 (B1,D4)", "x":5.5, "y":1}, - {"label":"K16 (B1,D6)", "x":6.5, "y":1}, - {"label":"K17 (B1,D7)", "x":7.5, "y":1}, - {"label":"K18 (B1,B4)", "x":8.5, "y":1}, - {"label":"K19 (B1,F7)", "x":9.5, "y":1}, - {"label":"K1A (B1,F6)", "x":10.5, "y":1}, - {"label":"K1B (B1,F5)", "x":11.5, "y":1}, - {"label":"K1C (B1,F4)", "x":12.5, "y":1}, - {"label":"K2C (B2,F4)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B1,F0)", "x":15, "y":1}, - {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B2,D1)", "x":1.75, "y":2}, - {"label":"K22 (B2,D2)", "x":2.75, "y":2}, - {"label":"K23 (B2,D3)", "x":3.75, "y":2}, - {"label":"K24 (B2,D5)", "x":4.75, "y":2}, - {"label":"K25 (B2,D4)", "x":5.75, "y":2}, - {"label":"K26 (B2,D6)", "x":6.75, "y":2}, - {"label":"K27 (B2,D7)", "x":7.75, "y":2}, - {"label":"K28 (B2,B4)", "x":8.75, "y":2}, - {"label":"K29 (B2,F7)", "x":9.75, "y":2}, - {"label":"K2A (B2,F6)", "x":10.75, "y":2}, - {"label":"K2B (B2,F5)", "x":11.75, "y":2}, - {"label":"K1D (B1,F1)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B2,F0)", "x":15, "y":2}, - {"label":"K30 (B3,D0)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (B3,D1)", "x":1.25, "y":3}, - {"label":"K32 (B3,D2)", "x":2.25, "y":3}, - {"label":"K33 (B3,D3)", "x":3.25, "y":3}, - {"label":"K34 (B3,D5)", "x":4.25, "y":3}, - {"label":"K35 (B3,D4)", "x":5.25, "y":3}, - {"label":"K36 (B3,D6)", "x":6.25, "y":3}, - {"label":"K37 (B3,D7)", "x":7.25, "y":3}, - {"label":"K38 (B3,B4)", "x":8.25, "y":3}, - {"label":"K39 (B3,F7)", "x":9.25, "y":3}, - {"label":"K3A (B3,F6)", "x":10.25, "y":3}, - {"label":"K3B (B3,F5)", "x":11.25, "y":3}, - {"label":"K3C (B3,F4)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (B3,F1)", "x":14, "y":3}, - {"label":"K3E (B3,F0)", "x":15, "y":3}, - {"label":"K40 (B7,D0)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (B7,D1)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (B7,D2)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (B7,D6)", "x":3.75, "y":4, "w":6.25}, - {"label":"K48 (B7,B4)", "x":10, "y":4}, - {"label":"K49 (B7,F7)", "x":11, "y":4}, - {"label":"K4A (B7,F6)", "x":12, "y":4}, - {"label":"K4B (B7,F5)", "x":13, "y":4}, - {"label":"K4C (B7,F4)", "x":14, "y":4}, - {"label":"K4D (B7,F1)", "x":15, "y":4} + {"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": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} ] } } diff --git a/keyboards/ymdk/ym68/ym68.h b/keyboards/ymdk/ym68/ym68.h deleted file mode 100644 index 42b2a990ca..0000000000 --- a/keyboards/ymdk/ym68/ym68.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * 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 ___ KC_NO - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K48, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, K4C, K4D, K4E } \ -} -- cgit v1.2.3