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/clawsome/hatchback/hatchback.h | 43 ------ keyboards/clawsome/hatchback/info.json | 191 +++++++++++++------------ keyboards/clawsome/roadster/info.json | 91 ++++++------ keyboards/clawsome/roadster/roadster.h | 30 ---- keyboards/clawsome/suv/info.json | 230 +++++++++++++++++-------------- keyboards/clawsome/suv/suv.h | 41 ------ 6 files changed, 273 insertions(+), 353 deletions(-) delete mode 100644 keyboards/clawsome/hatchback/hatchback.h delete mode 100644 keyboards/clawsome/roadster/roadster.h delete mode 100644 keyboards/clawsome/suv/suv.h (limited to 'keyboards/clawsome') diff --git a/keyboards/clawsome/hatchback/hatchback.h b/keyboards/clawsome/hatchback/hatchback.h deleted file mode 100644 index b55f6adc28..0000000000 --- a/keyboards/clawsome/hatchback/hatchback.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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( \ - K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K18, K09, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K38, K29, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K58, K49, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K96, K98, \ - KA0, KB0, KA1, KA2, KA3, KA4, KA5, KB5, KA6, KB6, KA7, KB8, KA9 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, KC_NO, K09 }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, KC_NO, K18, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, KC_NO, K29 }, \ - { K30, K31, K32, K33, K34, K35, K36, KC_NO, K38, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, KC_NO, K49 }, \ - { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, KC_NO, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K90, K91, K92, K93, K94, KC_NO, K96, KC_NO, K98, KC_NO }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KC_NO, KA9 }, \ - { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KC_NO, KB8, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/info.json index 79af5d5279..90d1ad6ee2 100644 --- a/keyboards/clawsome/hatchback/info.json +++ b/keyboards/clawsome/hatchback/info.json @@ -18,95 +18,108 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0,F4)", "x":0, "y":0}, - {"label":"K01 (B0,F5)", "x":2, "y":0}, - {"label":"K11 (B6,F5)", "x":3, "y":0}, - {"label":"K02 (B0,F6)", "x":4, "y":0}, - {"label":"K12 (B6,F6)", "x":5, "y":0}, - {"label":"K03 (B0,F7)", "x":6.5, "y":0}, - {"label":"K13 (B6,F7)", "x":7.5, "y":0}, - {"label":"K04 (B0,B1)", "x":8.5, "y":0}, - {"label":"K14 (B6,B1)", "x":9.5, "y":0}, - {"label":"K05 (B0,B3)", "x":11, "y":0}, - {"label":"K15 (B6,B3)", "x":12, "y":0}, - {"label":"K06 (B0,B2)", "x":13, "y":0}, - {"label":"K16 (B6,B2)", "x":14, "y":0}, - {"label":"K07 (B0,D5)", "x":15.25, "y":0}, - {"label":"K18 (B6,C7)", "x":16.25, "y":0}, - {"label":"K09 (B0,F1)", "x":17.25, "y":0}, - {"label":"K20 (D4,F4)", "x":0, "y":1.5}, - {"label":"K30 (B4,F4)", "x":1, "y":1.5}, - {"label":"K21 (D4,F5)", "x":2, "y":1.5}, - {"label":"K31 (B4,F5)", "x":3, "y":1.5}, - {"label":"K22 (D4,F6)", "x":4, "y":1.5}, - {"label":"K32 (B4,F6)", "x":5, "y":1.5}, - {"label":"K23 (D4,F7)", "x":6, "y":1.5}, - {"label":"K33 (B4,F7)", "x":7, "y":1.5}, - {"label":"K24 (D4,B1)", "x":8, "y":1.5}, - {"label":"K34 (B4,B1)", "x":9, "y":1.5}, - {"label":"K25 (D4,B3)", "x":10, "y":1.5}, - {"label":"K35 (B4,B3)", "x":11, "y":1.5}, - {"label":"K26 (D4,B2)", "x":12, "y":1.5}, - {"label":"K36 (B4,B2)", "x":13, "y":1.5, "w":2}, - {"label":"K27 (D4,D5)", "x":15.25, "y":1.5}, - {"label":"K38 (B4,C7)", "x":16.25, "y":1.5}, - {"label":"K29 (D4,F1)", "x":17.25, "y":1.5}, - {"label":"K40 (D0,F4)", "x":0, "y":2.5, "w":1.5}, - {"label":"K50 (B5,F4)", "x":1.5, "y":2.5}, - {"label":"K41 (D0,F5)", "x":2.5, "y":2.5}, - {"label":"K51 (B5,F5)", "x":3.5, "y":2.5}, - {"label":"K42 (D0,F6)", "x":4.5, "y":2.5}, - {"label":"K52 (B5,F6)", "x":5.5, "y":2.5}, - {"label":"K43 (D0,F7)", "x":6.5, "y":2.5}, - {"label":"K53 (B5,F7)", "x":7.5, "y":2.5}, - {"label":"K44 (D0,B1)", "x":8.5, "y":2.5}, - {"label":"K54 (B5,B1)", "x":9.5, "y":2.5}, - {"label":"K45 (D0,B3)", "x":10.5, "y":2.5}, - {"label":"K55 (B5,B3)", "x":11.5, "y":2.5}, - {"label":"K46 (D0,B2)", "x":12.5, "y":2.5}, - {"label":"K56 (B5,B2)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K47 (D0,D5)", "x":15.25, "y":2.5}, - {"label":"K58 (B5,C7)", "x":16.25, "y":2.5}, - {"label":"K49 (D0,F1)", "x":17.25, "y":2.5}, - {"label":"K60 (D1,F4)", "x":0, "y":3.5, "w":1.75}, - {"label":"K70 (E6,F4)", "x":1.75, "y":3.5}, - {"label":"K61 (D1,F5)", "x":2.75, "y":3.5}, - {"label":"K71 (E6,F5)", "x":3.75, "y":3.5}, - {"label":"K62 (D1,F6)", "x":4.75, "y":3.5}, - {"label":"K72 (E6,F6)", "x":5.75, "y":3.5}, - {"label":"K63 (D1,F7)", "x":6.75, "y":3.5}, - {"label":"K73 (E6,F7)", "x":7.75, "y":3.5}, - {"label":"K64 (D1,B1)", "x":8.75, "y":3.5}, - {"label":"K74 (E6,B1)", "x":9.75, "y":3.5}, - {"label":"K65 (D1,B3)", "x":10.75, "y":3.5}, - {"label":"K75 (E6,B3)", "x":11.75, "y":3.5}, - {"label":"K76 (E6,B2)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K80 (D2,F4)", "x":0, "y":4.5, "w":2.25}, - {"label":"K90 (D7,F4)", "x":2.25, "y":4.5}, - {"label":"K81 (D2,F5)", "x":3.25, "y":4.5}, - {"label":"K91 (D7,F5)", "x":4.25, "y":4.5}, - {"label":"K82 (D2,F6)", "x":5.25, "y":4.5}, - {"label":"K92 (D7,F6)", "x":6.25, "y":4.5}, - {"label":"K83 (D2,F7)", "x":7.25, "y":4.5}, - {"label":"K93 (D7,F7)", "x":8.25, "y":4.5}, - {"label":"K84 (D2,B1)", "x":9.25, "y":4.5}, - {"label":"K94 (D7,B1)", "x":10.25, "y":4.5}, - {"label":"K85 (D2,B3)", "x":11.25, "y":4.5}, - {"label":"K96 (D7,B2)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K98 (D7,C7)", "x":16.25, "y":4.5}, - {"label":"KA0 (D3,F4)", "x":0, "y":5.5, "w":1.25}, - {"label":"KB0 (C6,F4)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"KA1 (D3,F5)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"KA2 (D3,F6)", "x":3.75, "y":5.5, "w":2.25}, - {"label":"KA3 (D3,F7)", "x":6, "y":5.5, "w":1.75}, - {"label":"KA4 (D3,B1)", "x":7.75, "y":5.5, "w":2.25}, - {"label":"KA5 (D3,B3)", "x":10, "y":5.5, "w":1.25}, - {"label":"KB5 (C6,B3)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"KA6 (D3,B2)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"KB6 (C6,B2)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KA7 (D3,D5)", "x":15.25, "y":5.5}, - {"label":"KB8 (C6,C7)", "x":16.25, "y":5.5}, - {"label":"KA9 (D3,F1)", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [1, 5], "x": 12, "y": 0}, + {"matrix": [0, 6], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [0, 7], "x": 15.25, "y": 0}, + {"matrix": [1, 8], "x": 16.25, "y": 0}, + {"matrix": [0, 9], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 7], "x": 15.25, "y": 1.5}, + {"matrix": [3, 8], "x": 16.25, "y": 1.5}, + {"matrix": [2, 9], "x": 17.25, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.25, "y": 2.5}, + {"matrix": [5, 8], "x": 16.25, "y": 2.5}, + {"matrix": [4, 9], "x": 17.25, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4.5}, + {"matrix": [9, 1], "x": 4.25, "y": 4.5}, + {"matrix": [8, 2], "x": 5.25, "y": 4.5}, + {"matrix": [9, 2], "x": 6.25, "y": 4.5}, + {"matrix": [8, 3], "x": 7.25, "y": 4.5}, + {"matrix": [9, 3], "x": 8.25, "y": 4.5}, + {"matrix": [8, 4], "x": 9.25, "y": 4.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4.5}, + {"matrix": [8, 5], "x": 11.25, "y": 4.5}, + {"matrix": [9, 6], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 8], "x": 16.25, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 2], "x": 3.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 3], "x": 6, "y": 5.5, "w": 1.75}, + {"matrix": [10, 4], "x": 7.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + {"matrix": [11, 8], "x": 16.25, "y": 5.5}, + {"matrix": [10, 9], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/clawsome/roadster/info.json b/keyboards/clawsome/roadster/info.json index 69ecaee368..2e5bc24484 100644 --- a/keyboards/clawsome/roadster/info.json +++ b/keyboards/clawsome/roadster/info.json @@ -18,50 +18,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D2,D4)", "x":0, "y":0}, - {"label":"K01 (D2,C6)", "x":1, "y":0}, - {"label":"K02 (D2,D7)", "x":2, "y":0}, - {"label":"K03 (D2,E6)", "x":3, "y":0}, - {"label":"K04 (D2,B4)", "x":4, "y":0}, - {"label":"K05 (D2,B5)", "x":5, "y":0}, - {"label":"K06 (D2,B6)", "x":6, "y":0}, - {"label":"K07 (D2,B2)", "x":7, "y":0}, - {"label":"K08 (D2,B3)", "x":8, "y":0}, - {"label":"K09 (D2,B1)", "x":9, "y":0}, - {"label":"K0A (D2,F7)", "x":10, "y":0}, - {"label":"K0B (D2,F6)", "x":11, "y":0}, - {"label":"K10 (D3,D4)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D3,C6)", "x":1.5, "y":1}, - {"label":"K12 (D3,D7)", "x":2.5, "y":1}, - {"label":"K13 (D3,E6)", "x":3.5, "y":1}, - {"label":"K14 (D3,B4)", "x":4.5, "y":1}, - {"label":"K15 (D3,B5)", "x":5.5, "y":1}, - {"label":"K16 (D3,B6)", "x":6.5, "y":1}, - {"label":"K17 (D3,B2)", "x":7.5, "y":1}, - {"label":"K18 (D3,B3)", "x":8.5, "y":1}, - {"label":"K19 (D3,B1)", "x":9.5, "y":1}, - {"label":"K1B (D3,F6)", "x":10.5, "y":1, "w":1.5}, - {"label":"K20 (D0,D4)", "x":0, "y":2}, - {"label":"K21 (D0,C6)", "x":1, "y":2}, - {"label":"K22 (D0,D7)", "x":2, "y":2}, - {"label":"K23 (D0,E6)", "x":3, "y":2}, - {"label":"K24 (D0,B4)", "x":4, "y":2}, - {"label":"K25 (D0,B5)", "x":5, "y":2}, - {"label":"K26 (D0,B6)", "x":6, "y":2}, - {"label":"K27 (D0,B2)", "x":7, "y":2}, - {"label":"K28 (D0,B3)", "x":8, "y":2}, - {"label":"K29 (D0,B1)", "x":9, "y":2}, - {"label":"K2A (D0,F7)", "x":10, "y":2}, - {"label":"K2B (D0,F6)", "x":11, "y":2}, - {"label":"K30 (D1,D4)", "x":0, "y":3}, - {"label":"K31 (D1,C6)", "x":1, "y":3}, - {"label":"K32 (D1,D7)", "x":2, "y":3}, - {"label":"K34 (D1,B4)", "x":3, "y":3, "w":2}, - {"label":"K36 (D1,B6)", "x":5, "y":3, "w":2}, - {"label":"K38 (D1,B3)", "x":7, "y":3, "w":2}, - {"label":"K39 (D1,B1)", "x":9, "y":3}, - {"label":"K3A (D1,F7)", "x":10, "y":3}, - {"label":"K3B (D1,F6)", "x":11, "y":3} + {"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": [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, 11], "x": 10.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 7, "y": 3, "w": 2}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/clawsome/roadster/roadster.h b/keyboards/clawsome/roadster/roadster.h deleted file mode 100644 index a306085173..0000000000 --- a/keyboards/clawsome/roadster/roadster.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 AAClawson (AlisGraveNil) - * - * 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 LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K34, K36, K38, K39, K3A, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, K32, KC_NO, K34, KC_NO, K36, KC_NO, K38, K39, K3A, K3B }, \ -} diff --git a/keyboards/clawsome/suv/info.json b/keyboards/clawsome/suv/info.json index ddf951c9bb..2f0b2d6bfe 100644 --- a/keyboards/clawsome/suv/info.json +++ b/keyboards/clawsome/suv/info.json @@ -18,112 +18,130 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (F0,D3)", "x":0, "y":0}, - {"label":"K01 (F0,D2)", "x":2, "y":0}, - {"label":"K11 (B6,D2)", "x":3, "y":0}, - {"label":"K02 (F0,D1)", "x":4, "y":0}, - {"label":"K12 (B6,D1)", "x":5, "y":0}, - {"label":"K03 (F0,B4)", "x":6.5, "y":0}, - {"label":"K13 (B6,B4)", "x":7.5, "y":0}, - {"label":"K04 (F0,B5)", "x":8.5, "y":0}, - {"label":"K14 (B6,B5)", "x":9.5, "y":0}, - {"label":"K05 (F0,B7)", "x":11, "y":0}, - {"label":"K15 (B6,B7)", "x":12, "y":0}, - {"label":"K06 (F0,D5)", "x":13, "y":0}, - {"label":"K16 (B6,D5)", "x":14, "y":0}, - {"label":"K07 (F0,C7)", "x":15.25, "y":0}, - {"label":"K17 (B6,C7)", "x":16.25, "y":0}, - {"label":"K08 (F0,F1)", "x":17.25, "y":0}, - {"label":"K20 (D0,D3)", "x":0, "y":1.5}, - {"label":"K30 (F6,D3)", "x":1, "y":1.5}, - {"label":"K21 (D0,D2)", "x":2, "y":1.5}, - {"label":"K31 (F6,D2)", "x":3, "y":1.5}, - {"label":"K22 (D0,D1)", "x":4, "y":1.5}, - {"label":"K32 (F6,D1)", "x":5, "y":1.5}, - {"label":"K23 (D0,B4)", "x":6, "y":1.5}, - {"label":"K33 (F6,B4)", "x":7, "y":1.5}, - {"label":"K24 (D0,B5)", "x":8, "y":1.5}, - {"label":"K34 (F6,B5)", "x":9, "y":1.5}, - {"label":"K25 (D0,B7)", "x":10, "y":1.5}, - {"label":"K35 (F6,B7)", "x":11, "y":1.5}, - {"label":"K26 (D0,D5)", "x":12, "y":1.5}, - {"label":"K36 (F6,D5)", "x":13, "y":1.5, "w":2}, - {"label":"K27 (D0,C7)", "x":15.25, "y":1.5}, - {"label":"K37 (F6,C7)", "x":16.25, "y":1.5}, - {"label":"K28 (D0,F1)", "x":17.25, "y":1.5}, - {"label":"K38 (F6,F1)", "x":18.5, "y":1.5}, - {"label":"K29 (D0,F5)", "x":19.5, "y":1.5}, - {"label":"K39 (F6,F5)", "x":20.5, "y":1.5}, - {"label":"K2A (D0,F4)", "x":21.5, "y":1.5}, - {"label":"K40 (D4,D3)", "x":0, "y":2.5, "w":1.5}, - {"label":"K50 (F7,D3)", "x":1.5, "y":2.5}, - {"label":"K41 (D4,D2)", "x":2.5, "y":2.5}, - {"label":"K51 (F7,D2)", "x":3.5, "y":2.5}, - {"label":"K42 (D4,D1)", "x":4.5, "y":2.5}, - {"label":"K52 (F7,D1)", "x":5.5, "y":2.5}, - {"label":"K43 (D4,B4)", "x":6.5, "y":2.5}, - {"label":"K53 (F7,B4)", "x":7.5, "y":2.5}, - {"label":"K44 (D4,B5)", "x":8.5, "y":2.5}, - {"label":"K54 (F7,B5)", "x":9.5, "y":2.5}, - {"label":"K45 (D4,B7)", "x":10.5, "y":2.5}, - {"label":"K55 (F7,B7)", "x":11.5, "y":2.5}, - {"label":"K46 (D4,D5)", "x":12.5, "y":2.5}, - {"label":"K56 (F7,D5)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K47 (D4,C7)", "x":15.25, "y":2.5}, - {"label":"K57 (F7,C7)", "x":16.25, "y":2.5}, - {"label":"K48 (D4,F1)", "x":17.25, "y":2.5}, - {"label":"K58 (F7,F1)", "x":18.5, "y":2.5}, - {"label":"K49 (D4,F5)", "x":19.5, "y":2.5}, - {"label":"K59 (F7,F5)", "x":20.5, "y":2.5}, - {"label":"K4A (D4,F4)", "x":21.5, "y":2.5, "h":2}, - {"label":"K60 (B3,D3)", "x":0, "y":3.5, "w":1.75}, - {"label":"K70 (B1,D3)", "x":1.75, "y":3.5}, - {"label":"K61 (B3,D2)", "x":2.75, "y":3.5}, - {"label":"K71 (B1,D2)", "x":3.75, "y":3.5}, - {"label":"K62 (B3,D1)", "x":4.75, "y":3.5}, - {"label":"K72 (B1,D1)", "x":5.75, "y":3.5}, - {"label":"K63 (B3,B4)", "x":6.75, "y":3.5}, - {"label":"K73 (B1,B4)", "x":7.75, "y":3.5}, - {"label":"K64 (B3,B5)", "x":8.75, "y":3.5}, - {"label":"K74 (B1,B5)", "x":9.75, "y":3.5}, - {"label":"K65 (B3,B7)", "x":10.75, "y":3.5}, - {"label":"K75 (B1,B7)", "x":11.75, "y":3.5}, - {"label":"K76 (B1,D5)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K78 (B1,F1)", "x":18.5, "y":3.5}, - {"label":"K69 (B3,F5)", "x":19.5, "y":3.5}, - {"label":"K79 (B1,F5)", "x":20.5, "y":3.5}, - {"label":"K80 (B0,D3)", "x":0, "y":4.5, "w":2.25}, - {"label":"K90 (C6,D3)", "x":2.25, "y":4.5}, - {"label":"K81 (B0,D2)", "x":3.25, "y":4.5}, - {"label":"K91 (C6,D2)", "x":4.25, "y":4.5}, - {"label":"K82 (B0,D1)", "x":5.25, "y":4.5}, - {"label":"K92 (C6,D1)", "x":6.25, "y":4.5}, - {"label":"K83 (B0,B4)", "x":7.25, "y":4.5}, - {"label":"K93 (C6,B4)", "x":8.25, "y":4.5}, - {"label":"K84 (B0,B5)", "x":9.25, "y":4.5}, - {"label":"K94 (C6,B5)", "x":10.25, "y":4.5}, - {"label":"K85 (B0,B7)", "x":11.25, "y":4.5}, - {"label":"K96 (C6,D5)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K97 (C6,C7)", "x":16.25, "y":4.5}, - {"label":"K98 (C6,F1)", "x":18.5, "y":4.5}, - {"label":"K89 (B0,F5)", "x":19.5, "y":4.5}, - {"label":"K99 (C6,F5)", "x":20.5, "y":4.5}, - {"label":"K8A (B0,F4)", "x":21.5, "y":4.5, "h":2}, - {"label":"KA0 (B2,D3)", "x":0, "y":5.5, "w":1.25}, - {"label":"KB0 (D7,D3)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"KA1 (B2,D2)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"KA2 (B2,D1)", "x":3.75, "y":5.5, "w":2.25}, - {"label":"KA3 (B2,B4)", "x":6, "y":5.5, "w":1.75}, - {"label":"KA4 (B2,B5)", "x":7.75, "y":5.5, "w":2.25}, - {"label":"KA5 (B2,B7)", "x":10, "y":5.5, "w":1.25}, - {"label":"KB5 (D7,B7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"KA6 (B2,D5)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"KB6 (D7,D5)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KA7 (B2,C7)", "x":15.25, "y":5.5}, - {"label":"KB7 (D7,C7)", "x":16.25, "y":5.5}, - {"label":"KA8 (B2,F1)", "x":17.25, "y":5.5}, - {"label":"KB8 (D7,F1)", "x":18.5, "y":5.5, "w":2}, - {"label":"KB9 (D7,F5)", "x":20.5, "y":5.5} + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [1, 5], "x": 12, "y": 0}, + {"matrix": [0, 6], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [0, 7], "x": 15.25, "y": 0}, + {"matrix": [1, 7], "x": 16.25, "y": 0}, + {"matrix": [0, 8], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 7], "x": 15.25, "y": 1.5}, + {"matrix": [3, 7], "x": 16.25, "y": 1.5}, + {"matrix": [2, 8], "x": 17.25, "y": 1.5}, + + {"matrix": [3, 8], "x": 18.5, "y": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1.5}, + {"matrix": [3, 9], "x": 20.5, "y": 1.5}, + {"matrix": [2, 10], "x": 21.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.25, "y": 2.5}, + {"matrix": [5, 7], "x": 16.25, "y": 2.5}, + {"matrix": [4, 8], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 8], "x": 18.5, "y": 2.5}, + {"matrix": [4, 9], "x": 19.5, "y": 2.5}, + {"matrix": [5, 9], "x": 20.5, "y": 2.5}, + {"matrix": [4, 10], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [7, 8], "x": 18.5, "y": 3.5}, + {"matrix": [6, 9], "x": 19.5, "y": 3.5}, + {"matrix": [7, 9], "x": 20.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4.5}, + {"matrix": [9, 1], "x": 4.25, "y": 4.5}, + {"matrix": [8, 2], "x": 5.25, "y": 4.5}, + {"matrix": [9, 2], "x": 6.25, "y": 4.5}, + {"matrix": [8, 3], "x": 7.25, "y": 4.5}, + {"matrix": [9, 3], "x": 8.25, "y": 4.5}, + {"matrix": [8, 4], "x": 9.25, "y": 4.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4.5}, + {"matrix": [8, 5], "x": 11.25, "y": 4.5}, + {"matrix": [9, 6], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 7], "x": 16.25, "y": 4.5}, + + {"matrix": [9, 8], "x": 18.5, "y": 4.5}, + {"matrix": [8, 9], "x": 19.5, "y": 4.5}, + {"matrix": [9, 9], "x": 20.5, "y": 4.5}, + {"matrix": [8, 10], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 2], "x": 3.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 3], "x": 6, "y": 5.5, "w": 1.75}, + {"matrix": [10, 4], "x": 7.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5}, + {"matrix": [10, 8], "x": 17.25, "y": 5.5}, + + {"matrix": [11, 8], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [11, 9], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/clawsome/suv/suv.h b/keyboards/clawsome/suv/suv.h deleted file mode 100644 index 64ed0e7d0f..0000000000 --- a/keyboards/clawsome/suv/suv.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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 LAYOUT( \ - K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, K29, K39, K2A, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, K49, K59, K4A, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, K78, K69, K79, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K96, K97, K98, K89, K99, K8A, \ - KA0, KB0, KA1, KA2, KA3, KA4, KA5, KB5, KA6, KB6, KA7, KB7, KA8, KB8, KB9 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, KC_NO, KC_NO }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, K17, KC_NO, KC_NO, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO, K69, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO, K89, K8A }, \ - { K90, K91, K92, K93, K94, KC_NO, K96, K97, K98, K99, KC_NO }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KC_NO, KC_NO }, \ - { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KB7, KB8, KB9, KC_NO }, \ -} -- cgit v1.2.3