From 8bb4cba7b04571d75674f8f3f19462adef015060 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:53:45 +1000 Subject: Move TKL layouts to data driven (#20337) --- keyboards/ggkeyboards/genesis/hotswap/hotswap.h | 36 ----- keyboards/ggkeyboards/genesis/hotswap/info.json | 182 +++++++++++++----------- 2 files changed, 95 insertions(+), 123 deletions(-) delete mode 100644 keyboards/ggkeyboards/genesis/hotswap/hotswap.h (limited to 'keyboards/ggkeyboards/genesis/hotswap') diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h deleted file mode 100644 index 51dc2e91a1..0000000000 --- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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" - -// clang-format off -#define LAYOUT_tkl_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0F, K0G, K0H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, K3H, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, \ - K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5G, \ - K60, K61, K63, K66, K6A, K6B, K6C, K6D, K6F, K6G, K6H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, KC_NO, K0F, K0G, K0H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F, K3G, K3H }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, KC_NO, KC_NO, KC_NO, K5G, KC_NO }, \ - { K60, K61, KC_NO, K63, KC_NO, KC_NO, K66, KC_NO, KC_NO, KC_NO, K6A, K6B, K6C, K6D, KC_NO, K6F, K6G, K6H } \ -} diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json index 8963434bd9..72663cf6d2 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/info.json @@ -22,98 +22,106 @@ "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - {"label":"K00 (C5,F0)", "x":0, "y":0}, - {"label":"K01 (C5,F1)", "x":2, "y":0}, - {"label":"K02 (C5,F2)", "x":3, "y":0}, - {"label":"K03 (C5,F3)", "x":4, "y":0}, - {"label":"K04 (C5,F4)", "x":5, "y":0}, - {"label":"K05 (C5,F5)", "x":6.5, "y":0}, - {"label":"K06 (C5,F6)", "x":7.5, "y":0}, - {"label":"K07 (C5,F7)", "x":8.5, "y":0}, - {"label":"K08 (C5,A0)", "x":9.5, "y":0}, - {"label":"K09 (C5,A1)", "x":11, "y":0}, - {"label":"K0A (C5,A2)", "x":12, "y":0}, - {"label":"K0B (C5,A3)", "x":13, "y":0}, - {"label":"K0C (C5,A4)", "x":14, "y":0}, - {"label":"K0F (C5,A7)", "x":15.25, "y":0}, - {"label":"K0G (C5,C6)", "x":16.25, "y":0}, - {"label":"K0H (C5,C7)", "x":17.25, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"K20 (C4,F0)", "x":0, "y":1.5}, - {"label":"K21 (C4,F1)", "x":1, "y":1.5}, - {"label":"K22 (C4,F2)", "x":2, "y":1.5}, - {"label":"K23 (C4,F3)", "x":3, "y":1.5}, - {"label":"K24 (C4,F4)", "x":4, "y":1.5}, - {"label":"K25 (C4,F5)", "x":5, "y":1.5}, - {"label":"K26 (C4,F6)", "x":6, "y":1.5}, - {"label":"K27 (C4,F7)", "x":7, "y":1.5}, - {"label":"K28 (C4,A0)", "x":8, "y":1.5}, - {"label":"K29 (C4,A1)", "x":9, "y":1.5}, - {"label":"K2A (C4,A2)", "x":10, "y":1.5}, - {"label":"K2B (C4,A3)", "x":11, "y":1.5}, - {"label":"K2C (C4,A4)", "x":12, "y":1.5}, - {"label":"K2D (C4,A5)", "x":13, "y":1.5, "w":2}, - {"label":"K2F (C4,A7)", "x":15.25, "y":1.5}, - {"label":"K2G (C4,C6)", "x":16.25, "y":1.5}, - {"label":"K2H (C4,C7)", "x":17.25, "y":1.5}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, - {"label":"K30 (C3,F0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K31 (C3,F1)", "x":1.5, "y":2.5}, - {"label":"K32 (C3,F2)", "x":2.5, "y":2.5}, - {"label":"K33 (C3,F3)", "x":3.5, "y":2.5}, - {"label":"K34 (C3,F4)", "x":4.5, "y":2.5}, - {"label":"K35 (C3,F5)", "x":5.5, "y":2.5}, - {"label":"K36 (C3,F6)", "x":6.5, "y":2.5}, - {"label":"K37 (C3,F7)", "x":7.5, "y":2.5}, - {"label":"K38 (C3,A0)", "x":8.5, "y":2.5}, - {"label":"K39 (C3,A1)", "x":9.5, "y":2.5}, - {"label":"K3A (C3,A2)", "x":10.5, "y":2.5}, - {"label":"K3B (C3,A3)", "x":11.5, "y":2.5}, - {"label":"K3C (C3,A4)", "x":12.5, "y":2.5}, - {"label":"K3D (C3,A5)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K3F (C3,A7)", "x":15.25, "y":2.5}, - {"label":"K3G (C3,C6)", "x":16.25, "y":2.5}, - {"label":"K3H (C3,C7)", "x":17.25, "y":2.5}, + {"matrix": [0, 5], "x": 6.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}, - {"label":"K40 (C2,F0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K42 (C2,F2)", "x":1.75, "y":3.5}, - {"label":"K43 (C2,F3)", "x":2.75, "y":3.5}, - {"label":"K44 (C2,F4)", "x":3.75, "y":3.5}, - {"label":"K45 (C2,F5)", "x":4.75, "y":3.5}, - {"label":"K46 (C2,F6)", "x":5.75, "y":3.5}, - {"label":"K47 (C2,F7)", "x":6.75, "y":3.5}, - {"label":"K48 (C2,A0)", "x":7.75, "y":3.5}, - {"label":"K49 (C2,A1)", "x":8.75, "y":3.5}, - {"label":"K4A (C2,A2)", "x":9.75, "y":3.5}, - {"label":"K4B (C2,A3)", "x":10.75, "y":3.5}, - {"label":"K4C (C2,A4)", "x":11.75, "y":3.5}, - {"label":"K4D (C2,A5)", "x":12.75, "y":3.5, "w":2.25}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, - {"label":"K51 (C1,F1)", "x":0, "y":4.5, "w":2.25}, - {"label":"K52 (C1,F2)", "x":2.25, "y":4.5}, - {"label":"K53 (C1,F3)", "x":3.25, "y":4.5}, - {"label":"K54 (C1,F4)", "x":4.25, "y":4.5}, - {"label":"K55 (C1,F5)", "x":5.25, "y":4.5}, - {"label":"K56 (C1,F6)", "x":6.25, "y":4.5}, - {"label":"K57 (C1,F7)", "x":7.25, "y":4.5}, - {"label":"K58 (C1,A0)", "x":8.25, "y":4.5}, - {"label":"K59 (C1,A1)", "x":9.25, "y":4.5}, - {"label":"K5A (C1,A2)", "x":10.25, "y":4.5}, - {"label":"K5B (C1,A3)", "x":11.25, "y":4.5}, - {"label":"K5C (C1,A4)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K5G (C1,C6)", "x":16.25, "y":4.5}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, - {"label":"K60 (C0,F0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K61 (C0,F1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K63 (C0,F3)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K66 (C0,F6)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K6A (C0,A2)", "x":10, "y":5.5, "w":1.25}, - {"label":"K6B (C0,A3)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K6C (C0,A4)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K6D (C0,A5)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K6F (C0,A7)", "x":15.25, "y":5.5}, - {"label":"K6G (C0,C6)", "x":16.25, "y":5.5}, - {"label":"K6H (C0,C7)", "x":17.25, "y":5.5} + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.5}, + {"matrix": [1, 16], "x": 16.25, "y": 1.5}, + {"matrix": [1, 17], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.5}, + {"matrix": [2, 16], "x": 16.25, "y": 2.5}, + {"matrix": [2, 17], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.5}, + {"matrix": [3, 3], "x": 2.75, "y": 3.5}, + {"matrix": [3, 4], "x": 3.75, "y": 3.5}, + {"matrix": [3, 5], "x": 4.75, "y": 3.5}, + {"matrix": [3, 6], "x": 5.75, "y": 3.5}, + {"matrix": [3, 7], "x": 6.75, "y": 3.5}, + {"matrix": [3, 8], "x": 7.75, "y": 3.5}, + {"matrix": [3, 9], "x": 8.75, "y": 3.5}, + {"matrix": [3, 10], "x": 9.75, "y": 3.5}, + {"matrix": [3, 11], "x": 10.75, "y": 3.5}, + {"matrix": [3, 12], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.5}, + {"matrix": [5, 16], "x": 16.25, "y": 5.5}, + {"matrix": [5, 17], "x": 17.25, "y": 5.5} ] } } -- cgit v1.2.3