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/kopibeng/xt60_singa/info.json | 140 ++++++++++++++--------------- keyboards/kopibeng/xt60_singa/xt60_singa.h | 55 ------------ 2 files changed, 70 insertions(+), 125 deletions(-) delete mode 100644 keyboards/kopibeng/xt60_singa/xt60_singa.h (limited to 'keyboards/kopibeng/xt60_singa') diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json index d91224f9af..39ad108832 100644 --- a/keyboards/kopibeng/xt60_singa/info.json +++ b/keyboards/kopibeng/xt60_singa/info.json @@ -24,76 +24,76 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "0,0", "x": 0, "y": 0 }, - { "label": "0,1", "x": 1, "y": 0 }, - { "label": "0,2", "x": 2, "y": 0 }, - { "label": "0,3", "x": 3, "y": 0 }, - { "label": "0,4", "x": 4, "y": 0 }, - { "label": "0,5", "x": 5, "y": 0 }, - { "label": "0,6", "x": 6, "y": 0 }, - { "label": "0,7", "x": 7, "y": 0 }, - { "label": "0,8", "x": 8, "y": 0 }, - { "label": "0,9", "x": 9, "y": 0 }, - { "label": "0,A", "x": 10, "y": 0 }, - { "label": "0,B", "x": 11, "y": 0 }, - { "label": "0,C", "x": 12, "y": 0 }, - { "label": "0,D", "x": 13, "y": 0 }, - { "label": "1,D", "x": 14, "y": 0 }, - - { "label": "1,0", "w": 1.5, "x": 0, "y": 1 }, - { "label": "1,1", "x": 1.5, "y": 1 }, - { "label": "1,2", "x": 2.5, "y": 1 }, - { "label": "1,3", "x": 3.5, "y": 1 }, - { "label": "1,4", "x": 4.5, "y": 1 }, - { "label": "1,5", "x": 5.5, "y": 1 }, - { "label": "1,6", "x": 6.5, "y": 1 }, - { "label": "1,7", "x": 7.5, "y": 1 }, - { "label": "1,8", "x": 8.5, "y": 1 }, - { "label": "1,9", "x": 9.5, "y": 1 }, - { "label": "1,A", "x": 10.5, "y": 1 }, - { "label": "1,B", "x": 11.5, "y": 1 }, - { "label": "1,C", "x": 12.5, "y": 1 }, - { "label": "2,C", "w": 1.5, "x": 13.5, "y": 1 }, - - { "label": "2,0", "w": 1.75, "x": 0, "y": 2 }, - { "label": "2,1", "x": 1.75, "y": 2 }, - { "label": "2,2", "x": 2.75, "y": 2 }, - { "label": "2,3", "x": 3.75, "y": 2 }, - { "label": "2,4", "x": 4.75, "y": 2 }, - { "label": "2,5", "x": 5.75, "y": 2 }, - { "label": "2,6", "x": 6.75, "y": 2 }, - { "label": "2,7", "x": 7.75, "y": 2 }, - { "label": "2,8", "x": 8.75, "y": 2 }, - { "label": "2,9", "x": 9.75, "y": 2 }, - { "label": "2,A", "x": 10.75, "y": 2 }, - { "label": "2,B", "x": 11.75, "y": 2 }, - { "label": "2,D", "w": 2.25, "x": 12.75, "y": 2 }, - - { "label": "3,0", "w": 1.25, "x": 0, "y": 3 }, - { "label": "3,1", "x": 1.25, "y": 3 }, - { "label": "3,2", "x": 2.25, "y": 3 }, - { "label": "3,3", "x": 3.25, "y": 3 }, - { "label": "3,4", "x": 4.25, "y": 3 }, - { "label": "3,5", "x": 5.25, "y": 3 }, - { "label": "3,6", "x": 6.25, "y": 3 }, - { "label": "3,7", "x": 7.25, "y": 3 }, - { "label": "3,8", "x": 8.25, "y": 3 }, - { "label": "3,9", "x": 9.25, "y": 3 }, - { "label": "3,A", "x": 10.25, "y": 3 }, - { "label": "3,B", "x": 11.25, "y": 3 }, - { "label": "3,C", "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "3,D", "x": 14, "y": 3 }, - - { "label": "4,0", "w": 1.25, "x": 0, "y": 4 }, - { "label": "4,1", "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "4,2", "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "4,4", "w": 2.25, "x": 3.75, "y": 4 }, - { "label": "4,6", "w": 1.25, "x": 6, "y": 4 }, - { "label": "4,8", "w": 2.75, "x": 7.25, "y": 4 }, - { "label": "4,A", "w": 1.25, "x": 10, "y": 4 }, - { "label": "4,B", "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "4,C", "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "4,D", "w": 1.25, "x": 13.75, "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": [1, 13], "x": 14, "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": [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": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"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": [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, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/kopibeng/xt60_singa/xt60_singa.h b/keyboards/kopibeng/xt60_singa/xt60_singa.h deleted file mode 100644 index 0e4b4ea2aa..0000000000 --- a/keyboards/kopibeng/xt60_singa/xt60_singa.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │ │1D │ 2u Backspace - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C │ │ │ - * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter - * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │ - * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌─┴───┴────┤ - * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │3C │ 2.75u RShift - * └────────┘ ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤ └──────────┘ - * │40 │41 │42 │44 │46 │48 │4A │4B │4C │4D │ 2.25u/1.25u/2.75u Split Spacebar - * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘ - * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐ - * │40 │41 │42 │46 │4A │4B │4C │4D │ ANSI 6.25u - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ - * │40 │41 │42 │46 │4B │4C │4D │ 7u/WKL - * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ - */ - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ - {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D} \ -} -- cgit v1.2.3