From 4871f651c5328cc8c16d1ec991f3e865094b24c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:45:43 +1000 Subject: Move remaining `LAYOUT_all`s to data driven (#20463) --- keyboards/dyz/selka40/info.json | 190 +++++++++++++++++++++------------------- keyboards/dyz/selka40/selka40.h | 58 ------------ 2 files changed, 99 insertions(+), 149 deletions(-) delete mode 100644 keyboards/dyz/selka40/selka40.h (limited to 'keyboards/dyz/selka40') diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json index d60240f9dd..8fe32e5071 100644 --- a/keyboards/dyz/selka40/info.json +++ b/keyboards/dyz/selka40/info.json @@ -50,107 +50,115 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0.5, "y":0}, - {"label":"Q", "x":1.5, "y":0}, - {"label":"W", "x":2.5, "y":0}, - {"label":"E", "x":3.5, "y":0}, - {"label":"R", "x":4.5, "y":0}, - {"label":"T", "x":5.5, "y":0}, - {"label":"Y", "x":7.5, "y":0}, - {"label":"U", "x":8.5, "y":0}, - {"label":"I", "x":9.5, "y":0}, - {"label":"O", "x":10.5, "y":0}, - {"label":"P", "x":11.5, "y":0}, - {"label":"{", "x":12.5, "y":0}, - {"label":"}", "x":13.5, "y":0}, + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"label":"Tab", "x":0.25, "y":1, "w":1.25}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":"\"", "x":12, "y":1}, - {"label":"Enter", "x":13, "y":1, "w":1.75}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"B", "x":7.75, "y":2}, - {"label":"N", "x":8.75, "y":2}, - {"label":"M", "x":9.75, "y":2}, - {"label":"<", "x":10.75, "y":2}, - {"label":">", "x":11.75, "y":2}, - {"label":"?", "x":12.75, "y":2}, - {"label":"Shift", "x":13.75, "y":2, "w":1.25}, + {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25}, + {"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}, - {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, - {"label":"Win", "x":1.5, "y":3}, - {"label":"Alt", "x":3.75, "y":3}, - {"label":"Space", "x":4.75, "y":3, "w":2}, - {"label":"Space", "x":7.75, "y":3, "w":2.25}, - {"label":"Fn", "x":10, "y":3}, - {"label":"Fn2", "x":12.5, "y":3}, - {"label":"Ctrl", "x":13.5, "y":3, "w":1.25} + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1, "w": 1.75}, + + {"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": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, + + {"matrix": [3, 6], "x": 7.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3}, + {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.25} ] }, "LAYOUT_2u_bs": { "layout": [ - {"label":"Esc", "x":0.5, "y":0}, - {"label":"Q", "x":1.5, "y":0}, - {"label":"W", "x":2.5, "y":0}, - {"label":"E", "x":3.5, "y":0}, - {"label":"R", "x":4.5, "y":0}, - {"label":"T", "x":5.5, "y":0}, - {"label":"Y", "x":7.5, "y":0}, - {"label":"U", "x":8.5, "y":0}, - {"label":"I", "x":9.5, "y":0}, - {"label":"O", "x":10.5, "y":0}, - {"label":"P", "x":11.5, "y":0}, - {"label":"Backspace", "x":12.5, "y":0, "w":2}, + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25}, + {"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": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1, "w": 1.75}, + + {"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}, - {"label":"Tab", "x":0.25, "y":1, "w":1.25}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":"\"", "x":12, "y":1}, - {"label":"Enter", "x":13, "y":1, "w":1.75}, + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 1.25}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"B", "x":7.75, "y":2}, - {"label":"N", "x":8.75, "y":2}, - {"label":"M", "x":9.75, "y":2}, - {"label":"<", "x":10.75, "y":2}, - {"label":">", "x":11.75, "y":2}, - {"label":"?", "x":12.75, "y":2}, - {"label":"Shift", "x":13.75, "y":2, "w":1.25}, + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, - {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, - {"label":"Win", "x":1.5, "y":3}, - {"label":"Alt", "x":3.75, "y":3}, - {"label":"Space", "x":4.75, "y":3, "w":2}, - {"label":"Space", "x":7.75, "y":3, "w":2.25}, - {"label":"Fn", "x":10, "y":3}, - {"label":"Fn2", "x":12.5, "y":3}, - {"label":"Ctrl", "x":13.5, "y":3, "w":1.25} + {"matrix": [3, 6], "x": 7.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3}, + {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/dyz/selka40/selka40.h b/keyboards/dyz/selka40/selka40.h deleted file mode 100644 index ddff79f9f9..0000000000 --- a/keyboards/dyz/selka40/selka40.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2021 dayatz - * - * 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 - -/* - * ┌───────┐ - * │0B │ 2u Backspace - * └───────┘ - * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │ │06 │07 │08 │09 │0A │0B │0C │ - * ┌┴───┼───┼───┼───┼───┼───┤ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐ - * │10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │ - * ┌┴────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ┌┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬───┴┐ - * │20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │ - * └┬────┬┴──┬┴───┼───┼───┴───┤ ├───┴───┴┬──┴┬──┴──┬┴──┬┴───┬┘ - * │30 │31 │ │34 │35 │ │36 │37 │ │3B │3C │ - * └────┴───┘ └───┴───────┘ └────────┴───┘ └───┴────┘ - */ - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K34, K35, K36, K37, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, _X_, _X_, K34, K35, K36, K37, _X_, _X_, _X_, K3B, K3C } \ -} - -#define LAYOUT_2u_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K34, K35, K36, K37, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, _X_ }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, _X_, _X_, K34, K35, K36, K37, _X_, _X_, _X_, K3B, K3C } \ -} -- cgit v1.2.3