From 09a2b70a661323aa7ea023341bb1e9dcd3c75e24 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:50:56 +1000 Subject: Move Alice and Ergodox layouts to data driven (#20340) --- keyboards/kapcave/arya/arya.c | 17 ----- keyboards/kapcave/arya/arya.h | 38 ----------- keyboards/kapcave/arya/info.json | 136 ++++++++++++++++++++------------------- 3 files changed, 70 insertions(+), 121 deletions(-) delete mode 100644 keyboards/kapcave/arya/arya.c delete mode 100644 keyboards/kapcave/arya/arya.h (limited to 'keyboards/kapcave/arya') diff --git a/keyboards/kapcave/arya/arya.c b/keyboards/kapcave/arya/arya.c deleted file mode 100644 index 13cae06189..0000000000 --- a/keyboards/kapcave/arya/arya.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 KapCave - -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 . -*/ -#include "arya.h" diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h deleted file mode 100644 index 38e4afaf05..0000000000 --- a/keyboards/kapcave/arya/arya.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 KapCave - -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_alice_split_bs( \ - K81, K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ - K80, K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ - K82, K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ - K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \ - K30, K40, K50, K60, K00, K10, K20 \ -) \ -{ \ - { K00 , K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \ - { K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \ - { K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \ - { K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \ - { K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \ - { K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \ - { K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \ - { KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \ - { K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \ -} diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json index 1bd9c188dd..0bfc8cec3f 100644 --- a/keyboards/kapcave/arya/info.json +++ b/keyboards/kapcave/arya/info.json @@ -26,76 +26,80 @@ "layouts": { "LAYOUT_alice_split_bs": { "layout": [ - {"x":0.4, "y":0}, - {"x":1.55, "y":0.1}, - {"x":2.55, "y":0.1}, - {"x":3.55, "y":0}, - {"x":4.55, "y":0.1}, - {"x":5.55, "y":0.1}, - {"x":6.55, "y":0.1}, - {"x":7.55, "y":0.1}, - {"x":9.75, "y":0.1}, - {"x":10.75, "y":0.1}, - {"x":11.75, "y":0.1}, - {"x":12.75, "y":0.1}, - {"x":13.75, "y":0}, - {"x":14.75, "y":0.1}, - {"x":15.75, "y":0.1}, - {"x":16.75, "y":0.1}, + {"matrix": [8, 1], "x": 0.4, "y": 0}, + {"matrix": [3, 6], "x": 1.55, "y": 0.1}, + {"matrix": [3, 7], "x": 2.55, "y": 0.1}, + {"matrix": [4, 6], "x": 3.55, "y": 0}, + {"matrix": [4, 7], "x": 4.55, "y": 0.1}, + {"matrix": [5, 6], "x": 5.55, "y": 0.1}, + {"matrix": [5, 7], "x": 6.55, "y": 0.1}, + {"matrix": [6, 6], "x": 7.55, "y": 0.1}, - {"x":0.2, "y":1}, - {"x":1.35, "y":1.1, "w":1.5}, - {"x":2.85, "y":1.1}, - {"x":3.85, "y":1.1}, - {"x":4.85, "y":1.1}, - {"x":5.85, "y":1.1}, - {"x":6.85, "y":1.1}, - {"x":9.45, "y":1.1}, - {"x":10.45, "y":1.1}, - {"x":11.45, "y":1.1}, - {"x":12.45, "y":1.1}, - {"x":13.45, "y":1.1}, - {"x":14.45, "y":1.1}, - {"x":15.45, "y":1.1}, - {"x":16.45, "y":1.1, "w":1.5}, + {"matrix": [6, 7], "x": 9.75, "y": 0.1}, + {"matrix": [7, 6], "x": 10.75, "y": 0.1}, + {"matrix": [7, 7], "x": 11.75, "y": 0.1}, + {"matrix": [0, 6], "x": 12.75, "y": 0.1}, + {"matrix": [0, 7], "x": 13.75, "y": 0}, + {"matrix": [1, 7], "x": 14.75, "y": 0.1}, + {"matrix": [2, 6], "x": 15.75, "y": 0.1}, + {"matrix": [2, 7], "x": 16.75, "y": 0.1}, - {"x":0, "y":2}, - {"x":1.15, "y":2.1, "w":1.75}, - {"x":2.9, "y":2.1}, - {"x":3.9, "y":2.1}, - {"x":4.9, "y":2.1}, - {"x":5.9, "y":2.1}, - {"x":6.9, "y":2.1}, - {"x":9.9, "y":2.1}, - {"x":10.9, "y":2.1}, - {"x":11.9, "y":2.1}, - {"x":12.9, "y":2.1}, - {"x":13.9, "y":2.1}, - {"x":14.9, "y":2.1}, - {"x":15.9, "y":2.1, "w":2.25}, + {"matrix": [8, 0], "x": 0.2, "y": 1}, + {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5}, + {"matrix": [3, 5], "x": 2.85, "y": 1.1}, + {"matrix": [4, 4], "x": 3.85, "y": 1.1}, + {"matrix": [4, 5], "x": 4.85, "y": 1.1}, + {"matrix": [5, 4], "x": 5.85, "y": 1.1}, + {"matrix": [5, 5], "x": 6.85, "y": 1.1}, - {"x":0.95, "y":3.1, "w":2.25}, - {"x":3.2, "y":3.1}, - {"x":4.2, "y":3.1}, - {"x":5.2, "y":3.1}, - {"x":6.2, "y":3.1}, - {"x":7.2, "y":3.1}, - {"x":9.6, "y":3.1}, - {"x":10.6, "y":3.1}, - {"x":11.6, "y":3.1}, - {"x":12.6, "y":3.1}, - {"x":13.6, "y":3.1}, - {"x":14.6, "y":3.1}, - {"x":15.6, "y":3.1, "w":1.75}, - {"x":17.35, "y":3.1}, + {"matrix": [6, 4], "x": 9.45, "y": 1.1}, + {"matrix": [6, 5], "x": 10.45, "y": 1.1}, + {"matrix": [7, 5], "x": 11.45, "y": 1.1}, + {"matrix": [0, 5], "x": 12.45, "y": 1.1}, + {"matrix": [1, 5], "x": 13.45, "y": 1.1}, + {"matrix": [1, 6], "x": 14.45, "y": 1.1}, + {"matrix": [2, 5], "x": 15.45, "y": 1.1}, + {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5}, - {"x":0.95, "y":4.1, "w":1.5}, - {"x":3.85, "y":4.1, "w":1.5}, - {"x":5.35, "y":4.1, "w":2}, - {"x":7.35, "y":4.1, "w":1.25}, - {"x":9.6, "y":4.1, "w":2.75}, - {"x":12.35, "y":4.1, "w":1.5}, - {"x":16.65, "y":4.1, "w":1.5} + {"matrix": [8, 2], "x": 0, "y": 2}, + {"matrix": [3, 2], "x": 1.15, "y": 2.1, "w": 1.75}, + {"matrix": [3, 3], "x": 2.9, "y": 2.1}, + {"matrix": [4, 3], "x": 3.9, "y": 2.1}, + {"matrix": [5, 2], "x": 4.9, "y": 2.1}, + {"matrix": [5, 3], "x": 5.9, "y": 2.1}, + {"matrix": [6, 3], "x": 6.9, "y": 2.1}, + + {"matrix": [7, 3], "x": 9.9, "y": 2.1}, + {"matrix": [7, 4], "x": 10.9, "y": 2.1}, + {"matrix": [0, 3], "x": 11.9, "y": 2.1}, + {"matrix": [0, 4], "x": 12.9, "y": 2.1}, + {"matrix": [1, 3], "x": 13.9, "y": 2.1}, + {"matrix": [1, 4], "x": 14.9, "y": 2.1}, + {"matrix": [2, 3], "x": 15.9, "y": 2.1, "w": 2.25}, + + {"matrix": [3, 1], "x": 0.95, "y": 3.1, "w": 2.25}, + {"matrix": [4, 1], "x": 3.2, "y": 3.1}, + {"matrix": [4, 2], "x": 4.2, "y": 3.1}, + {"matrix": [5, 1], "x": 5.2, "y": 3.1}, + {"matrix": [6, 1], "x": 6.2, "y": 3.1}, + {"matrix": [6, 2], "x": 7.2, "y": 3.1}, + + {"matrix": [7, 1], "x": 9.6, "y": 3.1}, + {"matrix": [7, 2], "x": 10.6, "y": 3.1}, + {"matrix": [0, 1], "x": 11.6, "y": 3.1}, + {"matrix": [0, 2], "x": 12.6, "y": 3.1}, + {"matrix": [1, 1], "x": 13.6, "y": 3.1}, + {"matrix": [1, 2], "x": 14.6, "y": 3.1}, + {"matrix": [2, 1], "x": 15.6, "y": 3.1, "w": 1.75}, + {"matrix": [2, 2], "x": 17.35, "y": 3.1}, + + {"matrix": [3, 0], "x": 0.95, "y": 4.1, "w": 1.5}, + {"matrix": [4, 0], "x": 3.85, "y": 4.1, "w": 1.5}, + {"matrix": [5, 0], "x": 5.35, "y": 4.1, "w": 2}, + {"matrix": [6, 0], "x": 7.35, "y": 4.1, "w": 1.25}, + {"matrix": [0, 0], "x": 9.6, "y": 4.1, "w": 2.75}, + {"matrix": [1, 0], "x": 12.35, "y": 4.1, "w": 1.5}, + {"matrix": [2, 0], "x": 16.65, "y": 4.1, "w": 1.5} ] } } -- cgit v1.2.3