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/ibnuda/gurindam/gurindam.h | 46 ----------- keyboards/ibnuda/gurindam/info.json | 143 +++++++++++++++++++---------------- 2 files changed, 76 insertions(+), 113 deletions(-) delete mode 100644 keyboards/ibnuda/gurindam/gurindam.h (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/gurindam/gurindam.h b/keyboards/ibnuda/gurindam/gurindam.h deleted file mode 100644 index 9967bcf528..0000000000 --- a/keyboards/ibnuda/gurindam/gurindam.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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 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 XXX KC_NO -#define LAYOUT( \ - k1, k6, k10, k15, k19, k24, k28, k33, k37, k42, k46, k51, k55, k60, k64, k65, \ - k2, k7, k11, k16, k20, k25, k29, k34, k38, k43, k47, k52, k56, k61, k66, \ - k3, k8, k12, k17, k21, k26, k30, k35, k39, k44, k48, k53, k57, k62, \ - k4, k9, k13, k18, k22, k27, k31, k36, k40, k45, k49, k54, k58, \ - k5, k14, k23, k32, k41, k50, k59, k63, k67 \ -) \ -{ \ - { k1, k10, k19, k28, k37, k46, k55, k64 }, \ - { k6, k15, k24, k33, k42, k51, k60, XXX }, \ - { k2, k11, k20, k29, k38, k47, k56, k65 }, \ - { k7, k16, k25, k34, k43, k52, k61, XXX }, \ - { k3, k12, k21, k30, k39, k48, k57, k66 }, \ - { k8, k17, k26, k35, k44, k53, k62, XXX }, \ - { k4, k13, k22, k31, k40, k49, k58, k67 }, \ - { k9, k18, k27, k36, k45, k54, k63, XXX }, \ - { k5, k14, k23, k32, k41, k50, k59, XXX } \ -} diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index f8acee360f..2b18d0417e 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -21,77 +21,86 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":16, "y":0}, - {"x":17.3, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1, "w":1.5}, - {"x":17.3, "y":1}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [0, 4], "x": 10, "y": 0}, + {"matrix": [1, 4], "x": 11, "y": 0}, + {"matrix": [0, 5], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [0, 7], "x": 16, "y": 0}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2}, - {"x":14.75, "y":2, "w":2.25}, - {"x":17.3, "y":2}, + {"matrix": [2, 7], "x": 17.3, "y": 0}, - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3, "w":1.75}, - {"x":16.3, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, - {"x":0, "y":4, "w":1.5}, - {"x":3.25, "y":4, "w":1.5}, - {"x":4.75, "y":4, "w":2}, - {"x":6.75, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":2.75}, - {"x":11.5, "y":4, "w":1.5}, - {"x":15.3, "y":4.25}, - {"x":16.3, "y":4.25}, - {"x":17.3, "y":4.25} + {"matrix": [2, 3], "x": 8.5, "y": 1}, + {"matrix": [3, 3], "x": 9.5, "y": 1}, + {"matrix": [2, 4], "x": 10.5, "y": 1}, + {"matrix": [3, 4], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [3, 5], "x": 13.5, "y": 1}, + {"matrix": [2, 6], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 7], "x": 17.3, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [5, 3], "x": 9.75, "y": 2}, + {"matrix": [4, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 11.75, "y": 2}, + {"matrix": [4, 5], "x": 12.75, "y": 2}, + {"matrix": [5, 5], "x": 13.75, "y": 2}, + {"matrix": [4, 6], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 6], "x": 17.3, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + + {"matrix": [6, 3], "x": 9.25, "y": 3}, + {"matrix": [7, 3], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3}, + {"matrix": [7, 4], "x": 12.25, "y": 3}, + {"matrix": [6, 5], "x": 13.25, "y": 3}, + {"matrix": [7, 5], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [6, 6], "x": 16.3, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 2}, + {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 8.75, "y": 4, "w": 2.75}, + {"matrix": [8, 5], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.3, "y": 4.25}, + {"matrix": [7, 6], "x": 16.3, "y": 4.25}, + {"matrix": [6, 7], "x": 17.3, "y": 4.25} ] } } -- cgit v1.2.3