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/db/db63/db63.h | 49 ------------------------------ keyboards/db/db63/info.json | 72 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 54 deletions(-) delete mode 100644 keyboards/db/db63/db63.h (limited to 'keyboards/db') diff --git a/keyboards/db/db63/db63.h b/keyboards/db/db63/db63.h deleted file mode 100644 index d9a4d1e6d2..0000000000 --- a/keyboards/db/db63/db63.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2020 Hung DO - -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 _x_ KC_NO - -/* 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. - * MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } - * MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 } - * - */ - -#define LAYOUT( \ - 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, \ - k30 , k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40 , k41 , k42 , k43 , k44, k45, k46, k47 , k48 \ -) { \ - { k00, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_ }, \ - { _x_, 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, k46 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3c, k3a, k47, _x_ }, \ - { k40, k41, k42, k43, k45, _x_, _x_, k44, _x_, _x_, _x_, k3b, _x_, k48 } \ -} - diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json index c32eca3baf..c8004a2bae 100644 --- a/keyboards/db/db63/info.json +++ b/keyboards/db/db63/info.json @@ -24,11 +24,73 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "~", "x": 0, "y": 0 }, { "label": "!", "x": 1, "y": 0 }, { "label": "@", "x": 2, "y": 0 }, { "label": "#", "x": 3, "y": 0 }, { "label": "$", "x": 4, "y": 0 }, { "label": "%", "x": 5, "y": 0 }, { "label": "^", "x": 6, "y": 0 }, { "label": "&", "x": 7, "y": 0 }, { "label": "*", "x": 8, "y": 0 }, { "label": "(", "x": 9, "y": 0 }, { "label": ")", "x": 10, "y": 0 }, { "label": "_", "x": 11, "y": 0 }, { "label": "+", "x": 12, "y": 0 }, { "label": "Backspace", "x": 13, "y": 0, "w": 2 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, { "label": "Q", "x": 1.5, "y": 1 }, { "label": "W", "x": 2.5, "y": 1 }, { "label": "E", "x": 3.5, "y": 1 }, { "label": "R", "x": 4.5, "y": 1 }, { "label": "T", "x": 5.5, "y": 1 }, { "label": "Y", "x": 6.5, "y": 1 }, { "label": "U", "x": 7.5, "y": 1 }, { "label": "I", "x": 8.5, "y": 1 }, { "label": "O", "x": 9.5, "y": 1 }, { "label": "P", "x": 10.5, "y": 1 }, { "label": "{", "x": 11.5, "y": 1 }, { "label": "}", "x": 12.5, "y": 1 }, { "label": "|", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Fn3", "x": 0, "y": 2, "w": 1.75 }, { "label": "A", "x": 1.75, "y": 2 }, { "label": "S", "x": 2.75, "y": 2 }, { "label": "D", "x": 3.75, "y": 2 }, { "label": "F", "x": 4.75, "y": 2 }, { "label": "G", "x": 5.75, "y": 2 }, { "label": "H", "x": 6.75, "y": 2 }, { "label": "J", "x": 7.75, "y": 2 }, { "label": "K", "x": 8.75, "y": 2 }, { "label": "L", "x": 9.75, "y": 2 }, { "label": ":", "x": 10.75, "y": 2 }, { "label": "\"", "x": 11.75, "y": 2 }, { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, { "label": "Z", "x": 2.25, "y": 3 }, { "label": "X", "x": 3.25, "y": 3 }, { "label": "C", "x": 4.25, "y": 3 }, { "label": "V", "x": 5.25, "y": 3 }, { "label": "B", "x": 6.25, "y": 3 }, { "label": "N", "x": 7.25, "y": 3 }, { "label": "M", "x": 8.25, "y": 3 }, { "label": "<", "x": 9.25, "y": 3 }, { "label": ">", "x": 10.25, "y": 3 }, { "label": "Shift", "x": 11.25, "y": 3, "w": 1.75 }, { "label": "Up", "x": 13, "y": 3 }, { "label": "Fn2", "x": 14, "y": 3 }, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 }, { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 }, { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 }, { "label": "?", "x": 10, "y": 4 }, { "label": "Fn1", "x": 11, "y": 4 }, { "label": "Left", "x": 12, "y": 4 }, { "label": "Down", "x": 13, "y": 4 }, { "label": "Right", "x": 14, "y": 4 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [1, 2], "x": 2, "y": 0}, + {"matrix": [1, 3], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [1, 5], "x": 5, "y": 0}, + {"matrix": [1, 6], "x": 6, "y": 0}, + {"matrix": [1, 7], "x": 7, "y": 0}, + {"matrix": [1, 8], "x": 8, "y": 0}, + {"matrix": [1, 9], "x": 9, "y": 0}, + {"matrix": [1, 10], "x": 10, "y": 0}, + {"matrix": [1, 11], "x": 11, "y": 0}, + {"matrix": [1, 12], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 1}, + {"matrix": [2, 2], "x": 2.5, "y": 1}, + {"matrix": [2, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 4], "x": 4.5, "y": 1}, + {"matrix": [2, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.5, "y": 1}, + {"matrix": [2, 7], "x": 7.5, "y": 1}, + {"matrix": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [2, 9], "x": 9.5, "y": 1}, + {"matrix": [2, 10], "x": 10.5, "y": 1}, + {"matrix": [2, 11], "x": 11.5, "y": 1}, + {"matrix": [2, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [3, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 3], "x": 3.75, "y": 2}, + {"matrix": [3, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 6], "x": 6.75, "y": 2}, + {"matrix": [3, 7], "x": 7.75, "y": 2}, + {"matrix": [3, 8], "x": 8.75, "y": 2}, + {"matrix": [3, 9], "x": 9.75, "y": 2}, + {"matrix": [3, 10], "x": 10.75, "y": 2}, + {"matrix": [3, 11], "x": 11.75, "y": 2}, + {"matrix": [3, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 3}, + {"matrix": [4, 2], "x": 3.25, "y": 3}, + {"matrix": [4, 3], "x": 4.25, "y": 3}, + {"matrix": [4, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [4, 6], "x": 7.25, "y": 3}, + {"matrix": [4, 7], "x": 8.25, "y": 3}, + {"matrix": [4, 8], "x": 9.25, "y": 3}, + {"matrix": [4, 9], "x": 10.25, "y": 3}, + {"matrix": [4, 11], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [5, 11], "x": 13, "y": 3}, + {"matrix": [4, 10], "x": 14, "y": 3}, + + {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [5, 7], "x": 10, "y": 4}, + {"matrix": [5, 4], "x": 11, "y": 4}, + {"matrix": [3, 13], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [5, 13], "x": 14, "y": 4} ] } } -- cgit v1.2.3