diff options
Diffstat (limited to 'keyboards')
98 files changed, 2642 insertions, 3794 deletions
diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json index b49357c686..cf90324c14 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/info.json | |||
| @@ -19,47 +19,47 @@ | |||
| 19 | "layouts": { | 19 | "layouts": { |
| 20 | "LAYOUT_split_3x5_2": { | 20 | "LAYOUT_split_3x5_2": { |
| 21 | "layout": [ | 21 | "layout": [ |
| 22 | {"x": 0, "y": 0.93}, | 22 | {"matrix": [0, 0], "x": 0, "y": 0.93}, |
| 23 | {"x": 1, "y": 0.31}, | 23 | {"matrix": [0, 1], "x": 1, "y": 0.31}, |
| 24 | {"x": 2, "y": 0}, | 24 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 25 | {"x": 3, "y": 0.28}, | 25 | {"matrix": [0, 3], "x": 3, "y": 0.28}, |
| 26 | {"x": 4, "y": 0.42}, | 26 | {"matrix": [0, 4], "x": 4, "y": 0.42}, |
| 27 | 27 | ||
| 28 | {"x": 7, "y": 0.42}, | 28 | {"matrix": [4, 4], "x": 7, "y": 0.42}, |
| 29 | {"x": 8, "y": 0.28}, | 29 | {"matrix": [4, 3], "x": 8, "y": 0.28}, |
| 30 | {"x": 9, "y": 0}, | 30 | {"matrix": [4, 2], "x": 9, "y": 0}, |
| 31 | {"x": 10, "y": 0.31}, | 31 | {"matrix": [4, 1], "x": 10, "y": 0.31}, |
| 32 | {"x": 11, "y": 0.93}, | 32 | {"matrix": [4, 0], "x": 11, "y": 0.93}, |
| 33 | 33 | ||
| 34 | {"x": 0, "y": 1.93}, | 34 | {"matrix": [1, 0], "x": 0, "y": 1.93}, |
| 35 | {"x": 1, "y": 1.31}, | 35 | {"matrix": [1, 1], "x": 1, "y": 1.31}, |
| 36 | {"x": 2, "y": 1}, | 36 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 37 | {"x": 3, "y": 1.28}, | 37 | {"matrix": [1, 3], "x": 3, "y": 1.28}, |
| 38 | {"x": 4, "y": 1.42}, | 38 | {"matrix": [1, 4], "x": 4, "y": 1.42}, |
| 39 | 39 | ||
| 40 | {"x": 7, "y": 1.42}, | 40 | {"matrix": [5, 4], "x": 7, "y": 1.42}, |
| 41 | {"x": 8, "y": 1.28}, | 41 | {"matrix": [5, 3], "x": 8, "y": 1.28}, |
| 42 | {"x": 9, "y": 1}, | 42 | {"matrix": [5, 2], "x": 9, "y": 1}, |
| 43 | {"x": 10, "y": 1.31}, | 43 | {"matrix": [5, 1], "x": 10, "y": 1.31}, |
| 44 | {"x": 11, "y": 1.93}, | 44 | {"matrix": [5, 0], "x": 11, "y": 1.93}, |
| 45 | 45 | ||
| 46 | {"x": 0, "y": 2.93}, | 46 | {"matrix": [2, 0], "x": 0, "y": 2.93}, |
| 47 | {"x": 1, "y": 2.31}, | 47 | {"matrix": [2, 1], "x": 1, "y": 2.31}, |
| 48 | {"x": 2, "y": 2}, | 48 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 49 | {"x": 3, "y": 2.28}, | 49 | {"matrix": [2, 3], "x": 3, "y": 2.28}, |
| 50 | {"x": 4, "y": 2.42}, | 50 | {"matrix": [2, 4], "x": 4, "y": 2.42}, |
| 51 | 51 | ||
| 52 | {"x": 7, "y": 2.42}, | 52 | {"matrix": [6, 4], "x": 7, "y": 2.42}, |
| 53 | {"x": 8, "y": 2.28}, | 53 | {"matrix": [6, 3], "x": 8, "y": 2.28}, |
| 54 | {"x": 9, "y": 2}, | 54 | {"matrix": [6, 2], "x": 9, "y": 2}, |
| 55 | {"x": 10, "y": 2.31}, | 55 | {"matrix": [6, 1], "x": 10, "y": 2.31}, |
| 56 | {"x": 11, "y": 2.93}, | 56 | {"matrix": [6, 0], "x": 11, "y": 2.93}, |
| 57 | 57 | ||
| 58 | {"x": 3.5, "y": 3.45}, | 58 | {"matrix": [3, 3], "x": 3.5, "y": 3.45}, |
| 59 | {"x": 4.5, "y": 3.7}, | 59 | {"matrix": [3, 4], "x": 4.5, "y": 3.7}, |
| 60 | 60 | ||
| 61 | {"x": 6.5, "y": 3.7}, | 61 | {"matrix": [7, 4], "x": 6.5, "y": 3.7}, |
| 62 | {"x": 7.5, "y": 3.45} | 62 | {"matrix": [7, 3], "x": 7.5, "y": 3.45} |
| 63 | ] | 63 | ] |
| 64 | } | 64 | } |
| 65 | } | 65 | } |
diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h deleted file mode 100644 index 115415bb5f..0000000000 --- a/keyboards/alt34/rev1/rev1.h +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2022 Tommy Alatalo <@altosys> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | #include "quantum.h" | ||
| 21 | |||
| 22 | #define ____ KC_NO | ||
| 23 | |||
| 24 | /* left hand right hand */ | ||
| 25 | #define LAYOUT_split_3x5_2(\ | ||
| 26 | K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ | ||
| 27 | K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ | ||
| 28 | K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ | ||
| 29 | K3_2, K3_3, K3_4, K3_5 )\ | ||
| 30 | /* matrix positions */\ | ||
| 31 | {\ | ||
| 32 | {K0_0, K0_1, K0_2, K0_3, K0_4},\ | ||
| 33 | {K1_0, K1_1, K1_2, K1_3, K1_4},\ | ||
| 34 | {K2_0, K2_1, K2_2, K2_3, K2_4},\ | ||
| 35 | {____, ____, ____, K3_2, K3_3},\ | ||
| 36 | \ | ||
| 37 | {K0_9, K0_8, K0_7, K0_6, K0_5},\ | ||
| 38 | {K1_9, K1_8, K1_7, K1_6, K1_5},\ | ||
| 39 | {K2_9, K2_8, K2_7, K2_6, K2_5},\ | ||
| 40 | {____, ____, ____, K3_5, K3_4} \ | ||
| 41 | } | ||
diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h deleted file mode 100644 index 7deb32d917..0000000000 --- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
| 3 | * | ||
| 4 | * This program is free software: you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation, either version 2 of the License, or | ||
| 7 | * (at your option) any later version. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | // clang-format off | ||
| 21 | #define LAYOUT_split_3x5_2( \ | ||
| 22 | k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ | ||
| 23 | k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ | ||
| 24 | k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ | ||
| 25 | k30, k32, k72, k70 \ | ||
| 26 | ) \ | ||
| 27 | { \ | ||
| 28 | { k00, k01, k02, k03, k04 }, \ | ||
| 29 | { k10, k11, k12, k13, k14 }, \ | ||
| 30 | { k20, k21, k22, k23, k24 }, \ | ||
| 31 | { k30, KC_NO, k32, KC_NO, KC_NO }, \ | ||
| 32 | { k40, k41, k42, k43, k44 }, \ | ||
| 33 | { k50, k51, k52, k53, k54 }, \ | ||
| 34 | { k60, k61, k62, k63, k64 }, \ | ||
| 35 | { k70, KC_NO, k72, KC_NO, KC_NO }, \ | ||
| 36 | } | ||
| 37 | // clang-format on | ||
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json index a758541149..bfd12e81d0 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/info.json | |||
| @@ -7,40 +7,47 @@ | |||
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_split_3x5_2": { | 8 | "LAYOUT_split_3x5_2": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | { "label": "L00", "x": 0, "y": 0 }, | 10 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 11 | { "label": "L01", "x": 1, "y": 0 }, | 11 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 12 | { "label": "L02", "x": 2, "y": 0 }, | 12 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 13 | { "label": "L03", "x": 3, "y": 0 }, | 13 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 14 | { "label": "L04", "x": 4, "y": 0 }, | 14 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 15 | { "label": "R00", "x": 11, "y": 0 }, | 15 | |
| 16 | { "label": "R01", "x": 12, "y": 0 }, | 16 | {"matrix": [4, 4], "x": 11, "y": 0}, |
| 17 | { "label": "R02", "x": 13, "y": 0 }, | 17 | {"matrix": [4, 3], "x": 12, "y": 0}, |
| 18 | { "label": "R03", "x": 14, "y": 0 }, | 18 | {"matrix": [4, 2], "x": 13, "y": 0}, |
| 19 | { "label": "R04", "x": 15, "y": 0 }, | 19 | {"matrix": [4, 1], "x": 14, "y": 0}, |
| 20 | { "label": "L10", "x": 0, "y": 1 }, | 20 | {"matrix": [4, 0], "x": 15, "y": 0}, |
| 21 | { "label": "L11", "x": 1, "y": 1 }, | 21 | |
| 22 | { "label": "L12", "x": 2, "y": 1 }, | 22 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 23 | { "label": "L13", "x": 3, "y": 1 }, | 23 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 24 | { "label": "L14", "x": 4, "y": 1 }, | 24 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 25 | { "label": "R10", "x": 11, "y": 1 }, | 25 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 26 | { "label": "R11", "x": 12, "y": 1 }, | 26 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 27 | { "label": "R12", "x": 13, "y": 1 }, | 27 | |
| 28 | { "label": "R13", "x": 14, "y": 1 }, | 28 | {"matrix": [5, 4], "x": 11, "y": 1}, |
| 29 | { "label": "R14", "x": 15, "y": 1 }, | 29 | {"matrix": [5, 3], "x": 12, "y": 1}, |
| 30 | { "label": "L20", "x": 0, "y": 2 }, | 30 | {"matrix": [5, 2], "x": 13, "y": 1}, |
| 31 | { "label": "L21", "x": 1, "y": 2 }, | 31 | {"matrix": [5, 1], "x": 14, "y": 1}, |
| 32 | { "label": "L22", "x": 2, "y": 2 }, | 32 | {"matrix": [5, 0], "x": 15, "y": 1}, |
| 33 | { "label": "L23", "x": 3, "y": 2 }, | 33 | |
| 34 | { "label": "L24", "x": 4, "y": 2 }, | 34 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 35 | { "label": "R20", "x": 11, "y": 2 }, | 35 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 36 | { "label": "R21", "x": 12, "y": 2 }, | 36 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 37 | { "label": "R22", "x": 13, "y": 2 }, | 37 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 38 | { "label": "R23", "x": 14, "y": 2 }, | 38 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 39 | { "label": "R24", "x": 15, "y": 2 }, | 39 | |
| 40 | { "label": "L30", "x": 4, "y": 3 }, | 40 | {"matrix": [6, 4], "x": 11, "y": 2}, |
| 41 | { "label": "L32", "x": 5, "y": 3 }, | 41 | {"matrix": [6, 3], "x": 12, "y": 2}, |
| 42 | { "label": "R32", "x": 10, "y": 3 }, | 42 | {"matrix": [6, 2], "x": 13, "y": 2}, |
| 43 | { "label": "R30", "x": 11, "y": 3 } | 43 | {"matrix": [6, 1], "x": 14, "y": 2}, |
| 44 | {"matrix": [6, 0], "x": 15, "y": 2}, | ||
| 45 | |||
| 46 | {"matrix": [3, 0], "x": 4, "y": 3}, | ||
| 47 | {"matrix": [3, 2], "x": 5, "y": 3}, | ||
| 48 | |||
| 49 | {"matrix": [7, 2], "x": 10, "y": 3}, | ||
| 50 | {"matrix": [7, 0], "x": 11, "y": 3} | ||
| 44 | ] | 51 | ] |
| 45 | } | 52 | } |
| 46 | } | 53 | } |
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 0b6c657fda..b9787f473e 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include "3x5_3.h" | 20 | #include "quantum.h" |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * LEDs index. | 23 | * LEDs index. |
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h deleted file mode 100644 index 566d5b81d2..0000000000 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
| 3 | * | ||
| 4 | * This program is free software: you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation, either version 2 of the License, or | ||
| 7 | * (at your option) any later version. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | #include "dilemma.h" | ||
| 21 | |||
| 22 | // clang-format off | ||
| 23 | #define LAYOUT_split_3x5_3( \ | ||
| 24 | k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ | ||
| 25 | k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ | ||
| 26 | k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ | ||
| 27 | k32, k30, k31, k71, k70, k72 \ | ||
| 28 | ) \ | ||
| 29 | { \ | ||
| 30 | { k00, k01, k02, k03, k04 }, \ | ||
| 31 | { k10, k11, k12, k13, k14 }, \ | ||
| 32 | { k20, k21, k22, k23, k24 }, \ | ||
| 33 | { k30, k31, k32, KC_NO, KC_NO }, \ | ||
| 34 | { k40, k41, k42, k43, k44 }, \ | ||
| 35 | { k50, k51, k52, k53, k54 }, \ | ||
| 36 | { k60, k61, k62, k63, k64 }, \ | ||
| 37 | { k70, k71, k72, KC_NO, KC_NO }, \ | ||
| 38 | } | ||
| 39 | // clang-format on | ||
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 3944f33a65..d9f0f15f2c 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json | |||
| @@ -21,42 +21,49 @@ | |||
| 21 | "layouts": { | 21 | "layouts": { |
| 22 | "LAYOUT_split_3x5_3": { | 22 | "LAYOUT_split_3x5_3": { |
| 23 | "layout": [ | 23 | "layout": [ |
| 24 | { "label": "L00", "x": 0, "y": 0 }, | 24 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 25 | { "label": "L01", "x": 1, "y": 0 }, | 25 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 26 | { "label": "L02", "x": 2, "y": 0 }, | 26 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 27 | { "label": "L03", "x": 3, "y": 0 }, | 27 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | { "label": "L04", "x": 4, "y": 0 }, | 28 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 29 | { "label": "R00", "x": 11, "y": 0 }, | 29 | |
| 30 | { "label": "R01", "x": 12, "y": 0 }, | 30 | {"matrix": [4, 4], "x": 11, "y": 0}, |
| 31 | { "label": "R02", "x": 13, "y": 0 }, | 31 | {"matrix": [4, 3], "x": 12, "y": 0}, |
| 32 | { "label": "R03", "x": 14, "y": 0 }, | 32 | {"matrix": [4, 2], "x": 13, "y": 0}, |
| 33 | { "label": "R04", "x": 15, "y": 0 }, | 33 | {"matrix": [4, 1], "x": 14, "y": 0}, |
| 34 | { "label": "L10", "x": 0, "y": 1 }, | 34 | {"matrix": [4, 0], "x": 15, "y": 0}, |
| 35 | { "label": "L11", "x": 1, "y": 1 }, | 35 | |
| 36 | { "label": "L12", "x": 2, "y": 1 }, | 36 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 37 | { "label": "L13", "x": 3, "y": 1 }, | 37 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 38 | { "label": "L14", "x": 4, "y": 1 }, | 38 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 39 | { "label": "R10", "x": 11, "y": 1 }, | 39 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 40 | { "label": "R11", "x": 12, "y": 1 }, | 40 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 41 | { "label": "R12", "x": 13, "y": 1 }, | 41 | |
| 42 | { "label": "R13", "x": 14, "y": 1 }, | 42 | {"matrix": [5, 4], "x": 11, "y": 1}, |
| 43 | { "label": "R14", "x": 15, "y": 1 }, | 43 | {"matrix": [5, 3], "x": 12, "y": 1}, |
| 44 | { "label": "L20", "x": 0, "y": 2 }, | 44 | {"matrix": [5, 2], "x": 13, "y": 1}, |
| 45 | { "label": "L21", "x": 1, "y": 2 }, | 45 | {"matrix": [5, 1], "x": 14, "y": 1}, |
| 46 | { "label": "L22", "x": 2, "y": 2 }, | 46 | {"matrix": [5, 0], "x": 15, "y": 1}, |
| 47 | { "label": "L23", "x": 3, "y": 2 }, | 47 | |
| 48 | { "label": "L24", "x": 4, "y": 2 }, | 48 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 49 | { "label": "R20", "x": 11, "y": 2 }, | 49 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 50 | { "label": "R21", "x": 12, "y": 2 }, | 50 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 51 | { "label": "R22", "x": 13, "y": 2 }, | 51 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 52 | { "label": "R23", "x": 14, "y": 2 }, | 52 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 53 | { "label": "R24", "x": 15, "y": 2 }, | 53 | |
| 54 | { "label": "L32", "x": 4, "y": 3 }, | 54 | {"matrix": [6, 4], "x": 11, "y": 2}, |
| 55 | { "label": "L33", "x": 5, "y": 3 }, | 55 | {"matrix": [6, 3], "x": 12, "y": 2}, |
| 56 | { "label": "L34", "x": 6, "y": 3 }, | 56 | {"matrix": [6, 2], "x": 13, "y": 2}, |
| 57 | { "label": "R32", "x": 11, "y": 3 }, | 57 | {"matrix": [6, 1], "x": 14, "y": 2}, |
| 58 | { "label": "R33", "x": 10, "y": 3 }, | 58 | {"matrix": [6, 0], "x": 15, "y": 2}, |
| 59 | { "label": "R34", "x": 9, "y": 3 } | 59 | |
| 60 | {"matrix": [3, 2], "x": 4, "y": 3}, | ||
| 61 | {"matrix": [3, 0], "x": 5, "y": 3}, | ||
| 62 | {"matrix": [3, 1], "x": 6, "y": 3}, | ||
| 63 | |||
| 64 | {"matrix": [7, 1], "x": 11, "y": 3}, | ||
| 65 | {"matrix": [7, 0], "x": 10, "y": 3}, | ||
| 66 | {"matrix": [7, 2], "x": 9, "y": 3} | ||
| 60 | ] | 67 | ] |
| 61 | } | 68 | } |
| 62 | } | 69 | } |
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h index f2c0784533..eefdd5babf 100644 --- a/keyboards/bastardkb/dilemma/dilemma.h +++ b/keyboards/bastardkb/dilemma/dilemma.h | |||
| @@ -17,16 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | // clang-format off | ||
| 21 | #if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled) | ||
| 22 | # include "3x5_2.h" | ||
| 23 | #elif defined(KEYBOARD_bastardkb_dilemma_3x5_3) | ||
| 24 | # include "3x5_3.h" | ||
| 25 | #else | ||
| 26 | # error "Unsuported format" | ||
| 27 | #endif | ||
| 28 | // clang-format on | ||
| 29 | |||
| 30 | #include "quantum.h" | 20 | #include "quantum.h" |
| 31 | 21 | ||
| 32 | #ifdef POINTING_DEVICE_ENABLE | 22 | #ifdef POINTING_DEVICE_ENABLE |
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json index d8120f5070..682b2dc6db 100644 --- a/keyboards/bastardkb/scylla/info.json +++ b/keyboards/bastardkb/scylla/info.json | |||
| @@ -6,64 +6,75 @@ | |||
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "LAYOUT_split_4x6_5": { | 7 | "LAYOUT_split_4x6_5": { |
| 8 | "layout": [ | 8 | "layout": [ |
| 9 | { "label": "L00", "x": 0, "y": 0 }, | 9 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 10 | { "label": "L01", "x": 1, "y": 0 }, | 10 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 11 | { "label": "L02", "x": 2, "y": 0 }, | 11 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 12 | { "label": "L03", "x": 3, "y": 0 }, | 12 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 13 | { "label": "L04", "x": 4, "y": 0 }, | 13 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 14 | { "label": "L05", "x": 5, "y": 0 }, | 14 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 15 | { "label": "R00", "x": 11, "y": 0 }, | 15 | |
| 16 | { "label": "R01", "x": 12, "y": 0 }, | 16 | {"matrix": [5, 5], "x": 11, "y": 0}, |
| 17 | { "label": "R02", "x": 13, "y": 0 }, | 17 | {"matrix": [5, 4], "x": 12, "y": 0}, |
| 18 | { "label": "R03", "x": 14, "y": 0 }, | 18 | {"matrix": [5, 3], "x": 13, "y": 0}, |
| 19 | { "label": "R04", "x": 15, "y": 0 }, | 19 | {"matrix": [5, 2], "x": 14, "y": 0}, |
| 20 | { "label": "R05", "x": 16, "y": 0 }, | 20 | {"matrix": [5, 1], "x": 15, "y": 0}, |
| 21 | { "label": "L10", "x": 0, "y": 1 }, | 21 | {"matrix": [5, 0], "x": 16, "y": 0}, |
| 22 | { "label": "L11", "x": 1, "y": 1 }, | 22 | |
| 23 | { "label": "L12", "x": 2, "y": 1 }, | 23 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 24 | { "label": "L13", "x": 3, "y": 1 }, | 24 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 25 | { "label": "L14", "x": 4, "y": 1 }, | 25 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 26 | { "label": "L15", "x": 5, "y": 1 }, | 26 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 27 | { "label": "R10", "x": 11, "y": 1 }, | 27 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 28 | { "label": "R11", "x": 12, "y": 1 }, | 28 | {"matrix": [1, 5], "x": 5, "y": 1}, |
| 29 | { "label": "R12", "x": 13, "y": 1 }, | 29 | |
| 30 | { "label": "R13", "x": 14, "y": 1 }, | 30 | {"matrix": [6, 5], "x": 11, "y": 1}, |
| 31 | { "label": "R14", "x": 15, "y": 1 }, | 31 | {"matrix": [6, 4], "x": 12, "y": 1}, |
| 32 | { "label": "R15", "x": 16, "y": 1 }, | 32 | {"matrix": [6, 3], "x": 13, "y": 1}, |
| 33 | { "label": "L20", "x": 0, "y": 2 }, | 33 | {"matrix": [6, 2], "x": 14, "y": 1}, |
| 34 | { "label": "L21", "x": 1, "y": 2 }, | 34 | {"matrix": [6, 1], "x": 15, "y": 1}, |
| 35 | { "label": "L22", "x": 2, "y": 2 }, | 35 | {"matrix": [6, 0], "x": 16, "y": 1}, |
| 36 | { "label": "L23", "x": 3, "y": 2 }, | 36 | |
| 37 | { "label": "L24", "x": 4, "y": 2 }, | 37 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 38 | { "label": "L25", "x": 5, "y": 2 }, | 38 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 39 | { "label": "R20", "x": 11, "y": 2 }, | 39 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 40 | { "label": "R21", "x": 12, "y": 2 }, | 40 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 41 | { "label": "R22", "x": 13, "y": 2 }, | 41 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 42 | { "label": "R23", "x": 14, "y": 2 }, | 42 | {"matrix": [2, 5], "x": 5, "y": 2}, |
| 43 | { "label": "R24", "x": 15, "y": 2 }, | 43 | |
| 44 | { "label": "R25", "x": 16, "y": 2 }, | 44 | {"matrix": [7, 5], "x": 11, "y": 2}, |
| 45 | { "label": "L30", "x": 0, "y": 3 }, | 45 | {"matrix": [7, 4], "x": 12, "y": 2}, |
| 46 | { "label": "L31", "x": 1, "y": 3 }, | 46 | {"matrix": [7, 3], "x": 13, "y": 2}, |
| 47 | { "label": "L32", "x": 2, "y": 3 }, | 47 | {"matrix": [7, 2], "x": 14, "y": 2}, |
| 48 | { "label": "L33", "x": 3, "y": 3 }, | 48 | {"matrix": [7, 1], "x": 15, "y": 2}, |
| 49 | { "label": "L34", "x": 4, "y": 3 }, | 49 | {"matrix": [7, 0], "x": 16, "y": 2}, |
| 50 | { "label": "L35", "x": 5, "y": 3 }, | 50 | |
| 51 | { "label": "R30", "x": 11, "y": 3 }, | 51 | {"matrix": [3, 0], "x": 0, "y": 3}, |
| 52 | { "label": "R31", "x": 12, "y": 3 }, | 52 | {"matrix": [3, 1], "x": 1, "y": 3}, |
| 53 | { "label": "R32", "x": 13, "y": 3 }, | 53 | {"matrix": [3, 2], "x": 2, "y": 3}, |
| 54 | { "label": "R33", "x": 14, "y": 3 }, | 54 | {"matrix": [3, 3], "x": 3, "y": 3}, |
| 55 | { "label": "R34", "x": 15, "y": 3 }, | 55 | {"matrix": [3, 4], "x": 4, "y": 3}, |
| 56 | { "label": "R35", "x": 16, "y": 3 }, | 56 | {"matrix": [3, 5], "x": 5, "y": 3}, |
| 57 | { "label": "L43", "x": 5, "y": 4 }, | 57 | |
| 58 | { "label": "L44", "x": 6, "y": 4 }, | 58 | {"matrix": [8, 5], "x": 11, "y": 3}, |
| 59 | { "label": "L45", "x": 7, "y": 4 }, | 59 | {"matrix": [8, 4], "x": 12, "y": 3}, |
| 60 | { "label": "R40", "x": 9, "y": 4 }, | 60 | {"matrix": [8, 3], "x": 13, "y": 3}, |
| 61 | { "label": "R41", "x": 10, "y": 4 }, | 61 | {"matrix": [8, 2], "x": 14, "y": 3}, |
| 62 | { "label": "R40", "x": 11, "y": 4 }, | 62 | {"matrix": [8, 1], "x": 15, "y": 3}, |
| 63 | { "label": "L52", "x": 6, "y": 5 }, | 63 | {"matrix": [8, 0], "x": 16, "y": 3}, |
| 64 | { "label": "L53", "x": 7, "y": 5 }, | 64 | |
| 65 | { "label": "R52", "x": 9, "y": 5 }, | 65 | {"matrix": [4, 3], "x": 5, "y": 4}, |
| 66 | { "label": "R53", "x": 10, "y": 5 } | 66 | {"matrix": [4, 4], "x": 6, "y": 4}, |
| 67 | {"matrix": [4, 1], "x": 7, "y": 4}, | ||
| 68 | |||
| 69 | {"matrix": [9, 1], "x": 9, "y": 4}, | ||
| 70 | {"matrix": [9, 4], "x": 10, "y": 4}, | ||
| 71 | {"matrix": [9, 3], "x": 11, "y": 4}, | ||
| 72 | |||
| 73 | {"matrix": [4, 5], "x": 6, "y": 5}, | ||
| 74 | {"matrix": [4, 2], "x": 7, "y": 5}, | ||
| 75 | |||
| 76 | {"matrix": [9, 2], "x": 9, "y": 5}, | ||
| 77 | {"matrix": [9, 5], "x": 10, "y": 5} | ||
| 67 | ] | 78 | ] |
| 68 | } | 79 | } |
| 69 | } | 80 | } |
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c index 504cb0a219..7aaa0fc1ce 100644 --- a/keyboards/bastardkb/scylla/scylla.c +++ b/keyboards/bastardkb/scylla/scylla.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "scylla.h" | 18 | #include "quantum.h" |
| 19 | 19 | ||
| 20 | // clang-format off | 20 | // clang-format off |
| 21 | #ifdef RGB_MATRIX_ENABLE | 21 | #ifdef RGB_MATRIX_ENABLE |
diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h deleted file mode 100644 index 4039ad3a94..0000000000 --- a/keyboards/bastardkb/scylla/scylla.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> | ||
| 3 | * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) | ||
| 4 | * | ||
| 5 | * This program is free software: you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License as published by | ||
| 7 | * the Free Software Foundation, either version 2 of the License, or | ||
| 8 | * (at your option) any later version. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, | ||
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | * GNU General Public License for more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License | ||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | |||
| 23 | // clang-format off | ||
| 24 | #define LAYOUT_split_4x6_5( \ | ||
| 25 | k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ | ||
| 26 | k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ | ||
| 27 | k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ | ||
| 28 | k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ | ||
| 29 | k43, k44, k41, k91, k94, k93, \ | ||
| 30 | k45, k42, k92, k95 \ | ||
| 31 | ) \ | ||
| 32 | { \ | ||
| 33 | { k00, k01, k02, k03, k04, k05 }, \ | ||
| 34 | { k10, k11, k12, k13, k14, k15 }, \ | ||
| 35 | { k20, k21, k22, k23, k24, k25 }, \ | ||
| 36 | { k30, k31, k32, k33, k34, k35 }, \ | ||
| 37 | { KC_NO, k41, k42, k43, k44, k45 }, \ | ||
| 38 | { k50, k51, k52, k53, k54, k55 }, \ | ||
| 39 | { k60, k61, k62, k63, k64, k65 }, \ | ||
| 40 | { k70, k71, k72, k73, k74, k75 }, \ | ||
| 41 | { k80, k81, k82, k83, k84, k85 }, \ | ||
| 42 | { KC_NO, k91, k92, k93, k94, k95 }, \ | ||
| 43 | } | ||
| 44 | // clang-format on | ||
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index 90568ef1fd..b325ca7196 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json | |||
| @@ -7,42 +7,49 @@ | |||
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_split_3x5_3": { | 8 | "LAYOUT_split_3x5_3": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | { "label": "L00", "x": 0, "y": 0 }, | 10 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 11 | { "label": "L01", "x": 1, "y": 0 }, | 11 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 12 | { "label": "L02", "x": 2, "y": 0 }, | 12 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 13 | { "label": "L03", "x": 3, "y": 0 }, | 13 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 14 | { "label": "L04", "x": 4, "y": 0 }, | 14 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 15 | { "label": "R00", "x": 11, "y": 0 }, | 15 | |
| 16 | { "label": "R01", "x": 12, "y": 0 }, | 16 | {"matrix": [4, 4], "x": 11, "y": 0}, |
| 17 | { "label": "R02", "x": 13, "y": 0 }, | 17 | {"matrix": [4, 3], "x": 12, "y": 0}, |
| 18 | { "label": "R03", "x": 14, "y": 0 }, | 18 | {"matrix": [4, 2], "x": 13, "y": 0}, |
| 19 | { "label": "R04", "x": 15, "y": 0 }, | 19 | {"matrix": [4, 1], "x": 14, "y": 0}, |
| 20 | { "label": "L10", "x": 0, "y": 1 }, | 20 | {"matrix": [4, 0], "x": 15, "y": 0}, |
| 21 | { "label": "L11", "x": 1, "y": 1 }, | 21 | |
| 22 | { "label": "L12", "x": 2, "y": 1 }, | 22 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 23 | { "label": "L13", "x": 3, "y": 1 }, | 23 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 24 | { "label": "L14", "x": 4, "y": 1 }, | 24 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 25 | { "label": "R10", "x": 11, "y": 1 }, | 25 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 26 | { "label": "R11", "x": 12, "y": 1 }, | 26 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 27 | { "label": "R12", "x": 13, "y": 1 }, | 27 | |
| 28 | { "label": "R13", "x": 14, "y": 1 }, | 28 | {"matrix": [5, 4], "x": 11, "y": 1}, |
| 29 | { "label": "R14", "x": 15, "y": 1 }, | 29 | {"matrix": [5, 3], "x": 12, "y": 1}, |
| 30 | { "label": "L20", "x": 0, "y": 2 }, | 30 | {"matrix": [5, 2], "x": 13, "y": 1}, |
| 31 | { "label": "L21", "x": 1, "y": 2 }, | 31 | {"matrix": [5, 1], "x": 14, "y": 1}, |
| 32 | { "label": "L22", "x": 2, "y": 2 }, | 32 | {"matrix": [5, 0], "x": 15, "y": 1}, |
| 33 | { "label": "L23", "x": 3, "y": 2 }, | 33 | |
| 34 | { "label": "L24", "x": 4, "y": 2 }, | 34 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 35 | { "label": "R20", "x": 11, "y": 2 }, | 35 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 36 | { "label": "R21", "x": 12, "y": 2 }, | 36 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 37 | { "label": "R22", "x": 13, "y": 2 }, | 37 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 38 | { "label": "R23", "x": 14, "y": 2 }, | 38 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 39 | { "label": "R24", "x": 15, "y": 2 }, | 39 | |
| 40 | { "label": "L33", "x": 4, "y": 3 }, | 40 | {"matrix": [6, 4], "x": 11, "y": 2}, |
| 41 | { "label": "L34", "x": 5, "y": 3 }, | 41 | {"matrix": [6, 3], "x": 12, "y": 2}, |
| 42 | { "label": "L31", "x": 6, "y": 3 }, | 42 | {"matrix": [6, 2], "x": 13, "y": 2}, |
| 43 | { "label": "R33", "x": 9, "y": 3 }, | 43 | {"matrix": [6, 1], "x": 14, "y": 2}, |
| 44 | { "label": "R34", "x": 10, "y": 3 }, | 44 | {"matrix": [6, 0], "x": 15, "y": 2}, |
| 45 | { "label": "R31", "x": 11, "y": 3 } | 45 | |
| 46 | {"matrix": [3, 2], "x": 4, "y": 3}, | ||
| 47 | {"matrix": [3, 3], "x": 5, "y": 3}, | ||
| 48 | {"matrix": [3, 0], "x": 6, "y": 3}, | ||
| 49 | |||
| 50 | {"matrix": [7, 0], "x": 9, "y": 3}, | ||
| 51 | {"matrix": [7, 3], "x": 10, "y": 3}, | ||
| 52 | {"matrix": [7, 2], "x": 11, "y": 3} | ||
| 46 | ] | 53 | ] |
| 47 | } | 54 | } |
| 48 | } | 55 | } |
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.c b/keyboards/bastardkb/skeletyl/skeletyl.c index b72becbb25..6c65c3fa87 100644 --- a/keyboards/bastardkb/skeletyl/skeletyl.c +++ b/keyboards/bastardkb/skeletyl/skeletyl.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "skeletyl.h" | 18 | #include "quantum.h" |
| 19 | 19 | ||
| 20 | /** | 20 | /** |
| 21 | * LEDs index. | 21 | * LEDs index. |
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.h b/keyboards/bastardkb/skeletyl/skeletyl.h deleted file mode 100644 index 6d8073153f..0000000000 --- a/keyboards/bastardkb/skeletyl/skeletyl.h +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> | ||
| 3 | * Copyright 2022 Charly DELAY <charly@codesink.dev> | ||
| 4 | * | ||
| 5 | * This program is free software: you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License as published by | ||
| 7 | * the Free Software Foundation, either version 2 of the License, or | ||
| 8 | * (at your option) any later version. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, | ||
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | * GNU General Public License for more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License | ||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | |||
| 23 | // clang-format off | ||
| 24 | #define LAYOUT_split_3x5_3( \ | ||
| 25 | k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ | ||
| 26 | k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ | ||
| 27 | k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ | ||
| 28 | k32, k33, k30, k70, k73, k72 \ | ||
| 29 | ) \ | ||
| 30 | { \ | ||
| 31 | { k00, k01, k02, k03, k04 }, \ | ||
| 32 | { k10, k11, k12, k13, k14 }, \ | ||
| 33 | { k20, k21, k22, k23, k24 }, \ | ||
| 34 | { k30, KC_NO, k32, k33, KC_NO }, \ | ||
| 35 | { k40, k41, k42, k43, k44 }, \ | ||
| 36 | { k50, k51, k52, k53, k54 }, \ | ||
| 37 | { k60, k61, k62, k63, k64 }, \ | ||
| 38 | { k70, KC_NO, k72, k73, KC_NO }, \ | ||
| 39 | } | ||
| 40 | // clang-format on | ||
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 247e86160f..43254b2804 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json | |||
| @@ -18,64 +18,64 @@ | |||
| 18 | "layouts": { | 18 | "layouts": { |
| 19 | "LAYOUT_split_4x6_5": { | 19 | "LAYOUT_split_4x6_5": { |
| 20 | "layout": [ | 20 | "layout": [ |
| 21 | { "label": "L00", "x": 0, "y": 0 }, | 21 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 22 | { "label": "L01", "x": 1, "y": 0 }, | 22 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 23 | { "label": "L02", "x": 2, "y": 0 }, | 23 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 24 | { "label": "L03", "x": 3, "y": 0 }, | 24 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 25 | { "label": "L04", "x": 4, "y": 0 }, | 25 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 26 | { "label": "L05", "x": 5, "y": 0 }, | 26 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 27 | { "label": "R00", "x": 11, "y": 0 }, | 27 | {"matrix": [5, 5], "x": 11, "y": 0}, |
| 28 | { "label": "R01", "x": 12, "y": 0 }, | 28 | {"matrix": [5, 4], "x": 12, "y": 0}, |
| 29 | { "label": "R02", "x": 13, "y": 0 }, | 29 | {"matrix": [5, 3], "x": 13, "y": 0}, |
| 30 | { "label": "R03", "x": 14, "y": 0 }, | 30 | {"matrix": [5, 2], "x": 14, "y": 0}, |
| 31 | { "label": "R04", "x": 15, "y": 0 }, | 31 | {"matrix": [5, 1], "x": 15, "y": 0}, |
| 32 | { "label": "R05", "x": 16, "y": 0 }, | 32 | {"matrix": [5, 0], "x": 16, "y": 0}, |
| 33 | { "label": "L10", "x": 0, "y": 1 }, | 33 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 34 | { "label": "L11", "x": 1, "y": 1 }, | 34 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 35 | { "label": "L12", "x": 2, "y": 1 }, | 35 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 36 | { "label": "L13", "x": 3, "y": 1 }, | 36 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 37 | { "label": "L14", "x": 4, "y": 1 }, | 37 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 38 | { "label": "L15", "x": 5, "y": 1 }, | 38 | {"matrix": [1, 5], "x": 5, "y": 1}, |
| 39 | { "label": "R10", "x": 11, "y": 1 }, | 39 | {"matrix": [6, 5], "x": 11, "y": 1}, |
| 40 | { "label": "R11", "x": 12, "y": 1 }, | 40 | {"matrix": [6, 4], "x": 12, "y": 1}, |
| 41 | { "label": "R12", "x": 13, "y": 1 }, | 41 | {"matrix": [6, 3], "x": 13, "y": 1}, |
| 42 | { "label": "R13", "x": 14, "y": 1 }, | 42 | {"matrix": [6, 2], "x": 14, "y": 1}, |
| 43 | { "label": "R14", "x": 15, "y": 1 }, | 43 | {"matrix": [6, 1], "x": 15, "y": 1}, |
| 44 | { "label": "R15", "x": 16, "y": 1 }, | 44 | {"matrix": [6, 0], "x": 16, "y": 1}, |
| 45 | { "label": "L20", "x": 0, "y": 2 }, | 45 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 46 | { "label": "L21", "x": 1, "y": 2 }, | 46 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 47 | { "label": "L22", "x": 2, "y": 2 }, | 47 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 48 | { "label": "L23", "x": 3, "y": 2 }, | 48 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 49 | { "label": "L24", "x": 4, "y": 2 }, | 49 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 50 | { "label": "L25", "x": 5, "y": 2 }, | 50 | {"matrix": [2, 5], "x": 5, "y": 2}, |
| 51 | { "label": "R20", "x": 11, "y": 2 }, | 51 | {"matrix": [7, 5], "x": 11, "y": 2}, |
| 52 | { "label": "R21", "x": 12, "y": 2 }, | 52 | {"matrix": [7, 4], "x": 12, "y": 2}, |
| 53 | { "label": "R22", "x": 13, "y": 2 }, | 53 | {"matrix": [7, 3], "x": 13, "y": 2}, |
| 54 | { "label": "R23", "x": 14, "y": 2 }, | 54 | {"matrix": [7, 2], "x": 14, "y": 2}, |
| 55 | { "label": "R24", "x": 15, "y": 2 }, | 55 | {"matrix": [7, 1], "x": 15, "y": 2}, |
| 56 | { "label": "R25", "x": 16, "y": 2 }, | 56 | {"matrix": [7, 0], "x": 16, "y": 2}, |
| 57 | { "label": "L30", "x": 0, "y": 3 }, | 57 | {"matrix": [3, 0], "x": 0, "y": 3}, |
| 58 | { "label": "L31", "x": 1, "y": 3 }, | 58 | {"matrix": [3, 1], "x": 1, "y": 3}, |
| 59 | { "label": "L32", "x": 2, "y": 3 }, | 59 | {"matrix": [3, 2], "x": 2, "y": 3}, |
| 60 | { "label": "L33", "x": 3, "y": 3 }, | 60 | {"matrix": [3, 3], "x": 3, "y": 3}, |
| 61 | { "label": "L34", "x": 4, "y": 3 }, | 61 | {"matrix": [3, 4], "x": 4, "y": 3}, |
| 62 | { "label": "L35", "x": 5, "y": 3 }, | 62 | {"matrix": [3, 5], "x": 5, "y": 3}, |
| 63 | { "label": "R30", "x": 11, "y": 3 }, | 63 | {"matrix": [8, 5], "x": 11, "y": 3}, |
| 64 | { "label": "R31", "x": 12, "y": 3 }, | 64 | {"matrix": [8, 4], "x": 12, "y": 3}, |
| 65 | { "label": "R32", "x": 13, "y": 3 }, | 65 | {"matrix": [8, 3], "x": 13, "y": 3}, |
| 66 | { "label": "R33", "x": 14, "y": 3 }, | 66 | {"matrix": [8, 2], "x": 14, "y": 3}, |
| 67 | { "label": "R34", "x": 15, "y": 3 }, | 67 | {"matrix": [8, 1], "x": 15, "y": 3}, |
| 68 | { "label": "R35", "x": 16, "y": 3 }, | 68 | {"matrix": [8, 0], "x": 16, "y": 3}, |
| 69 | { "label": "L43", "x": 5, "y": 4 }, | 69 | {"matrix": [4, 3], "x": 5, "y": 4}, |
| 70 | { "label": "L44", "x": 6, "y": 4 }, | 70 | {"matrix": [4, 4], "x": 6, "y": 4}, |
| 71 | { "label": "L45", "x": 7, "y": 4 }, | 71 | {"matrix": [4, 1], "x": 7, "y": 4}, |
| 72 | { "label": "R40", "x": 9, "y": 4 }, | 72 | {"matrix": [9, 1], "x": 9, "y": 4}, |
| 73 | { "label": "R41", "x": 10, "y": 4 }, | 73 | {"matrix": [9, 4], "x": 10, "y": 4}, |
| 74 | { "label": "R40", "x": 11, "y": 4 }, | 74 | {"matrix": [9, 3], "x": 11, "y": 4}, |
| 75 | { "label": "L52", "x": 6, "y": 5 }, | 75 | {"matrix": [4, 5], "x": 6, "y": 5}, |
| 76 | { "label": "L53", "x": 7, "y": 5 }, | 76 | {"matrix": [4, 2], "x": 7, "y": 5}, |
| 77 | { "label": "R52", "x": 9, "y": 5 }, | 77 | {"matrix": [9, 2], "x": 9, "y": 5}, |
| 78 | { "label": "R53", "x": 10, "y": 5 } | 78 | {"matrix": [9, 5], "x": 10, "y": 5} |
| 79 | ] | 79 | ] |
| 80 | } | 80 | } |
| 81 | } | 81 | } |
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h deleted file mode 100644 index 5958097880..0000000000 --- a/keyboards/bastardkb/tbk/tbk.h +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> | ||
| 3 | * | ||
| 4 | * This program is free software: you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation, either version 2 of the License, or | ||
| 7 | * (at your option) any later version. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | #include "quantum.h" | ||
| 21 | |||
| 22 | // clang-format off | ||
| 23 | #define LAYOUT_split_4x6_5( \ | ||
| 24 | k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ | ||
| 25 | k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ | ||
| 26 | k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ | ||
| 27 | k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ | ||
| 28 | k43, k44, k41, k91, k94, k93, \ | ||
| 29 | k45, k42, k92, k95 \ | ||
| 30 | ) \ | ||
| 31 | { \ | ||
| 32 | { k00, k01, k02, k03, k04, k05 }, \ | ||
| 33 | { k10, k11, k12, k13, k14, k15 }, \ | ||
| 34 | { k20, k21, k22, k23, k24, k25 }, \ | ||
| 35 | { k30, k31, k32, k33, k34, k35 }, \ | ||
| 36 | { KC_NO, k41, k42, k43, k44, k45 }, \ | ||
| 37 | { k50, k51, k52, k53, k54, k55 }, \ | ||
| 38 | { k60, k61, k62, k63, k64, k65 }, \ | ||
| 39 | { k70, k71, k72, k73, k74, k75 }, \ | ||
| 40 | { k80, k81, k82, k83, k84, k85 }, \ | ||
| 41 | { KC_NO, k91, k92, k93, k94, k95 }, \ | ||
| 42 | } | ||
| 43 | // clang-format on | ||
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index 2056aeeb5d..94c357cd3b 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json | |||
| @@ -7,48 +7,55 @@ | |||
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_split_3x6_3": { | 8 | "LAYOUT_split_3x6_3": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | { "label": "L00", "x": 0, "y": 0 }, | 10 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 11 | { "label": "L01", "x": 1, "y": 0 }, | 11 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 12 | { "label": "L02", "x": 2, "y": 0 }, | 12 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 13 | { "label": "L03", "x": 3, "y": 0 }, | 13 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 14 | { "label": "L04", "x": 4, "y": 0 }, | 14 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 15 | { "label": "L05", "x": 5, "y": 0 }, | 15 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 16 | { "label": "R00", "x": 11, "y": 0 }, | 16 | |
| 17 | { "label": "R01", "x": 12, "y": 0 }, | 17 | {"matrix": [4, 5], "x": 11, "y": 0}, |
| 18 | { "label": "R02", "x": 13, "y": 0 }, | 18 | {"matrix": [4, 4], "x": 12, "y": 0}, |
| 19 | { "label": "R03", "x": 14, "y": 0 }, | 19 | {"matrix": [4, 3], "x": 13, "y": 0}, |
| 20 | { "label": "R04", "x": 15, "y": 0 }, | 20 | {"matrix": [4, 2], "x": 14, "y": 0}, |
| 21 | { "label": "R05", "x": 16, "y": 0 }, | 21 | {"matrix": [4, 1], "x": 15, "y": 0}, |
| 22 | { "label": "L10", "x": 0, "y": 1 }, | 22 | {"matrix": [4, 0], "x": 16, "y": 0}, |
| 23 | { "label": "L11", "x": 1, "y": 1 }, | 23 | |
| 24 | { "label": "L12", "x": 2, "y": 1 }, | 24 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 25 | { "label": "L13", "x": 3, "y": 1 }, | 25 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 26 | { "label": "L14", "x": 4, "y": 1 }, | 26 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 27 | { "label": "L15", "x": 5, "y": 1 }, | 27 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 28 | { "label": "R10", "x": 11, "y": 1 }, | 28 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 29 | { "label": "R11", "x": 12, "y": 1 }, | 29 | {"matrix": [1, 5], "x": 5, "y": 1}, |
| 30 | { "label": "R12", "x": 13, "y": 1 }, | 30 | |
| 31 | { "label": "R13", "x": 14, "y": 1 }, | 31 | {"matrix": [5, 5], "x": 11, "y": 1}, |
| 32 | { "label": "R14", "x": 15, "y": 1 }, | 32 | {"matrix": [5, 4], "x": 12, "y": 1}, |
| 33 | { "label": "R15", "x": 16, "y": 1 }, | 33 | {"matrix": [5, 3], "x": 13, "y": 1}, |
| 34 | { "label": "L20", "x": 0, "y": 2 }, | 34 | {"matrix": [5, 2], "x": 14, "y": 1}, |
| 35 | { "label": "L21", "x": 1, "y": 2 }, | 35 | {"matrix": [5, 1], "x": 15, "y": 1}, |
| 36 | { "label": "L22", "x": 2, "y": 2 }, | 36 | {"matrix": [5, 0], "x": 16, "y": 1}, |
| 37 | { "label": "L23", "x": 3, "y": 2 }, | 37 | |
| 38 | { "label": "L24", "x": 4, "y": 2 }, | 38 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 39 | { "label": "L25", "x": 5, "y": 2 }, | 39 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 40 | { "label": "R20", "x": 11, "y": 2 }, | 40 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 41 | { "label": "R21", "x": 12, "y": 2 }, | 41 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 42 | { "label": "R22", "x": 13, "y": 2 }, | 42 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 43 | { "label": "R23", "x": 14, "y": 2 }, | 43 | {"matrix": [2, 5], "x": 5, "y": 2}, |
| 44 | { "label": "R24", "x": 15, "y": 2 }, | 44 | |
| 45 | { "label": "R25", "x": 16, "y": 2 }, | 45 | {"matrix": [6, 5], "x": 11, "y": 2}, |
| 46 | { "label": "L33", "x": 5, "y": 3 }, | 46 | {"matrix": [6, 4], "x": 12, "y": 2}, |
| 47 | { "label": "L34", "x": 6, "y": 3 }, | 47 | {"matrix": [6, 3], "x": 13, "y": 2}, |
| 48 | { "label": "L31", "x": 7, "y": 3 }, | 48 | {"matrix": [6, 2], "x": 14, "y": 2}, |
| 49 | { "label": "R33", "x": 9, "y": 3 }, | 49 | {"matrix": [6, 1], "x": 15, "y": 2}, |
| 50 | { "label": "R34", "x": 10, "y": 3 }, | 50 | {"matrix": [6, 0], "x": 16, "y": 2}, |
| 51 | { "label": "R31", "x": 11, "y": 3 } | 51 | |
| 52 | {"matrix": [3, 3], "x": 5, "y": 3}, | ||
| 53 | {"matrix": [3, 4], "x": 6, "y": 3}, | ||
| 54 | {"matrix": [3, 1], "x": 7, "y": 3}, | ||
| 55 | |||
| 56 | {"matrix": [7, 1], "x": 9, "y": 3}, | ||
| 57 | {"matrix": [7, 4], "x": 10, "y": 3}, | ||
| 58 | {"matrix": [7, 3], "x": 11, "y": 3} | ||
| 52 | ] | 59 | ] |
| 53 | } | 60 | } |
| 54 | } | 61 | } |
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c index 34b42951a0..51baefb737 100644 --- a/keyboards/bastardkb/tbkmini/tbkmini.c +++ b/keyboards/bastardkb/tbkmini/tbkmini.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "tbkmini.h" | 18 | #include "quantum.h" |
| 19 | 19 | ||
| 20 | // clang-format off | 20 | // clang-format off |
| 21 | #ifdef RGB_MATRIX_ENABLE | 21 | #ifdef RGB_MATRIX_ENABLE |
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.h b/keyboards/bastardkb/tbkmini/tbkmini.h deleted file mode 100644 index f031c9fed2..0000000000 --- a/keyboards/bastardkb/tbkmini/tbkmini.h +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> | ||
| 3 | * Copyright 2022 Charly DELAY <charly@codesink.dev> | ||
| 4 | * | ||
| 5 | * This program is free software: you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License as published by | ||
| 7 | * the Free Software Foundation, either version 2 of the License, or | ||
| 8 | * (at your option) any later version. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, | ||
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | * GNU General Public License for more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License | ||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | |||
| 23 | // clang-format off | ||
| 24 | #define LAYOUT_split_3x6_3( \ | ||
| 25 | k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ | ||
| 26 | k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ | ||
| 27 | k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ | ||
| 28 | k33, k34, k31, k71, k74, k73 \ | ||
| 29 | ) \ | ||
| 30 | { \ | ||
| 31 | { k00, k01, k02, k03, k04, k05 }, \ | ||
| 32 | { k10, k11, k12, k13, k14, k15 }, \ | ||
| 33 | { k20, k21, k22, k23, k24, k25 }, \ | ||
| 34 | { KC_NO, k31, KC_NO, k33, k34, KC_NO }, \ | ||
| 35 | { k40, k41, k42, k43, k44, k45 }, \ | ||
| 36 | { k50, k51, k52, k53, k54, k55 }, \ | ||
| 37 | { k60, k61, k62, k63, k64, k65 }, \ | ||
| 38 | { KC_NO, k71, KC_NO, k73, k74, KC_NO }, \ | ||
| 39 | } | ||
| 40 | // clang-format on | ||
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index 7a0adea313..223aa9b9bc 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json | |||
| @@ -34,42 +34,49 @@ | |||
| 34 | "layouts": { | 34 | "layouts": { |
| 35 | "LAYOUT_split_3x5_3": { | 35 | "LAYOUT_split_3x5_3": { |
| 36 | "layout": [ | 36 | "layout": [ |
| 37 | {"label":"SW1", "x":0, "y":0.375}, | 37 | {"matrix": [0, 0], "x": 0, "y": 0.375}, |
| 38 | {"label":"SW2", "x":1, "y":0.125}, | 38 | {"matrix": [0, 1], "x": 1, "y": 0.125}, |
| 39 | {"label":"SW3", "x":2, "y":0}, | 39 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 40 | {"label":"SW4", "x":3, "y":0.125}, | 40 | {"matrix": [0, 3], "x": 3, "y": 0.125}, |
| 41 | {"label":"SW5", "x":4, "y":0.25}, | 41 | {"matrix": [0, 4], "x": 4, "y": 0.25}, |
| 42 | {"label":"SW19", "x":8, "y":0.25}, | 42 | |
| 43 | {"label":"SW20", "x":9, "y":0.125}, | 43 | {"matrix": [4, 4], "x": 8, "y": 0.25}, |
| 44 | {"label":"SW21", "x":10, "y":0}, | 44 | {"matrix": [4, 3], "x": 9, "y": 0.125}, |
| 45 | {"label":"SW22", "x":11, "y":0.125}, | 45 | {"matrix": [4, 2], "x": 10, "y": 0}, |
| 46 | {"label":"SW23", "x":12, "y":0.375}, | 46 | {"matrix": [4, 1], "x": 11, "y": 0.125}, |
| 47 | {"label":"SW6", "x":0, "y":1.375}, | 47 | {"matrix": [4, 0], "x": 12, "y": 0.375}, |
| 48 | {"label":"SW7", "x":1, "y":1.125}, | 48 | |
| 49 | {"label":"SW8", "x":2, "y":1}, | 49 | {"matrix": [1, 0], "x": 0, "y": 1.375}, |
| 50 | {"label":"SW9", "x":3, "y":1.125}, | 50 | {"matrix": [1, 1], "x": 1, "y": 1.125}, |
| 51 | {"label":"SW10", "x":4, "y":1.25}, | 51 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 52 | {"label":"SW24", "x":8, "y":1.25}, | 52 | {"matrix": [1, 3], "x": 3, "y": 1.125}, |
| 53 | {"label":"SW25", "x":9, "y":1.125}, | 53 | {"matrix": [1, 4], "x": 4, "y": 1.25}, |
| 54 | {"label":"SW26", "x":10, "y":1}, | 54 | |
| 55 | {"label":"SW27", "x":11, "y":1.125}, | 55 | {"matrix": [5, 4], "x": 8, "y": 1.25}, |
| 56 | {"label":"SW28", "x":12, "y":1.375}, | 56 | {"matrix": [5, 3], "x": 9, "y": 1.125}, |
| 57 | {"label":"SW11", "x":0, "y":2.375}, | 57 | {"matrix": [5, 2], "x": 10, "y": 1}, |
| 58 | {"label":"SW12", "x":1, "y":2.125}, | 58 | {"matrix": [5, 1], "x": 11, "y": 1.125}, |
| 59 | {"label":"SW13", "x":2, "y":2}, | 59 | {"matrix": [5, 0], "x": 12, "y": 1.375}, |
| 60 | {"label":"SW14", "x":3, "y":2.125}, | 60 | |
| 61 | {"label":"SW15", "x":4, "y":2.25}, | 61 | {"matrix": [2, 0], "x": 0, "y": 2.375}, |
| 62 | {"label":"SW29", "x":8, "y":2.25}, | 62 | {"matrix": [2, 1], "x": 1, "y": 2.125}, |
| 63 | {"label":"SW30", "x":9, "y":2.125}, | 63 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 64 | {"label":"SW31", "x":10, "y":2}, | 64 | {"matrix": [2, 3], "x": 3, "y": 2.125}, |
| 65 | {"label":"SW32", "x":11, "y":2.125}, | 65 | {"matrix": [2, 4], "x": 4, "y": 2.25}, |
| 66 | {"label":"SW33", "x":12, "y":2.375}, | 66 | |
| 67 | {"label":"SW16", "x":2.875, "y":3.25}, | 67 | {"matrix": [6, 4], "x": 8, "y": 2.25}, |
| 68 | {"label":"SW17", "x":4, "y":3.375}, | 68 | {"matrix": [6, 3], "x": 9, "y": 2.125}, |
| 69 | {"label":"SW28", "x":5.125, "y":3.625}, | 69 | {"matrix": [6, 2], "x": 10, "y": 2}, |
| 70 | {"label":"SW34", "x":6.875, "y":3.625}, | 70 | {"matrix": [6, 1], "x": 11, "y": 2.125}, |
| 71 | {"label":"SW35", "x":8, "y":3.375}, | 71 | {"matrix": [6, 0], "x": 12, "y": 2.375}, |
| 72 | {"label":"SW36", "x":9.125, "y":3.25} | 72 | |
| 73 | {"matrix": [3, 2], "x": 2.875, "y": 3.25}, | ||
| 74 | {"matrix": [3, 3], "x": 4, "y": 3.375}, | ||
| 75 | {"matrix": [3, 4], "x": 5.125, "y": 3.625}, | ||
| 76 | |||
| 77 | {"matrix": [7, 4], "x": 6.875, "y": 3.625}, | ||
| 78 | {"matrix": [7, 3], "x": 8, "y": 3.375}, | ||
| 79 | {"matrix": [7, 2], "x": 9.125, "y": 3.25} | ||
| 73 | ] | 80 | ] |
| 74 | } | 81 | } |
| 75 | } | 82 | } |
diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h deleted file mode 100644 index 4160f3af8a..0000000000 --- a/keyboards/bluebell/swoop/swoop.h +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | /* Copyright 2022 James White <jamesmnw@gmail.com> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | #include "quantum.h" | ||
| 18 | |||
| 19 | #define ___ KC_NO | ||
| 20 | |||
| 21 | #define LAYOUT_split_3x5_3( \ | ||
| 22 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 23 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 24 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 25 | L30, L31, L32, R30, R31, R32 \ | ||
| 26 | ) \ | ||
| 27 | { \ | ||
| 28 | { L00, L01, L02, L03, L04 }, \ | ||
| 29 | { L10, L11, L12, L13, L14 }, \ | ||
| 30 | { L20, L21, L22, L23, L24 }, \ | ||
| 31 | { ___, ___, L30, L31, L32 }, \ | ||
| 32 | { R04, R03, R02, R01, R00 }, \ | ||
| 33 | { R14, R13, R12, R11, R10 }, \ | ||
| 34 | { R24, R23, R22, R21, R20 }, \ | ||
| 35 | { ___, ___, R32, R31, R30 } \ | ||
| 36 | } | ||
diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h index bf13aa7b00..078cdca07f 100644 --- a/keyboards/centromere/centromere.h +++ b/keyboards/centromere/centromere.h | |||
| @@ -27,39 +27,3 @@ | |||
| 27 | #define set_led_magenta red_led_on; grn_led_off; blu_led_on | 27 | #define set_led_magenta red_led_on; grn_led_off; blu_led_on |
| 28 | #define set_led_cyan red_led_off; grn_led_on; blu_led_on | 28 | #define set_led_cyan red_led_off; grn_led_on; blu_led_on |
| 29 | #define set_led_white red_led_on; grn_led_on; blu_led_on | 29 | #define set_led_white red_led_on; grn_led_on; blu_led_on |
| 30 | |||
| 31 | // For readability | ||
| 32 | #define ___ KC_NO | ||
| 33 | |||
| 34 | // This a shortcut to help you visually see your layout. | ||
| 35 | // The first section contains all of the arguments | ||
| 36 | // The second converts the arguments into a two-dimensional array | ||
| 37 | #define LAYOUT_split_3x6_3( \ | ||
| 38 | k0a, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0b, \ | ||
| 39 | k1a, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b,\ | ||
| 40 | k2a, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2b,\ | ||
| 41 | k32, k33, k34, k35, k36, k37 \ | ||
| 42 | ) \ | ||
| 43 | { \ | ||
| 44 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ | ||
| 45 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ | ||
| 46 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ | ||
| 47 | { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \ | ||
| 48 | { ___, ___, k2a, k1a, k0a, k0b, k1b, k2b, ___, ___ } \ | ||
| 49 | } | ||
| 50 | |||
| 51 | #define LAYOUT_split_3x5_3( \ | ||
| 52 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ | ||
| 53 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\ | ||
| 54 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\ | ||
| 55 | k32, k33, k34, k35, k36, k37 \ | ||
| 56 | ) \ | ||
| 57 | { \ | ||
| 58 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ | ||
| 59 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ | ||
| 60 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ | ||
| 61 | { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \ | ||
| 62 | { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ | ||
| 63 | } | ||
| 64 | |||
| 65 | #define LAYOUT LAYOUT_split_3x6_3 | ||
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json index cd1c07c67c..5f9b57d97a 100644 --- a/keyboards/centromere/info.json +++ b/keyboards/centromere/info.json | |||
| @@ -11,91 +11,108 @@ | |||
| 11 | "processor": "atmega32u4", | 11 | "processor": "atmega32u4", |
| 12 | "bootloader": "caterina", | 12 | "bootloader": "caterina", |
| 13 | "community_layouts": ["split_3x5_3" "split_3x6_3"], | 13 | "community_layouts": ["split_3x5_3" "split_3x6_3"], |
| 14 | "layout_aliases": { | ||
| 15 | "LAYOUT": "LAYOUT_split_3x6_3" | ||
| 16 | }, | ||
| 14 | "layouts": { | 17 | "layouts": { |
| 15 | "LAYOUT_split_3x6_3": { | 18 | "LAYOUT_split_3x6_3": { |
| 16 | "layout": [ | 19 | "layout": [ |
| 17 | {"label":"Tab", "x":0, "y":0.25}, | 20 | {"matrix": [4, 4], "x": 0, "y": 0.25}, |
| 18 | {"label":"Q", "x":1, "y":0.25}, | 21 | {"matrix": [0, 0], "x": 1, "y": 0.25}, |
| 19 | {"label":"W", "x":2, "y":0.125}, | 22 | {"matrix": [0, 1], "x": 2, "y": 0.125}, |
| 20 | {"label":"E", "x":3, "y":0}, | 23 | {"matrix": [0, 2], "x": 3, "y": 0}, |
| 21 | {"label":"R", "x":4, "y":0.125}, | 24 | {"matrix": [0, 3], "x": 4, "y": 0.125}, |
| 22 | {"label":"T", "x":5, "y":0.25}, | 25 | {"matrix": [0, 4], "x": 5, "y": 0.25}, |
| 23 | {"label":"Y", "x":8, "y":0.25}, | 26 | |
| 24 | {"label":"U", "x":9, "y":0.125}, | 27 | {"matrix": [0, 5], "x": 8, "y": 0.25}, |
| 25 | {"label":"I", "x":10, "y":0}, | 28 | {"matrix": [0, 6], "x": 9, "y": 0.125}, |
| 26 | {"label":"O", "x":11, "y":0.125}, | 29 | {"matrix": [0, 7], "x": 10, "y": 0}, |
| 27 | {"label":"P", "x":12, "y":0.25}, | 30 | {"matrix": [0, 8], "x": 11, "y": 0.125}, |
| 28 | {"label":"Backspace", "x":13, "y":0.25}, | 31 | {"matrix": [0, 9], "x": 12, "y": 0.25}, |
| 29 | {"label":"LCtrl", "x":0, "y":1.25}, | 32 | {"matrix": [4, 5], "x": 13, "y": 0.25}, |
| 30 | {"label":"A", "x":1, "y":1.25}, | 33 | |
| 31 | {"label":"S", "x":2, "y":1.125}, | 34 | {"matrix": [4, 3], "x": 0, "y": 1.25}, |
| 32 | {"label":"D", "x":3, "y":1}, | 35 | {"matrix": [1, 0], "x": 1, "y": 1.25}, |
| 33 | {"label":"F", "x":4, "y":1.125}, | 36 | {"matrix": [1, 1], "x": 2, "y": 1.125}, |
| 34 | {"label":"G", "x":5, "y":1.25}, | 37 | {"matrix": [1, 2], "x": 3, "y": 1}, |
| 35 | {"label":"H", "x":8, "y":1.25}, | 38 | {"matrix": [1, 3], "x": 4, "y": 1.125}, |
| 36 | {"label":"J", "x":9, "y":1.125}, | 39 | {"matrix": [1, 4], "x": 5, "y": 1.25}, |
| 37 | {"label":"K", "x":10, "y":1}, | 40 | |
| 38 | {"label":"L", "x":11, "y":1.125}, | 41 | {"matrix": [1, 5], "x": 8, "y": 1.25}, |
| 39 | {"label":";", "x":12, "y":1.25}, | 42 | {"matrix": [1, 6], "x": 9, "y": 1.125}, |
| 40 | {"label":"'", "x":13, "y":1.25}, | 43 | {"matrix": [1, 7], "x": 10, "y": 1}, |
| 41 | {"label":"Shift", "x":0, "y":2.25}, | 44 | {"matrix": [1, 8], "x": 11, "y": 1.125}, |
| 42 | {"label":"Z", "x":1, "y":2.25}, | 45 | {"matrix": [1, 9], "x": 12, "y": 1.25}, |
| 43 | {"label":"X", "x":2, "y":2.125}, | 46 | {"matrix": [4, 6], "x": 13, "y": 1.25}, |
| 44 | {"label":"C", "x":3, "y":2}, | 47 | |
| 45 | {"label":"V", "x":4, "y":2.125}, | 48 | {"matrix": [4, 2], "x": 0, "y": 2.25}, |
| 46 | {"label":"B", "x":5, "y":2.25}, | 49 | {"matrix": [2, 0], "x": 1, "y": 2.25}, |
| 47 | {"label":"N", "x":8, "y":2.25}, | 50 | {"matrix": [2, 1], "x": 2, "y": 2.125}, |
| 48 | {"label":"M", "x":9, "y":2.125}, | 51 | {"matrix": [2, 2], "x": 3, "y": 2}, |
| 49 | {"label":",", "x":10, "y":2}, | 52 | {"matrix": [2, 3], "x": 4, "y": 2.125}, |
| 50 | {"label":".", "x":11, "y":2.125}, | 53 | {"matrix": [2, 4], "x": 5, "y": 2.25}, |
| 51 | {"label":"/", "x":12, "y":2.25}, | 54 | |
| 52 | {"label":"Enter", "x":13, "y":2.25}, | 55 | {"matrix": [2, 5], "x": 8, "y": 2.25}, |
| 53 | {"label":"LGUI", "x":3.5, "y":3.125}, | 56 | {"matrix": [2, 6], "x": 9, "y": 2.125}, |
| 54 | {"label":"MO(_FN)", "x":4.5, "y":3.25}, | 57 | {"matrix": [2, 7], "x": 10, "y": 2}, |
| 55 | {"label":"Space", "x":5.5, "y":3.375}, | 58 | {"matrix": [2, 8], "x": 11, "y": 2.125}, |
| 56 | {"label":"Space", "x":7.5, "y":3.375}, | 59 | {"matrix": [2, 9], "x": 12, "y": 2.25}, |
| 57 | {"label":"MO(_NUM)", "x":8.5, "y":3.25}, | 60 | {"matrix": [4, 7], "x": 13, "y": 2.25}, |
| 58 | {"label":"RAlt", "x":9.5, "y":3.125} | 61 | |
| 62 | {"matrix": [3, 2], "x": 3.5, "y": 3.125}, | ||
| 63 | {"matrix": [3, 3], "x": 4.5, "y": 3.25}, | ||
| 64 | {"matrix": [3, 4], "x": 5.5, "y": 3.375}, | ||
| 65 | |||
| 66 | {"matrix": [3, 5], "x": 7.5, "y": 3.375}, | ||
| 67 | {"matrix": [3, 6], "x": 8.5, "y": 3.25}, | ||
| 68 | {"matrix": [3, 7], "x": 9.5, "y": 3.125} | ||
| 59 | ] | 69 | ] |
| 60 | }, | 70 | }, |
| 61 | "LAYOUT_split_3x5_3": { | 71 | "LAYOUT_split_3x5_3": { |
| 62 | "layout": [ | 72 | "layout": [ |
| 63 | {"label":"Q", "x":0, "y":0.25}, | 73 | {"matrix": [0, 0], "x": 0, "y": 0.25}, |
| 64 | {"label":"W", "x":1, "y":0.125}, | 74 | {"matrix": [0, 1], "x": 1, "y": 0.125}, |
| 65 | {"label":"E", "x":2, "y":0}, | 75 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 66 | {"label":"R", "x":3, "y":0.125}, | 76 | {"matrix": [0, 3], "x": 3, "y": 0.125}, |
| 67 | {"label":"T", "x":4, "y":0.25}, | 77 | {"matrix": [0, 4], "x": 4, "y": 0.25}, |
| 68 | {"label":"Y", "x":7, "y":0.25}, | 78 | |
| 69 | {"label":"U", "x":8, "y":0.125}, | 79 | {"matrix": [0, 5], "x": 7, "y": 0.25}, |
| 70 | {"label":"I", "x":9, "y":0}, | 80 | {"matrix": [0, 6], "x": 8, "y": 0.125}, |
| 71 | {"label":"O", "x":10, "y":0.125}, | 81 | {"matrix": [0, 7], "x": 9, "y": 0}, |
| 72 | {"label":"P", "x":11, "y":0.25}, | 82 | {"matrix": [0, 8], "x": 10, "y": 0.125}, |
| 73 | {"label":"A", "x":0, "y":1.25}, | 83 | {"matrix": [0, 9], "x": 11, "y": 0.25}, |
| 74 | {"label":"S", "x":1, "y":1.125}, | 84 | |
| 75 | {"label":"D", "x":2, "y":1}, | 85 | {"matrix": [1, 0], "x": 0, "y": 1.25}, |
| 76 | {"label":"F", "x":3, "y":1.125}, | 86 | {"matrix": [1, 1], "x": 1, "y": 1.125}, |
| 77 | {"label":"G", "x":4, "y":1.25}, | 87 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 78 | {"label":"H", "x":7, "y":1.25}, | 88 | {"matrix": [1, 3], "x": 3, "y": 1.125}, |
| 79 | {"label":"J", "x":8, "y":1.125}, | 89 | {"matrix": [1, 4], "x": 4, "y": 1.25}, |
| 80 | {"label":"K", "x":9, "y":1}, | 90 | |
| 81 | {"label":"L", "x":10, "y":1.125}, | 91 | {"matrix": [1, 5], "x": 7, "y": 1.25}, |
| 82 | {"label":";", "x":11, "y":1.25}, | 92 | {"matrix": [1, 6], "x": 8, "y": 1.125}, |
| 83 | {"label":"Z", "x":0, "y":2.25}, | 93 | {"matrix": [1, 7], "x": 9, "y": 1}, |
| 84 | {"label":"X", "x":1, "y":2.125}, | 94 | {"matrix": [1, 8], "x": 10, "y": 1.125}, |
| 85 | {"label":"C", "x":2, "y":2}, | 95 | {"matrix": [1, 9], "x": 11, "y": 1.25}, |
| 86 | {"label":"V", "x":3, "y":2.125}, | 96 | |
| 87 | {"label":"B", "x":4, "y":2.25}, | 97 | {"matrix": [2, 0], "x": 0, "y": 2.25}, |
| 88 | {"label":"N", "x":7, "y":2.25}, | 98 | {"matrix": [2, 1], "x": 1, "y": 2.125}, |
| 89 | {"label":"M", "x":8, "y":2.125}, | 99 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 90 | {"label":",", "x":9, "y":2}, | 100 | {"matrix": [2, 3], "x": 3, "y": 2.125}, |
| 91 | {"label":".", "x":10, "y":2.125}, | 101 | {"matrix": [2, 4], "x": 4, "y": 2.25}, |
| 92 | {"label":"/", "x":11, "y":2.25}, | 102 | |
| 93 | {"label":"LGUI", "x":2.5, "y":3.125}, | 103 | {"matrix": [2, 5], "x": 7, "y": 2.25}, |
| 94 | {"label":"MO(_FN)", "x":3.5, "y":3.25}, | 104 | {"matrix": [2, 6], "x": 8, "y": 2.125}, |
| 95 | {"label":"Space", "x":4.5, "y":3.375}, | 105 | {"matrix": [2, 7], "x": 9, "y": 2}, |
| 96 | {"label":"Space", "x":6.5, "y":3.375}, | 106 | {"matrix": [2, 8], "x": 10, "y": 2.125}, |
| 97 | {"label":"MO(_NUM)", "x":7.5, "y":3.25}, | 107 | {"matrix": [2, 9], "x": 11, "y": 2.25}, |
| 98 | {"label":"RAlt", "x":8.5, "y":3.125} | 108 | |
| 109 | {"matrix": [3, 2], "x": 2.5, "y": 3.125}, | ||
| 110 | {"matrix": [3, 3], "x": 3.5, "y": 3.25}, | ||
| 111 | {"matrix": [3, 4], "x": 4.5, "y": 3.375}, | ||
| 112 | |||
| 113 | {"matrix": [3, 5], "x": 6.5, "y": 3.375}, | ||
| 114 | {"matrix": [3, 6], "x": 7.5, "y": 3.25}, | ||
| 115 | {"matrix": [3, 7], "x": 8.5, "y": 3.125} | ||
| 99 | ] | 116 | ] |
| 100 | } | 117 | } |
| 101 | } | 118 | } |
diff --git a/keyboards/chocv/chocv.h b/keyboards/chocv/chocv.h deleted file mode 100644 index 2691dfcb83..0000000000 --- a/keyboards/chocv/chocv.h +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /* Copyright 2021 BrickBots Labs | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | |||
| 30 | |||
| 31 | #define LAYOUT_split_3x5_3( \ | ||
| 32 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\ | ||
| 33 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\ | ||
| 34 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\ | ||
| 35 | k30, k31, k32, k33, k34, k35 \ | ||
| 36 | ) \ | ||
| 37 | { \ | ||
| 38 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \ | ||
| 39 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \ | ||
| 40 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \ | ||
| 41 | { KC_NO, KC_NO, k30, k31, k32, k33, k34, k35, KC_NO, KC_NO} \ | ||
| 42 | } | ||
| 43 | |||
diff --git a/keyboards/chocv/info.json b/keyboards/chocv/info.json index 16ba0fe4d2..e5361b1399 100644 --- a/keyboards/chocv/info.json +++ b/keyboards/chocv/info.json | |||
| @@ -19,49 +19,49 @@ | |||
| 19 | "layouts": { | 19 | "layouts": { |
| 20 | "LAYOUT_split_3x5_3": { | 20 | "LAYOUT_split_3x5_3": { |
| 21 | "layout": [ | 21 | "layout": [ |
| 22 | {"label":"Q", "x":0, "y":0.3}, | 22 | {"matrix": [0, 0], "x": 0, "y": 0.3}, |
| 23 | {"label":"W", "x":1, "y":0.1}, | 23 | {"matrix": [0, 1], "x": 1, "y": 0.1}, |
| 24 | {"label":"E", "x":2, "y":0}, | 24 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 25 | {"label":"R", "x":3, "y":0.1}, | 25 | {"matrix": [0, 3], "x": 3, "y": 0.1}, |
| 26 | {"label":"T", "x":4, "y":0.2}, | 26 | {"matrix": [0, 4], "x": 4, "y": 0.2}, |
| 27 | 27 | ||
| 28 | {"label":"Y", "x":8, "y":0.2}, | 28 | {"matrix": [0, 5], "x": 8, "y": 0.2}, |
| 29 | {"label":"U", "x":9, "y":0.1}, | 29 | {"matrix": [0, 6], "x": 9, "y": 0.1}, |
| 30 | {"label":"I", "x":10, "y":0}, | 30 | {"matrix": [0, 7], "x": 10, "y": 0}, |
| 31 | {"label":"O", "x":11, "y":0.1}, | 31 | {"matrix": [0, 8], "x": 11, "y": 0.1}, |
| 32 | {"label":"P", "x":12, "y":0.3}, | 32 | {"matrix": [0, 9], "x": 12, "y": 0.3}, |
| 33 | 33 | ||
| 34 | {"label":"A", "x":0, "y":1.3}, | 34 | {"matrix": [1, 0], "x": 0, "y": 1.3}, |
| 35 | {"label":"S", "x":1, "y":1.1}, | 35 | {"matrix": [1, 1], "x": 1, "y": 1.1}, |
| 36 | {"label":"D", "x":2, "y":1}, | 36 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 37 | {"label":"F", "x":3, "y":1.1}, | 37 | {"matrix": [1, 3], "x": 3, "y": 1.1}, |
| 38 | {"label":"G", "x":4, "y":1.2}, | 38 | {"matrix": [1, 4], "x": 4, "y": 1.2}, |
| 39 | 39 | ||
| 40 | {"label":"H", "x":8, "y":1.2}, | 40 | {"matrix": [1, 5], "x": 8, "y": 1.2}, |
| 41 | {"label":"J", "x":9, "y":1.1}, | 41 | {"matrix": [1, 6], "x": 9, "y": 1.1}, |
| 42 | {"label":"K", "x":10, "y":1}, | 42 | {"matrix": [1, 7], "x": 10, "y": 1}, |
| 43 | {"label":"L", "x":11, "y":1.1}, | 43 | {"matrix": [1, 8], "x": 11, "y": 1.1}, |
| 44 | {"label":";", "x":12, "y":1.3}, | 44 | {"matrix": [1, 9], "x": 12, "y": 1.3}, |
| 45 | 45 | ||
| 46 | {"label":"Z", "x":0, "y":2.3}, | 46 | {"matrix": [2, 0], "x": 0, "y": 2.3}, |
| 47 | {"label":"X", "x":1, "y":2.1}, | 47 | {"matrix": [2, 1], "x": 1, "y": 2.1}, |
| 48 | {"label":"C", "x":2, "y":2}, | 48 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 49 | {"label":"V", "x":3, "y":2.1}, | 49 | {"matrix": [2, 3], "x": 3, "y": 2.1}, |
| 50 | {"label":"B", "x":4, "y":2.2}, | 50 | {"matrix": [2, 4], "x": 4, "y": 2.2}, |
| 51 | 51 | ||
| 52 | {"label":"N", "x":8, "y":2.2}, | 52 | {"matrix": [2, 5], "x": 8, "y": 2.2}, |
| 53 | {"label":"M", "x":9, "y":2.1}, | 53 | {"matrix": [2, 6], "x": 9, "y": 2.1}, |
| 54 | {"label":",", "x":10, "y":2}, | 54 | {"matrix": [2, 7], "x": 10, "y": 2}, |
| 55 | {"label":".", "x":11, "y":2.1}, | 55 | {"matrix": [2, 8], "x": 11, "y": 2.1}, |
| 56 | {"label":"/", "x":12, "y":2.3}, | 56 | {"matrix": [2, 9], "x": 12, "y": 2.3}, |
| 57 | 57 | ||
| 58 | {"label":"KC_LSFT", "x":3, "y":3.7}, | 58 | {"matrix": [3, 2], "x": 3, "y": 3.7}, |
| 59 | {"label":"LC_LALT", "x":4, "y":3.7}, | 59 | {"matrix": [3, 3], "x": 4, "y": 3.7}, |
| 60 | {"label":"KC_ENT", "x":5, "y":3.2, "h":1.5}, | 60 | {"matrix": [3, 4], "x": 5, "y": 3.2, "h": 1.5}, |
| 61 | 61 | ||
| 62 | {"label":"KC_SPC", "x":7, "y":3.2, "h":1.5}, | 62 | {"matrix": [3, 5], "x": 7, "y": 3.2, "h": 1.5}, |
| 63 | {"label":"KC_DEL", "x":8, "y":3.7}, | 63 | {"matrix": [3, 6], "x": 8, "y": 3.7}, |
| 64 | {"label":"KC_RCTL", "x":9, "y":3.7} | 64 | {"matrix": [3, 7], "x": 9, "y": 3.7} |
| 65 | ] | 65 | ] |
| 66 | } | 66 | } |
| 67 | } | 67 | } |
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json index 9f1b12ca25..0f254d380f 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json | |||
| @@ -14,107 +14,5 @@ | |||
| 14 | }, | 14 | }, |
| 15 | "diode_direction": "COL2ROW", | 15 | "diode_direction": "COL2ROW", |
| 16 | "processor": "atmega32u4", | 16 | "processor": "atmega32u4", |
| 17 | "community_layouts": ["split_3x5_3", "split_3x6_3"], | 17 | "community_layouts": ["split_3x5_3", "split_3x6_3"] |
| 18 | "layouts": { | ||
| 19 | "LAYOUT_split_3x6_3": { | ||
| 20 | "layout": [ | ||
| 21 | {"label":"Esc", "x":0, "y":0.3}, | ||
| 22 | {"label":"Q", "x":1, "y":0.3}, | ||
| 23 | {"label":"W", "x":2, "y":0.1}, | ||
| 24 | {"label":"E", "x":3, "y":0}, | ||
| 25 | {"label":"R", "x":4, "y":0.1}, | ||
| 26 | {"label":"T", "x":5, "y":0.2}, | ||
| 27 | |||
| 28 | {"label":"Y", "x":9, "y":0.2}, | ||
| 29 | {"label":"U", "x":10, "y":0.1}, | ||
| 30 | {"label":"I", "x":11, "y":0}, | ||
| 31 | {"label":"O", "x":12, "y":0.1}, | ||
| 32 | {"label":"P", "x":13, "y":0.3}, | ||
| 33 | {"label":"Back Space", "x":14, "y":0.3}, | ||
| 34 | |||
| 35 | {"label":"Ctrl / Tab", "x":0, "y":1.3}, | ||
| 36 | {"label":"A", "x":1, "y":1.3}, | ||
| 37 | {"label":"S", "x":2, "y":1.1}, | ||
| 38 | {"label":"D", "x":3, "y":1}, | ||
| 39 | {"label":"F", "x":4, "y":1.1}, | ||
| 40 | {"label":"G", "x":5, "y":1.2}, | ||
| 41 | |||
| 42 | {"label":"H", "x":9, "y":1.2}, | ||
| 43 | {"label":"J", "x":10, "y":1.1}, | ||
| 44 | {"label":"K", "x":11, "y":1}, | ||
| 45 | {"label":"L", "x":12, "y":1.1}, | ||
| 46 | {"label":";", "x":13, "y":1.3}, | ||
| 47 | {"label":"'", "x":14, "y":1.3}, | ||
| 48 | |||
| 49 | {"label":"Shift", "x":0, "y":2.3}, | ||
| 50 | {"label":"Z", "x":1, "y":2.3}, | ||
| 51 | {"label":"X", "x":2, "y":2.1}, | ||
| 52 | {"label":"C", "x":3, "y":2}, | ||
| 53 | {"label":"V", "x":4, "y":2.1}, | ||
| 54 | {"label":"B", "x":5, "y":2.2}, | ||
| 55 | |||
| 56 | {"label":"N", "x":9, "y":2.2}, | ||
| 57 | {"label":"M", "x":10, "y":2.1}, | ||
| 58 | {"label":",", "x":11, "y":2}, | ||
| 59 | {"label":".", "x":12, "y":2.1}, | ||
| 60 | {"label":"/", "x":13, "y":2.3}, | ||
| 61 | {"label":"Shift", "x":14, "y":2.3}, | ||
| 62 | |||
| 63 | {"label":"GUI", "x":4, "y":3.7}, | ||
| 64 | {"label":"Lower", "x":5, "y":3.7}, | ||
| 65 | {"label":"Space", "x":6, "y":3.2, "h":1.5}, | ||
| 66 | |||
| 67 | {"label":"Enter", "x":8, "y":3.2, "h":1.5}, | ||
| 68 | {"label":"Raise", "x":9, "y":3.7}, | ||
| 69 | {"label":"Alt", "x":10, "y":3.7} | ||
| 70 | ] | ||
| 71 | }, | ||
| 72 | "LAYOUT_split_3x5_3": { | ||
| 73 | "layout": [ | ||
| 74 | {"label":"Q", "x":0, "y":0.3}, | ||
| 75 | {"label":"W", "x":1, "y":0.1}, | ||
| 76 | {"label":"E", "x":2, "y":0}, | ||
| 77 | {"label":"R", "x":3, "y":0.1}, | ||
| 78 | {"label":"T", "x":4, "y":0.2}, | ||
| 79 | |||
| 80 | {"label":"Y", "x":8, "y":0.2}, | ||
| 81 | {"label":"U", "x":9, "y":0.1}, | ||
| 82 | {"label":"I", "x":10, "y":0}, | ||
| 83 | {"label":"O", "x":11, "y":0.1}, | ||
| 84 | {"label":"P", "x":12, "y":0.3}, | ||
| 85 | |||
| 86 | {"label":"A", "x":0, "y":1.3}, | ||
| 87 | {"label":"S", "x":1, "y":1.1}, | ||
| 88 | {"label":"D", "x":2, "y":1}, | ||
| 89 | {"label":"F", "x":3, "y":1.1}, | ||
| 90 | {"label":"G", "x":4, "y":1.2}, | ||
| 91 | |||
| 92 | {"label":"H", "x":8, "y":1.2}, | ||
| 93 | {"label":"J", "x":9, "y":1.1}, | ||
| 94 | {"label":"K", "x":10, "y":1}, | ||
| 95 | {"label":"L", "x":11, "y":1.1}, | ||
| 96 | {"label":";", "x":12, "y":1.3}, | ||
| 97 | |||
| 98 | {"label":"Z", "x":0, "y":2.3}, | ||
| 99 | {"label":"X", "x":1, "y":2.1}, | ||
| 100 | {"label":"C", "x":2, "y":2}, | ||
| 101 | {"label":"V", "x":3, "y":2.1}, | ||
| 102 | {"label":"B", "x":4, "y":2.2}, | ||
| 103 | |||
| 104 | {"label":"N", "x":8, "y":2.2}, | ||
| 105 | {"label":"M", "x":9, "y":2.1}, | ||
| 106 | {"label":",", "x":10, "y":2}, | ||
| 107 | {"label":".", "x":11, "y":2.1}, | ||
| 108 | {"label":"/", "x":12, "y":2.3}, | ||
| 109 | |||
| 110 | {"label":"GUI", "x":3, "y":3.7}, | ||
| 111 | {"label":"Lower", "x":4, "y":3.7}, | ||
| 112 | {"label":"Space", "x":5, "y":3.2, "h":1.5}, | ||
| 113 | |||
| 114 | {"label":"Enter", "x":7, "y":3.2, "h":1.5}, | ||
| 115 | {"label":"Raise", "x":8, "y":3.7}, | ||
| 116 | {"label":"Alt", "x":9, "y":3.7} | ||
| 117 | ] | ||
| 118 | } | ||
| 119 | } | ||
| 120 | } | 18 | } |
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json index 8c878dfcc8..c74336c5cd 100644 --- a/keyboards/crkbd/r2g/info.json +++ b/keyboards/crkbd/r2g/info.json | |||
| @@ -2,5 +2,110 @@ | |||
| 2 | "split": { | 2 | "split": { |
| 3 | "soft_serial_pin": "D2" | 3 | "soft_serial_pin": "D2" |
| 4 | }, | 4 | }, |
| 5 | "bootloader": "atmel-dfu" | 5 | "bootloader": "atmel-dfu", |
| 6 | "layout_aliases": { | ||
| 7 | "LAYOUT": "LAYOUT_split_3x6_3" | ||
| 8 | }, | ||
| 9 | "layouts": { | ||
| 10 | "LAYOUT_split_3x5_3": { | ||
| 11 | "layout": [ | ||
| 12 | {"matrix": [0, 1], "x": 0, "y": 0.3}, | ||
| 13 | {"matrix": [0, 2], "x": 1, "y": 0.1}, | ||
| 14 | {"matrix": [0, 3], "x": 2, "y": 0}, | ||
| 15 | {"matrix": [0, 4], "x": 3, "y": 0.1}, | ||
| 16 | {"matrix": [0, 5], "x": 4, "y": 0.2}, | ||
| 17 | |||
| 18 | {"matrix": [4, 5], "x": 8, "y": 0.2}, | ||
| 19 | {"matrix": [4, 4], "x": 9, "y": 0.1}, | ||
| 20 | {"matrix": [4, 3], "x": 10, "y": 0}, | ||
| 21 | {"matrix": [4, 2], "x": 11, "y": 0.1}, | ||
| 22 | {"matrix": [4, 1], "x": 12, "y": 0.3}, | ||
| 23 | |||
| 24 | {"matrix": [1, 1], "x": 0, "y": 1.3}, | ||
| 25 | {"matrix": [1, 2], "x": 1, "y": 1.1}, | ||
| 26 | {"matrix": [1, 3], "x": 2, "y": 1}, | ||
| 27 | {"matrix": [1, 4], "x": 3, "y": 1.1}, | ||
| 28 | {"matrix": [1, 5], "x": 4, "y": 1.2}, | ||
| 29 | |||
| 30 | {"matrix": [5, 5], "x": 8, "y": 1.2}, | ||
| 31 | {"matrix": [5, 4], "x": 9, "y": 1.1}, | ||
| 32 | {"matrix": [5, 3], "x": 10, "y": 1}, | ||
| 33 | {"matrix": [5, 2], "x": 11, "y": 1.1}, | ||
| 34 | {"matrix": [5, 1], "x": 12, "y": 1.3}, | ||
| 35 | |||
| 36 | {"matrix": [2, 1], "x": 0, "y": 2.3}, | ||
| 37 | {"matrix": [2, 2], "x": 1, "y": 2.1}, | ||
| 38 | {"matrix": [2, 3], "x": 2, "y": 2}, | ||
| 39 | {"matrix": [2, 4], "x": 3, "y": 2.1}, | ||
| 40 | {"matrix": [2, 5], "x": 4, "y": 2.2}, | ||
| 41 | |||
| 42 | {"matrix": [6, 5], "x": 8, "y": 2.2}, | ||
| 43 | {"matrix": [6, 4], "x": 9, "y": 2.1}, | ||
| 44 | {"matrix": [6, 3], "x": 10, "y": 2}, | ||
| 45 | {"matrix": [6, 2], "x": 11, "y": 2.1}, | ||
| 46 | {"matrix": [6, 1], "x": 12, "y": 2.3}, | ||
| 47 | |||
| 48 | {"matrix": [3, 3], "x": 3, "y": 3.7}, | ||
| 49 | {"matrix": [3, 4], "x": 4, "y": 3.7}, | ||
| 50 | {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, | ||
| 51 | |||
| 52 | {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, | ||
| 53 | {"matrix": [7, 4], "x": 8, "y": 3.7}, | ||
| 54 | {"matrix": [7, 3], "x": 9, "y": 3.7} | ||
| 55 | ] | ||
| 56 | }, | ||
| 57 | "LAYOUT_split_3x6_3": { | ||
| 58 | "layout": [ | ||
| 59 | {"matrix": [0, 0], "x": 0, "y": 0.3}, | ||
| 60 | {"matrix": [0, 1], "x": 1, "y": 0.3}, | ||
| 61 | {"matrix": [0, 2], "x": 2, "y": 0.1}, | ||
| 62 | {"matrix": [0, 3], "x": 3, "y": 0}, | ||
| 63 | {"matrix": [0, 4], "x": 4, "y": 0.1}, | ||
| 64 | {"matrix": [0, 5], "x": 5, "y": 0.2}, | ||
| 65 | |||
| 66 | {"matrix": [4, 5], "x": 9, "y": 0.2}, | ||
| 67 | {"matrix": [4, 4], "x": 10, "y": 0.1}, | ||
| 68 | {"matrix": [4, 3], "x": 11, "y": 0}, | ||
| 69 | {"matrix": [4, 2], "x": 12, "y": 0.1}, | ||
| 70 | {"matrix": [4, 1], "x": 13, "y": 0.3}, | ||
| 71 | {"matrix": [4, 0], "x": 14, "y": 0.3}, | ||
| 72 | |||
| 73 | {"matrix": [1, 0], "x": 0, "y": 1.3}, | ||
| 74 | {"matrix": [1, 1], "x": 1, "y": 1.3}, | ||
| 75 | {"matrix": [1, 2], "x": 2, "y": 1.1}, | ||
| 76 | {"matrix": [1, 3], "x": 3, "y": 1}, | ||
| 77 | {"matrix": [1, 4], "x": 4, "y": 1.1}, | ||
| 78 | {"matrix": [1, 5], "x": 5, "y": 1.2}, | ||
| 79 | |||
| 80 | {"matrix": [5, 5], "x": 9, "y": 1.2}, | ||
| 81 | {"matrix": [5, 4], "x": 10, "y": 1.1}, | ||
| 82 | {"matrix": [5, 3], "x": 11, "y": 1}, | ||
| 83 | {"matrix": [5, 2], "x": 12, "y": 1.1}, | ||
| 84 | {"matrix": [5, 1], "x": 13, "y": 1.3}, | ||
| 85 | {"matrix": [5, 0], "x": 14, "y": 1.3}, | ||
| 86 | |||
| 87 | {"matrix": [2, 0], "x": 0, "y": 2.3}, | ||
| 88 | {"matrix": [2, 1], "x": 1, "y": 2.3}, | ||
| 89 | {"matrix": [2, 2], "x": 2, "y": 2.1}, | ||
| 90 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 91 | {"matrix": [2, 4], "x": 4, "y": 2.1}, | ||
| 92 | {"matrix": [2, 5], "x": 5, "y": 2.2}, | ||
| 93 | |||
| 94 | {"matrix": [6, 5], "x": 9, "y": 2.2}, | ||
| 95 | {"matrix": [6, 4], "x": 10, "y": 2.1}, | ||
| 96 | {"matrix": [6, 3], "x": 11, "y": 2}, | ||
| 97 | {"matrix": [6, 2], "x": 12, "y": 2.1}, | ||
| 98 | {"matrix": [6, 1], "x": 13, "y": 2.3}, | ||
| 99 | {"matrix": [6, 0], "x": 14, "y": 2.3}, | ||
| 100 | |||
| 101 | {"matrix": [3, 3], "x": 4, "y": 3.7}, | ||
| 102 | {"matrix": [3, 4], "x": 5, "y": 3.7}, | ||
| 103 | {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, | ||
| 104 | |||
| 105 | {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, | ||
| 106 | {"matrix": [7, 4], "x": 9, "y": 3.7}, | ||
| 107 | {"matrix": [7, 3], "x": 10, "y": 3.7} | ||
| 108 | ] | ||
| 109 | } | ||
| 110 | } | ||
| 6 | } | 111 | } |
diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c index 7fb95c043c..a4d138b98a 100644 --- a/keyboards/crkbd/r2g/r2g.c +++ b/keyboards/crkbd/r2g/r2g.c | |||
| @@ -16,7 +16,7 @@ GNU General Public License for more details. | |||
| 16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
| 17 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 18 | */ | 18 | */ |
| 19 | #include "r2g.h" | 19 | #include "quantum.h" |
| 20 | 20 | ||
| 21 | #ifdef RGB_MATRIX_ENABLE | 21 | #ifdef RGB_MATRIX_ENABLE |
| 22 | 22 | ||
diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h deleted file mode 100644 index fd3cf557a7..0000000000 --- a/keyboards/crkbd/r2g/r2g.h +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2019 @foostan | ||
| 3 | Copyright 2020 Drashna Jaelre <@drashna> | ||
| 4 | |||
| 5 | This program is free software: you can redistribute it and/or modify | ||
| 6 | it under the terms of the GNU General Public License as published by | ||
| 7 | the Free Software Foundation, either version 2 of the License, or | ||
| 8 | (at your option) any later version. | ||
| 9 | |||
| 10 | This program is distributed in the hope that it will be useful, | ||
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | GNU General Public License for more details. | ||
| 14 | |||
| 15 | You should have received a copy of the GNU General Public License | ||
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | |||
| 23 | // clang-format off | ||
| 24 | #define LAYOUT_split_3x6_3( \ | ||
| 25 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 26 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 27 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 28 | L30, L31, L32, R30, R31, R32 \ | ||
| 29 | ) \ | ||
| 30 | { \ | ||
| 31 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 32 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 33 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 34 | { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
| 35 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 36 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 37 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 38 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | ||
| 39 | } | ||
| 40 | |||
| 41 | #define LAYOUT_split_3x5_3( \ | ||
| 42 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 43 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 44 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 45 | L30, L31, L32, R30, R31, R32 \ | ||
| 46 | ) \ | ||
| 47 | { \ | ||
| 48 | { KC_NO, L00, L01, L02, L03, L04 }, \ | ||
| 49 | { KC_NO, L10, L11, L12, L13, L14 }, \ | ||
| 50 | { KC_NO, L20, L21, L22, L23, L24 }, \ | ||
| 51 | { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
| 52 | { KC_NO, R04, R03, R02, R01, R00 }, \ | ||
| 53 | { KC_NO, R14, R13, R12, R11, R10 }, \ | ||
| 54 | { KC_NO, R24, R23, R22, R21, R20 }, \ | ||
| 55 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | ||
| 56 | } | ||
| 57 | |||
| 58 | |||
| 59 | #define LAYOUT LAYOUT_split_3x6_3 | ||
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json index 931c20aa4d..1226b3f69f 100644 --- a/keyboards/crkbd/rev1/info.json +++ b/keyboards/crkbd/rev1/info.json | |||
| @@ -2,5 +2,110 @@ | |||
| 2 | "split": { | 2 | "split": { |
| 3 | "soft_serial_pin": "D2" | 3 | "soft_serial_pin": "D2" |
| 4 | }, | 4 | }, |
| 5 | "bootloader": "caterina" | 5 | "bootloader": "caterina", |
| 6 | "layout_aliases": { | ||
| 7 | "LAYOUT": "LAYOUT_split_3x6_3" | ||
| 8 | }, | ||
| 9 | "layouts": { | ||
| 10 | "LAYOUT_split_3x5_3": { | ||
| 11 | "layout": [ | ||
| 12 | {"matrix": [0, 1], "x": 0, "y": 0.3}, | ||
| 13 | {"matrix": [0, 2], "x": 1, "y": 0.1}, | ||
| 14 | {"matrix": [0, 3], "x": 2, "y": 0}, | ||
| 15 | {"matrix": [0, 4], "x": 3, "y": 0.1}, | ||
| 16 | {"matrix": [0, 5], "x": 4, "y": 0.2}, | ||
| 17 | |||
| 18 | {"matrix": [4, 5], "x": 8, "y": 0.2}, | ||
| 19 | {"matrix": [4, 4], "x": 9, "y": 0.1}, | ||
| 20 | {"matrix": [4, 3], "x": 10, "y": 0}, | ||
| 21 | {"matrix": [4, 2], "x": 11, "y": 0.1}, | ||
| 22 | {"matrix": [4, 1], "x": 12, "y": 0.3}, | ||
| 23 | |||
| 24 | {"matrix": [1, 1], "x": 0, "y": 1.3}, | ||
| 25 | {"matrix": [1, 2], "x": 1, "y": 1.1}, | ||
| 26 | {"matrix": [1, 3], "x": 2, "y": 1}, | ||
| 27 | {"matrix": [1, 4], "x": 3, "y": 1.1}, | ||
| 28 | {"matrix": [1, 5], "x": 4, "y": 1.2}, | ||
| 29 | |||
| 30 | {"matrix": [5, 5], "x": 8, "y": 1.2}, | ||
| 31 | {"matrix": [5, 4], "x": 9, "y": 1.1}, | ||
| 32 | {"matrix": [5, 3], "x": 10, "y": 1}, | ||
| 33 | {"matrix": [5, 2], "x": 11, "y": 1.1}, | ||
| 34 | {"matrix": [5, 1], "x": 12, "y": 1.3}, | ||
| 35 | |||
| 36 | {"matrix": [2, 1], "x": 0, "y": 2.3}, | ||
| 37 | {"matrix": [2, 2], "x": 1, "y": 2.1}, | ||
| 38 | {"matrix": [2, 3], "x": 2, "y": 2}, | ||
| 39 | {"matrix": [2, 4], "x": 3, "y": 2.1}, | ||
| 40 | {"matrix": [2, 5], "x": 4, "y": 2.2}, | ||
| 41 | |||
| 42 | {"matrix": [6, 5], "x": 8, "y": 2.2}, | ||
| 43 | {"matrix": [6, 4], "x": 9, "y": 2.1}, | ||
| 44 | {"matrix": [6, 3], "x": 10, "y": 2}, | ||
| 45 | {"matrix": [6, 2], "x": 11, "y": 2.1}, | ||
| 46 | {"matrix": [6, 1], "x": 12, "y": 2.3}, | ||
| 47 | |||
| 48 | {"matrix": [3, 3], "x": 3, "y": 3.7}, | ||
| 49 | {"matrix": [3, 4], "x": 4, "y": 3.7}, | ||
| 50 | {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, | ||
| 51 | |||
| 52 | {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, | ||
| 53 | {"matrix": [7, 4], "x": 8, "y": 3.7}, | ||
| 54 | {"matrix": [7, 3], "x": 9, "y": 3.7} | ||
| 55 | ] | ||
| 56 | }, | ||
| 57 | "LAYOUT_split_3x6_3": { | ||
| 58 | "layout": [ | ||
| 59 | {"matrix": [0, 0], "x": 0, "y": 0.3}, | ||
| 60 | {"matrix": [0, 1], "x": 1, "y": 0.3}, | ||
| 61 | {"matrix": [0, 2], "x": 2, "y": 0.1}, | ||
| 62 | {"matrix": [0, 3], "x": 3, "y": 0}, | ||
| 63 | {"matrix": [0, 4], "x": 4, "y": 0.1}, | ||
| 64 | {"matrix": [0, 5], "x": 5, "y": 0.2}, | ||
| 65 | |||
| 66 | {"matrix": [4, 5], "x": 9, "y": 0.2}, | ||
| 67 | {"matrix": [4, 4], "x": 10, "y": 0.1}, | ||
| 68 | {"matrix": [4, 3], "x": 11, "y": 0}, | ||
| 69 | {"matrix": [4, 2], "x": 12, "y": 0.1}, | ||
| 70 | {"matrix": [4, 1], "x": 13, "y": 0.3}, | ||
| 71 | {"matrix": [4, 0], "x": 14, "y": 0.3}, | ||
| 72 | |||
| 73 | {"matrix": [1, 0], "x": 0, "y": 1.3}, | ||
| 74 | {"matrix": [1, 1], "x": 1, "y": 1.3}, | ||
| 75 | {"matrix": [1, 2], "x": 2, "y": 1.1}, | ||
| 76 | {"matrix": [1, 3], "x": 3, "y": 1}, | ||
| 77 | {"matrix": [1, 4], "x": 4, "y": 1.1}, | ||
| 78 | {"matrix": [1, 5], "x": 5, "y": 1.2}, | ||
| 79 | |||
| 80 | {"matrix": [5, 5], "x": 9, "y": 1.2}, | ||
| 81 | {"matrix": [5, 4], "x": 10, "y": 1.1}, | ||
| 82 | {"matrix": [5, 3], "x": 11, "y": 1}, | ||
| 83 | {"matrix": [5, 2], "x": 12, "y": 1.1}, | ||
| 84 | {"matrix": [5, 1], "x": 13, "y": 1.3}, | ||
| 85 | {"matrix": [5, 0], "x": 14, "y": 1.3}, | ||
| 86 | |||
| 87 | {"matrix": [2, 0], "x": 0, "y": 2.3}, | ||
| 88 | {"matrix": [2, 1], "x": 1, "y": 2.3}, | ||
| 89 | {"matrix": [2, 2], "x": 2, "y": 2.1}, | ||
| 90 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 91 | {"matrix": [2, 4], "x": 4, "y": 2.1}, | ||
| 92 | {"matrix": [2, 5], "x": 5, "y": 2.2}, | ||
| 93 | |||
| 94 | {"matrix": [6, 5], "x": 9, "y": 2.2}, | ||
| 95 | {"matrix": [6, 4], "x": 10, "y": 2.1}, | ||
| 96 | {"matrix": [6, 3], "x": 11, "y": 2}, | ||
| 97 | {"matrix": [6, 2], "x": 12, "y": 2.1}, | ||
| 98 | {"matrix": [6, 1], "x": 13, "y": 2.3}, | ||
| 99 | {"matrix": [6, 0], "x": 14, "y": 2.3}, | ||
| 100 | |||
| 101 | {"matrix": [3, 3], "x": 4, "y": 3.7}, | ||
| 102 | {"matrix": [3, 4], "x": 5, "y": 3.7}, | ||
| 103 | {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, | ||
| 104 | |||
| 105 | {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, | ||
| 106 | {"matrix": [7, 4], "x": 9, "y": 3.7}, | ||
| 107 | {"matrix": [7, 3], "x": 10, "y": 3.7} | ||
| 108 | ] | ||
| 109 | } | ||
| 110 | } | ||
| 6 | } | 111 | } |
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c index 63e4bed522..cb337d15bc 100644 --- a/keyboards/crkbd/rev1/rev1.c +++ b/keyboards/crkbd/rev1/rev1.c | |||
| @@ -15,7 +15,7 @@ GNU General Public License for more details. | |||
| 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include "rev1.h" | 18 | #include "quantum.h" |
| 19 | 19 | ||
| 20 | #ifdef RGB_MATRIX_ENABLE | 20 | #ifdef RGB_MATRIX_ENABLE |
| 21 | 21 | ||
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h deleted file mode 100644 index fd3cf557a7..0000000000 --- a/keyboards/crkbd/rev1/rev1.h +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2019 @foostan | ||
| 3 | Copyright 2020 Drashna Jaelre <@drashna> | ||
| 4 | |||
| 5 | This program is free software: you can redistribute it and/or modify | ||
| 6 | it under the terms of the GNU General Public License as published by | ||
| 7 | the Free Software Foundation, either version 2 of the License, or | ||
| 8 | (at your option) any later version. | ||
| 9 | |||
| 10 | This program is distributed in the hope that it will be useful, | ||
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | GNU General Public License for more details. | ||
| 14 | |||
| 15 | You should have received a copy of the GNU General Public License | ||
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | |||
| 23 | // clang-format off | ||
| 24 | #define LAYOUT_split_3x6_3( \ | ||
| 25 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 26 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 27 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 28 | L30, L31, L32, R30, R31, R32 \ | ||
| 29 | ) \ | ||
| 30 | { \ | ||
| 31 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 32 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 33 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 34 | { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
| 35 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 36 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 37 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 38 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | ||
| 39 | } | ||
| 40 | |||
| 41 | #define LAYOUT_split_3x5_3( \ | ||
| 42 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 43 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 44 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 45 | L30, L31, L32, R30, R31, R32 \ | ||
| 46 | ) \ | ||
| 47 | { \ | ||
| 48 | { KC_NO, L00, L01, L02, L03, L04 }, \ | ||
| 49 | { KC_NO, L10, L11, L12, L13, L14 }, \ | ||
| 50 | { KC_NO, L20, L21, L22, L23, L24 }, \ | ||
| 51 | { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
| 52 | { KC_NO, R04, R03, R02, R01, R00 }, \ | ||
| 53 | { KC_NO, R14, R13, R12, R11, R10 }, \ | ||
| 54 | { KC_NO, R24, R23, R22, R21, R20 }, \ | ||
| 55 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | ||
| 56 | } | ||
| 57 | |||
| 58 | |||
| 59 | #define LAYOUT LAYOUT_split_3x6_3 | ||
diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index 04bb07c0bc..657c8a9e51 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json | |||
| @@ -24,51 +24,55 @@ | |||
| 24 | "layouts": { | 24 | "layouts": { |
| 25 | "LAYOUT_split_3x6_3": { | 25 | "LAYOUT_split_3x6_3": { |
| 26 | "layout": [ | 26 | "layout": [ |
| 27 | {"label":"L00", "x":0, "y":0.875}, | 27 | {"matrix": [0, 0], "x": 0, "y": 0.875}, |
| 28 | {"label":"L01", "x":1, "y":0.625}, | 28 | {"matrix": [0, 1], "x": 1, "y": 0.625}, |
| 29 | {"label":"L02", "x":2, "y":0.375}, | 29 | {"matrix": [0, 2], "x": 2, "y": 0.375}, |
| 30 | {"label":"L03", "x":3, "y":0}, | 30 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 31 | {"label":"L04", "x":4, "y":0}, | 31 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 32 | {"label":"L05", "x":5, "y":0.125}, | 32 | {"matrix": [0, 5], "x": 5, "y": 0.125}, |
| 33 | {"label":"R00", "x":9, "y":0.125}, | ||
| 34 | {"label":"R01", "x":10, "y":0}, | ||
| 35 | {"label":"R02", "x":11, "y":0}, | ||
| 36 | {"label":"R03", "x":12, "y":0.375}, | ||
| 37 | {"label":"R04", "x":13, "y":0.625}, | ||
| 38 | {"label":"R05", "x":14, "y":0.875}, | ||
| 39 | 33 | ||
| 40 | {"label":"L10", "x":0, "y":1.875}, | 34 | {"matrix": [4, 5], "x": 9, "y": 0.125}, |
| 41 | {"label":"L11", "x":1, "y":1.625}, | 35 | {"matrix": [4, 4], "x": 10, "y": 0}, |
| 42 | {"label":"L12", "x":2, "y":1.375}, | 36 | {"matrix": [4, 3], "x": 11, "y": 0}, |
| 43 | {"label":"L13", "x":3, "y":1}, | 37 | {"matrix": [4, 2], "x": 12, "y": 0.375}, |
| 44 | {"label":"L14", "x":4, "y":1}, | 38 | {"matrix": [4, 1], "x": 13, "y": 0.625}, |
| 45 | {"label":"L15", "x":5, "y":1.125}, | 39 | {"matrix": [4, 0], "x": 14, "y": 0.875}, |
| 46 | {"label":"R10", "x":9, "y":1.125}, | ||
| 47 | {"label":"R11", "x":10, "y":1}, | ||
| 48 | {"label":"R12", "x":11, "y":1}, | ||
| 49 | {"label":"R13", "x":12, "y":1.375}, | ||
| 50 | {"label":"R14", "x":13, "y":1.625}, | ||
| 51 | {"label":"R15", "x":14, "y":1.875}, | ||
| 52 | 40 | ||
| 53 | {"label":"L20", "x":0, "y":2.875}, | 41 | {"matrix": [1, 0], "x": 0, "y": 1.875}, |
| 54 | {"label":"L21", "x":1, "y":2.625}, | 42 | {"matrix": [1, 1], "x": 1, "y": 1.625}, |
| 55 | {"label":"L22", "x":2, "y":2.375}, | 43 | {"matrix": [1, 2], "x": 2, "y": 1.375}, |
| 56 | {"label":"L23", "x":3, "y":2}, | 44 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 57 | {"label":"L24", "x":4, "y":2}, | 45 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 58 | {"label":"L25", "x":5, "y":2.125}, | 46 | {"matrix": [1, 5], "x": 5, "y": 1.125}, |
| 59 | {"label":"R20", "x":9, "y":2.125}, | ||
| 60 | {"label":"R21", "x":10, "y":2}, | ||
| 61 | {"label":"R22", "x":11, "y":2}, | ||
| 62 | {"label":"R23", "x":12, "y":2.375}, | ||
| 63 | {"label":"R24", "x":13, "y":2.625}, | ||
| 64 | {"label":"R25", "x":14, "y":2.875}, | ||
| 65 | 47 | ||
| 66 | {"label":"L30", "x":4, "y":3}, | 48 | {"matrix": [5, 5], "x": 9, "y": 1.125}, |
| 67 | {"label":"L31", "x":5, "y":3.125}, | 49 | {"matrix": [5, 4], "x": 10, "y": 1}, |
| 68 | {"label":"L32", "x":6, "y":3.375}, | 50 | {"matrix": [5, 3], "x": 11, "y": 1}, |
| 69 | {"label":"R30", "x":8, "y":3.375}, | 51 | {"matrix": [5, 2], "x": 12, "y": 1.375}, |
| 70 | {"label":"R31", "x":9, "y":3.125}, | 52 | {"matrix": [5, 1], "x": 13, "y": 1.625}, |
| 71 | {"label":"R32", "x":10, "y":3} | 53 | {"matrix": [5, 0], "x": 14, "y": 1.875}, |
| 54 | |||
| 55 | {"matrix": [2, 0], "x": 0, "y": 2.875}, | ||
| 56 | {"matrix": [2, 1], "x": 1, "y": 2.625}, | ||
| 57 | {"matrix": [2, 2], "x": 2, "y": 2.375}, | ||
| 58 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 59 | {"matrix": [2, 4], "x": 4, "y": 2}, | ||
| 60 | {"matrix": [2, 5], "x": 5, "y": 2.125}, | ||
| 61 | |||
| 62 | {"matrix": [6, 5], "x": 9, "y": 2.125}, | ||
| 63 | {"matrix": [6, 4], "x": 10, "y": 2}, | ||
| 64 | {"matrix": [6, 3], "x": 11, "y": 2}, | ||
| 65 | {"matrix": [6, 2], "x": 12, "y": 2.375}, | ||
| 66 | {"matrix": [6, 1], "x": 13, "y": 2.625}, | ||
| 67 | {"matrix": [6, 0], "x": 14, "y": 2.875}, | ||
| 68 | |||
| 69 | {"matrix": [3, 3], "x": 4, "y": 3}, | ||
| 70 | {"matrix": [3, 4], "x": 5, "y": 3.125}, | ||
| 71 | {"matrix": [3, 5], "x": 6, "y": 3.375}, | ||
| 72 | |||
| 73 | {"matrix": [7, 5], "x": 8, "y": 3.375}, | ||
| 74 | {"matrix": [7, 4], "x": 9, "y": 3.125}, | ||
| 75 | {"matrix": [7, 3], "x": 10, "y": 3} | ||
| 72 | ] | 76 | ] |
| 73 | } | 77 | } |
| 74 | } | 78 | } |
diff --git a/keyboards/dailycraft/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h deleted file mode 100644 index cd6e35a711..0000000000 --- a/keyboards/dailycraft/wings42/rev1/rev1.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* Copyright 2021 yfuku | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | #define LAYOUT_split_3x6_3( \ | ||
| 30 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 31 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 32 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 33 | L30, L31, L32, R30, R31, R32 \ | ||
| 34 | ) \ | ||
| 35 | { \ | ||
| 36 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 37 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 38 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 39 | { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
| 40 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 41 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 42 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 43 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | ||
| 44 | } | ||
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index f80dcd0dfe..09cf423e93 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json | |||
| @@ -21,55 +21,59 @@ | |||
| 21 | "layouts": { | 21 | "layouts": { |
| 22 | "LAYOUT_split_3x6_3_2": { | 22 | "LAYOUT_split_3x6_3_2": { |
| 23 | "layout": [ | 23 | "layout": [ |
| 24 | {"label":"L00", "x":0, "y":0.875}, | 24 | {"matrix": [0, 0], "x": 0, "y": 0.875}, |
| 25 | {"label":"L01", "x":1, "y":0.625}, | 25 | {"matrix": [0, 1], "x": 1, "y": 0.625}, |
| 26 | {"label":"L02", "x":2, "y":0.375}, | 26 | {"matrix": [0, 2], "x": 2, "y": 0.375}, |
| 27 | {"label":"L03", "x":3, "y":0}, | 27 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | {"label":"L04", "x":4, "y":0}, | 28 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 29 | {"label":"L05", "x":5, "y":0.125}, | 29 | {"matrix": [0, 5], "x": 5, "y": 0.125}, |
| 30 | {"label":"R00", "x":9, "y":0.125}, | ||
| 31 | {"label":"R01", "x":10, "y":0}, | ||
| 32 | {"label":"R02", "x":11, "y":0}, | ||
| 33 | {"label":"R03", "x":12, "y":0.375}, | ||
| 34 | {"label":"R04", "x":13, "y":0.625}, | ||
| 35 | {"label":"R05", "x":14, "y":0.875}, | ||
| 36 | 30 | ||
| 37 | {"label":"L10", "x":0, "y":1.875}, | 31 | {"matrix": [5, 5], "x": 9, "y": 0.125}, |
| 38 | {"label":"L11", "x":1, "y":1.625}, | 32 | {"matrix": [5, 4], "x": 10, "y": 0}, |
| 39 | {"label":"L12", "x":2, "y":1.375}, | 33 | {"matrix": [5, 3], "x": 11, "y": 0}, |
| 40 | {"label":"L13", "x":3, "y":1}, | 34 | {"matrix": [5, 2], "x": 12, "y": 0.375}, |
| 41 | {"label":"L14", "x":4, "y":1}, | 35 | {"matrix": [5, 1], "x": 13, "y": 0.625}, |
| 42 | {"label":"L15", "x":5, "y":1.125}, | 36 | {"matrix": [5, 0], "x": 14, "y": 0.875}, |
| 43 | {"label":"L31", "x":6, "y":1.625}, | ||
| 44 | {"label":"R33", "x":8, "y":1.625}, | ||
| 45 | {"label":"R10", "x":9, "y":1.125}, | ||
| 46 | {"label":"R11", "x":10, "y":1}, | ||
| 47 | {"label":"R12", "x":11, "y":1}, | ||
| 48 | {"label":"R13", "x":12, "y":1.375}, | ||
| 49 | {"label":"R14", "x":13, "y":1.625}, | ||
| 50 | {"label":"R15", "x":14, "y":1.875}, | ||
| 51 | 37 | ||
| 52 | {"label":"L20", "x":0, "y":2.875}, | 38 | {"matrix": [1, 0], "x": 0, "y": 1.875}, |
| 53 | {"label":"L21", "x":1, "y":2.625}, | 39 | {"matrix": [1, 1], "x": 1, "y": 1.625}, |
| 54 | {"label":"L22", "x":2, "y":2.375}, | 40 | {"matrix": [1, 2], "x": 2, "y": 1.375}, |
| 55 | {"label":"L23", "x":3, "y":2}, | 41 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 56 | {"label":"L24", "x":4, "y":2}, | 42 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 57 | {"label":"L25", "x":5, "y":2.125}, | 43 | {"matrix": [1, 5], "x": 5, "y": 1.125}, |
| 58 | {"label":"L32", "x":6, "y":2.625}, | 44 | {"matrix": [3, 1], "x": 6, "y": 1.625}, |
| 59 | {"label":"R34", "x":8, "y":2.625}, | ||
| 60 | {"label":"R20", "x":9, "y":2.125}, | ||
| 61 | {"label":"R21", "x":10, "y":2}, | ||
| 62 | {"label":"R22", "x":11, "y":2}, | ||
| 63 | {"label":"R23", "x":12, "y":2.375}, | ||
| 64 | {"label":"R24", "x":13, "y":2.625}, | ||
| 65 | {"label":"R25", "x":14, "y":2.875}, | ||
| 66 | 45 | ||
| 67 | {"label":"L33", "x":4, "y":3}, | 46 | {"matrix": [8, 2], "x": 8, "y": 1.625}, |
| 68 | {"label":"L34", "x":5, "y":3.125}, | 47 | {"matrix": [6, 5], "x": 9, "y": 1.125}, |
| 69 | {"label":"L35", "x":6, "y":3.375}, | 48 | {"matrix": [6, 4], "x": 10, "y": 1}, |
| 70 | {"label":"R30", "x":8, "y":3.375}, | 49 | {"matrix": [6, 3], "x": 11, "y": 1}, |
| 71 | {"label":"R31", "x":9, "y":3.125}, | 50 | {"matrix": [6, 2], "x": 12, "y": 1.375}, |
| 72 | {"label":"R32", "x":10, "y":3} | 51 | {"matrix": [6, 1], "x": 13, "y": 1.625}, |
| 52 | {"matrix": [6, 0], "x": 14, "y": 1.875}, | ||
| 53 | |||
| 54 | {"matrix": [2, 0], "x": 0, "y": 2.875}, | ||
| 55 | {"matrix": [2, 1], "x": 1, "y": 2.625}, | ||
| 56 | {"matrix": [2, 2], "x": 2, "y": 2.375}, | ||
| 57 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 58 | {"matrix": [2, 4], "x": 4, "y": 2}, | ||
| 59 | {"matrix": [2, 5], "x": 5, "y": 2.125}, | ||
| 60 | {"matrix": [3, 2], "x": 6, "y": 2.625}, | ||
| 61 | |||
| 62 | {"matrix": [8, 1], "x": 8, "y": 2.625}, | ||
| 63 | {"matrix": [7, 5], "x": 9, "y": 2.125}, | ||
| 64 | {"matrix": [7, 4], "x": 10, "y": 2}, | ||
| 65 | {"matrix": [7, 3], "x": 11, "y": 2}, | ||
| 66 | {"matrix": [7, 2], "x": 12, "y": 2.375}, | ||
| 67 | {"matrix": [7, 1], "x": 13, "y": 2.625}, | ||
| 68 | {"matrix": [7, 0], "x": 14, "y": 2.875}, | ||
| 69 | |||
| 70 | {"matrix": [3, 3], "x": 4, "y": 3}, | ||
| 71 | {"matrix": [3, 4], "x": 5, "y": 3.125}, | ||
| 72 | {"matrix": [3, 5], "x": 6, "y": 3.375}, | ||
| 73 | |||
| 74 | {"matrix": [8, 5], "x": 8, "y": 3.375}, | ||
| 75 | {"matrix": [8, 4], "x": 9, "y": 3.125}, | ||
| 76 | {"matrix": [8, 3], "x": 10, "y": 3} | ||
| 73 | ] | 77 | ] |
| 74 | } | 78 | } |
| 75 | } | 79 | } |
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h deleted file mode 100644 index 4720592264..0000000000 --- a/keyboards/dailycraft/wings42/rev2/rev2.h +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | /* Copyright 2021 yfuku | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | #define LAYOUT_split_3x6_3_2( \ | ||
| 30 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 31 | L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \ | ||
| 32 | L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \ | ||
| 33 | L33, L34, L35, R30, R31, R32 \ | ||
| 34 | ) \ | ||
| 35 | { \ | ||
| 36 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 37 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 38 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 39 | { KC_NO, L31, L32, L33, L34, L35 }, \ | ||
| 40 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 41 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 42 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 43 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 44 | { KC_NO, R34, R33, R32, R31, R30 }, \ | ||
| 45 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ | ||
| 46 | } | ||
diff --git a/keyboards/dumbo/dumbo.h b/keyboards/dumbo/dumbo.h deleted file mode 100644 index bd1d02f8ec..0000000000 --- a/keyboards/dumbo/dumbo.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* Copyright 2020 Adam Naldal <adamnaldal@gmail.com> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the keys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | |||
| 29 | #define LAYOUT_split_3x6_4( \ | ||
| 30 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 31 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 32 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 33 | L30, L31, L32, L33, R30, R31, R32, R33 \ | ||
| 34 | ) \ | ||
| 35 | { \ | ||
| 36 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 37 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 38 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 39 | { KC_NO, KC_NO, L30, L31, L32, L33 }, \ | ||
| 40 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 41 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 42 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 43 | { KC_NO, KC_NO, R33, R32, R31, R30 } \ | ||
| 44 | } | ||
diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json index 5b4a7bb23a..faf59b7ecc 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/info.json | |||
| @@ -35,57 +35,57 @@ | |||
| 35 | "layouts": { | 35 | "layouts": { |
| 36 | "LAYOUT_split_3x6_4": { | 36 | "LAYOUT_split_3x6_4": { |
| 37 | "layout": [ | 37 | "layout": [ |
| 38 | {"x":0, "y":1.25}, | 38 | {"matrix": [0, 0], "x": 0, "y": 1.25}, |
| 39 | {"x":1, "y":1}, | 39 | {"matrix": [0, 1], "x": 1, "y": 1}, |
| 40 | {"x":2, "y":0.25}, | 40 | {"matrix": [0, 2], "x": 2, "y": 0.25}, |
| 41 | {"x":3, "y":0}, | 41 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 42 | {"x":4, "y":0.5}, | 42 | {"matrix": [0, 4], "x": 4, "y": 0.5}, |
| 43 | {"x":5, "y":0.75}, | 43 | {"matrix": [0, 5], "x": 5, "y": 0.75}, |
| 44 | 44 | ||
| 45 | {"x":9.5, "y":0.75}, | 45 | {"matrix": [4, 5], "x": 9.5, "y": 0.75}, |
| 46 | {"x":10.5, "y":0.5}, | 46 | {"matrix": [4, 4], "x": 10.5, "y": 0.5}, |
| 47 | {"x":11.5, "y":0}, | 47 | {"matrix": [4, 3], "x": 11.5, "y": 0}, |
| 48 | {"x":12.5, "y":0.25}, | 48 | {"matrix": [4, 2], "x": 12.5, "y": 0.25}, |
| 49 | {"x":13.5, "y":1}, | 49 | {"matrix": [4, 1], "x": 13.5, "y": 1}, |
| 50 | {"x":14.5, "y":1.25}, | 50 | {"matrix": [4, 0], "x": 14.5, "y": 1.25}, |
| 51 | 51 | ||
| 52 | {"x":0, "y":2.25}, | 52 | {"matrix": [1, 0], "x": 0, "y": 2.25}, |
| 53 | {"x":1, "y":2}, | 53 | {"matrix": [1, 1], "x": 1, "y": 2}, |
| 54 | {"x":2, "y":1.25}, | 54 | {"matrix": [1, 2], "x": 2, "y": 1.25}, |
| 55 | {"x":3, "y":1}, | 55 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 56 | {"x":4, "y":1.5}, | 56 | {"matrix": [1, 4], "x": 4, "y": 1.5}, |
| 57 | {"x":5, "y":1.75}, | 57 | {"matrix": [1, 5], "x": 5, "y": 1.75}, |
| 58 | 58 | ||
| 59 | {"x":9.5, "y":1.75}, | 59 | {"matrix": [5, 5], "x": 9.5, "y": 1.75}, |
| 60 | {"x":10.5, "y":1.5}, | 60 | {"matrix": [5, 4], "x": 10.5, "y": 1.5}, |
| 61 | {"x":11.5, "y":1}, | 61 | {"matrix": [5, 3], "x": 11.5, "y": 1}, |
| 62 | {"x":12.5, "y":1.25}, | 62 | {"matrix": [5, 2], "x": 12.5, "y": 1.25}, |
| 63 | {"x":13.5, "y":2}, | 63 | {"matrix": [5, 1], "x": 13.5, "y": 2}, |
| 64 | {"x":14.5, "y":2.25}, | 64 | {"matrix": [5, 0], "x": 14.5, "y": 2.25}, |
| 65 | 65 | ||
| 66 | {"x":0, "y":3.25}, | 66 | {"matrix": [2, 0], "x": 0, "y": 3.25}, |
| 67 | {"x":1, "y":3}, | 67 | {"matrix": [2, 1], "x": 1, "y": 3}, |
| 68 | {"x":2, "y":2.25}, | 68 | {"matrix": [2, 2], "x": 2, "y": 2.25}, |
| 69 | {"x":3, "y":2}, | 69 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 70 | {"x":4, "y":2.5}, | 70 | {"matrix": [2, 4], "x": 4, "y": 2.5}, |
| 71 | {"x":5, "y":2.75}, | 71 | {"matrix": [2, 5], "x": 5, "y": 2.75}, |
| 72 | 72 | ||
| 73 | {"x":9.5, "y":2.75}, | 73 | {"matrix": [6, 5], "x": 9.5, "y": 2.75}, |
| 74 | {"x":10.5, "y":2.5}, | 74 | {"matrix": [6, 4], "x": 10.5, "y": 2.5}, |
| 75 | {"x":11.5, "y":2}, | 75 | {"matrix": [6, 3], "x": 11.5, "y": 2}, |
| 76 | {"x":12.5, "y":2.25}, | 76 | {"matrix": [6, 2], "x": 12.5, "y": 2.25}, |
| 77 | {"x":13.5, "y":3}, | 77 | {"matrix": [6, 1], "x": 13.5, "y": 3}, |
| 78 | {"x":14.5, "y":3.25}, | 78 | {"matrix": [6, 0], "x": 14.5, "y": 3.25}, |
| 79 | 79 | ||
| 80 | {"x":3.25, "y":3.75}, | 80 | {"matrix": [3, 2], "x": 3.25, "y": 3.75}, |
| 81 | {"x":4.25, "y":3.75, "h":1.5}, | 81 | {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5}, |
| 82 | {"x":5.25, "y":3.75, "h":1.5}, | 82 | {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5}, |
| 83 | {"x":6.25, "y":4.25}, | 83 | {"matrix": [3, 5], "x": 6.25, "y": 4.25}, |
| 84 | 84 | ||
| 85 | {"x":8.25, "y":4.25}, | 85 | {"matrix": [7, 5], "x": 8.25, "y": 4.25}, |
| 86 | {"x":9.25, "y":3.75, "h":1.5}, | 86 | {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5}, |
| 87 | {"x":10.25, "y":3.75, "h":1.5}, | 87 | {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5}, |
| 88 | {"x":11.25, "y":3.75} | 88 | {"matrix": [7, 2], "x": 11.25, "y": 3.75} |
| 89 | ] | 89 | ] |
| 90 | } | 90 | } |
| 91 | } | 91 | } |
diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/info.json new file mode 100644 index 0000000000..3091643e4f --- /dev/null +++ b/keyboards/eek/silk_down/info.json | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | { | ||
| 2 | "layouts": { | ||
| 3 | "LAYOUT_split_3x5_3": { | ||
| 4 | "layout": [ | ||
| 5 | {"matrix": [0, 0], "x": 0, "y": 0.88}, | ||
| 6 | {"matrix": [0, 1], "x": 1, "y": 0.38}, | ||
| 7 | {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| 8 | {"matrix": [0, 3], "x": 3, "y": 0.38}, | ||
| 9 | {"matrix": [0, 4], "x": 4, "y": 0.5}, | ||
| 10 | |||
| 11 | {"matrix": [0, 5], "x": 6, "y": 0.5}, | ||
| 12 | {"matrix": [0, 6], "x": 7, "y": 0.38}, | ||
| 13 | {"matrix": [0, 7], "x": 8, "y": 0}, | ||
| 14 | {"matrix": [0, 8], "x": 9, "y": 0.38}, | ||
| 15 | {"matrix": [0, 9], "x": 10, "y": 0.88}, | ||
| 16 | |||
| 17 | {"matrix": [1, 0], "x": 0, "y": 1.88}, | ||
| 18 | {"matrix": [1, 1], "x": 1, "y": 1.38}, | ||
| 19 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 20 | {"matrix": [1, 3], "x": 3, "y": 1.38}, | ||
| 21 | {"matrix": [1, 4], "x": 4, "y": 1.5}, | ||
| 22 | |||
| 23 | {"matrix": [1, 5], "x": 6, "y": 1.5}, | ||
| 24 | {"matrix": [1, 6], "x": 7, "y": 1.38}, | ||
| 25 | {"matrix": [1, 7], "x": 8, "y": 1}, | ||
| 26 | {"matrix": [1, 8], "x": 9, "y": 1.38}, | ||
| 27 | {"matrix": [1, 9], "x": 10, "y": 1.88}, | ||
| 28 | |||
| 29 | {"matrix": [2, 0], "x": 0, "y": 2.88}, | ||
| 30 | {"matrix": [2, 1], "x": 1, "y": 2.38}, | ||
| 31 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 32 | {"matrix": [2, 3], "x": 3, "y": 2.38}, | ||
| 33 | {"matrix": [2, 4], "x": 4, "y": 2.5}, | ||
| 34 | |||
| 35 | {"matrix": [2, 5], "x": 6, "y": 2.5}, | ||
| 36 | {"matrix": [2, 6], "x": 7, "y": 2.38}, | ||
| 37 | {"matrix": [2, 7], "x": 8, "y": 2}, | ||
| 38 | {"matrix": [2, 8], "x": 9, "y": 2.38}, | ||
| 39 | {"matrix": [2, 9], "x": 10, "y": 2.88}, | ||
| 40 | |||
| 41 | {"matrix": [3, 2], "x": 2, "y": 3.25}, | ||
| 42 | {"matrix": [3, 3], "x": 3, "y": 3.38}, | ||
| 43 | {"matrix": [3, 4], "x": 4, "y": 3.5}, | ||
| 44 | |||
| 45 | {"matrix": [3, 5], "x": 6, "y": 3.5}, | ||
| 46 | {"matrix": [3, 6], "x": 7, "y": 3.38}, | ||
| 47 | {"matrix": [3, 7], "x": 8, "y": 3.25} | ||
| 48 | ] | ||
| 49 | } | ||
| 50 | } | ||
| 51 | } \ No newline at end of file | ||
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h deleted file mode 100644 index 23ff61e58f..0000000000 --- a/keyboards/eek/silk_down/silk_down.h +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | /* Copyright 2020 klackygears | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the keys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT_split_3x5_3( \ | ||
| 29 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ | ||
| 30 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ | ||
| 31 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ | ||
| 32 | K32, K33, K34, K35, K36, K37 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ | ||
| 36 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ | ||
| 37 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ | ||
| 38 | { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \ | ||
| 39 | } | ||
diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/info.json new file mode 100644 index 0000000000..a810549d55 --- /dev/null +++ b/keyboards/eek/silk_up/info.json | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | { | ||
| 2 | "layouts": { | ||
| 3 | "LAYOUT_split_3x5_3": { | ||
| 4 | "layout": [ | ||
| 5 | {"matrix": [0, 9], "x": 0, "y": 0.88}, | ||
| 6 | {"matrix": [0, 8], "x": 1, "y": 0.38}, | ||
| 7 | {"matrix": [0, 7], "x": 2, "y": 0}, | ||
| 8 | {"matrix": [0, 6], "x": 3, "y": 0.38}, | ||
| 9 | {"matrix": [0, 5], "x": 4, "y": 0.5}, | ||
| 10 | |||
| 11 | {"matrix": [0, 4], "x": 6, "y": 0.5}, | ||
| 12 | {"matrix": [0, 3], "x": 7, "y": 0.38}, | ||
| 13 | {"matrix": [0, 2], "x": 8, "y": 0}, | ||
| 14 | {"matrix": [0, 1], "x": 9, "y": 0.38}, | ||
| 15 | {"matrix": [0, 0], "x": 10, "y": 0.88}, | ||
| 16 | |||
| 17 | {"matrix": [1, 9], "x": 0, "y": 1.88}, | ||
| 18 | {"matrix": [1, 8], "x": 1, "y": 1.38}, | ||
| 19 | {"matrix": [1, 7], "x": 2, "y": 1}, | ||
| 20 | {"matrix": [1, 6], "x": 3, "y": 1.38}, | ||
| 21 | {"matrix": [1, 5], "x": 4, "y": 1.5}, | ||
| 22 | |||
| 23 | {"matrix": [1, 4], "x": 6, "y": 1.5}, | ||
| 24 | {"matrix": [1, 3], "x": 7, "y": 1.38}, | ||
| 25 | {"matrix": [1, 2], "x": 8, "y": 1}, | ||
| 26 | {"matrix": [1, 1], "x": 9, "y": 1.38}, | ||
| 27 | {"matrix": [1, 0], "x": 10, "y": 1.88}, | ||
| 28 | |||
| 29 | {"matrix": [2, 9], "x": 0, "y": 2.88}, | ||
| 30 | {"matrix": [2, 8], "x": 1, "y": 2.38}, | ||
| 31 | {"matrix": [2, 7], "x": 2, "y": 2}, | ||
| 32 | {"matrix": [2, 6], "x": 3, "y": 2.38}, | ||
| 33 | {"matrix": [2, 5], "x": 4, "y": 2.5}, | ||
| 34 | |||
| 35 | {"matrix": [2, 4], "x": 6, "y": 2.5}, | ||
| 36 | {"matrix": [2, 3], "x": 7, "y": 2.38}, | ||
| 37 | {"matrix": [2, 2], "x": 8, "y": 2}, | ||
| 38 | {"matrix": [2, 1], "x": 9, "y": 2.38}, | ||
| 39 | {"matrix": [2, 0], "x": 10, "y": 2.88}, | ||
| 40 | |||
| 41 | {"matrix": [3, 7], "x": 2, "y": 3.25}, | ||
| 42 | {"matrix": [3, 6], "x": 3, "y": 3.38}, | ||
| 43 | {"matrix": [3, 5], "x": 4, "y": 3.5}, | ||
| 44 | |||
| 45 | {"matrix": [3, 4], "x": 6, "y": 3.5}, | ||
| 46 | {"matrix": [3, 3], "x": 7, "y": 3.38}, | ||
| 47 | {"matrix": [3, 2], "x": 8, "y": 3.25} | ||
| 48 | ] | ||
| 49 | } | ||
| 50 | } | ||
| 51 | } \ No newline at end of file | ||
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h deleted file mode 100644 index eebcc8fd2e..0000000000 --- a/keyboards/eek/silk_up/silk_up.h +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | /* Copyright 2020 klackygears | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the keys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT_split_3x5_3( \ | ||
| 29 | K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, \ | ||
| 30 | K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, \ | ||
| 31 | K29, K28, K27, K26, K25, K24, K23, K22, K21, K20, \ | ||
| 32 | K37, K36, K35, K34, K33, K32 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ | ||
| 36 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ | ||
| 37 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ | ||
| 38 | { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \ | ||
| 39 | } | ||
diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h deleted file mode 100644 index 2f58831df7..0000000000 --- a/keyboards/ferris/0_1/0_1.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | #include "quantum.h" | ||
| 21 | |||
| 22 | // clang-format off | ||
| 23 | |||
| 24 | /* left hand right hand */ | ||
| 25 | #define LAYOUT_split_3x5_2(\ | ||
| 26 | K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ | ||
| 27 | K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ | ||
| 28 | K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ | ||
| 29 | K3_3, K3_4, K3_5, K3_6)\ | ||
| 30 | /* matrix positions */\ | ||
| 31 | {\ | ||
| 32 | {K0_0, K0_1, K0_2, K0_3, K0_4},\ | ||
| 33 | {K1_0, K1_1, K1_2, K1_3, K1_4},\ | ||
| 34 | {K2_0, K2_1, K2_2, K2_3, K2_4},\ | ||
| 35 | {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ | ||
| 36 | \ | ||
| 37 | {K0_5, K0_6, K0_7, K0_8, K0_9},\ | ||
| 38 | {K1_5, K1_6, K1_7, K1_8, K1_9},\ | ||
| 39 | {K2_5, K2_6, K2_7, K2_8, K2_9},\ | ||
| 40 | {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ | ||
| 41 | } | ||
| 42 | |||
| 43 | // clang-format on | ||
| 44 | #define LAYOUT LAYOUT_split_3x5_2 | ||
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 0738a0491f..5a65369f61 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json | |||
| @@ -9,50 +9,53 @@ | |||
| 9 | "processor": "atmega32u4", | 9 | "processor": "atmega32u4", |
| 10 | "bootloader": "atmel-dfu", | 10 | "bootloader": "atmel-dfu", |
| 11 | "community_layouts": ["split_3x5_2"], | 11 | "community_layouts": ["split_3x5_2"], |
| 12 | "layout_aliases": { | ||
| 13 | "LAYOUT": "LAYOUT_split_3x5_2" | ||
| 14 | }, | ||
| 12 | "layouts": { | 15 | "layouts": { |
| 13 | "LAYOUT_split_3x5_2": { | 16 | "LAYOUT_split_3x5_2": { |
| 14 | "layout": [ | 17 | "layout": [ |
| 15 | {"x": 0, "y": 0.93}, | 18 | {"matrix": [0, 0], "x": 0, "y": 0.93}, |
| 16 | {"x": 1, "y": 0.31}, | 19 | {"matrix": [0, 1], "x": 1, "y": 0.31}, |
| 17 | {"x": 2, "y": 0}, | 20 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 18 | {"x": 3, "y": 0.28}, | 21 | {"matrix": [0, 3], "x": 3, "y": 0.28}, |
| 19 | {"x": 4, "y": 0.42}, | 22 | {"matrix": [0, 4], "x": 4, "y": 0.42}, |
| 20 | 23 | ||
| 21 | {"x": 7, "y": 0.42}, | 24 | {"matrix": [4, 0], "x": 7, "y": 0.42}, |
| 22 | {"x": 8, "y": 0.28}, | 25 | {"matrix": [4, 1], "x": 8, "y": 0.28}, |
| 23 | {"x": 9, "y": 0}, | 26 | {"matrix": [4, 2], "x": 9, "y": 0}, |
| 24 | {"x": 10, "y": 0.31}, | 27 | {"matrix": [4, 3], "x": 10, "y": 0.31}, |
| 25 | {"x": 11, "y": 0.93}, | 28 | {"matrix": [4, 4], "x": 11, "y": 0.93}, |
| 26 | 29 | ||
| 27 | {"x": 0, "y": 1.93}, | 30 | {"matrix": [1, 0], "x": 0, "y": 1.93}, |
| 28 | {"x": 1, "y": 1.31}, | 31 | {"matrix": [1, 1], "x": 1, "y": 1.31}, |
| 29 | {"x": 2, "y": 1}, | 32 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 30 | {"x": 3, "y": 1.28}, | 33 | {"matrix": [1, 3], "x": 3, "y": 1.28}, |
| 31 | {"x": 4, "y": 1.42}, | 34 | {"matrix": [1, 4], "x": 4, "y": 1.42}, |
| 32 | 35 | ||
| 33 | {"x": 7, "y": 1.42}, | 36 | {"matrix": [5, 0], "x": 7, "y": 1.42}, |
| 34 | {"x": 8, "y": 1.28}, | 37 | {"matrix": [5, 1], "x": 8, "y": 1.28}, |
| 35 | {"x": 9, "y": 1}, | 38 | {"matrix": [5, 2], "x": 9, "y": 1}, |
| 36 | {"x": 10, "y": 1.31}, | 39 | {"matrix": [5, 3], "x": 10, "y": 1.31}, |
| 37 | {"x": 11, "y": 1.93}, | 40 | {"matrix": [5, 4], "x": 11, "y": 1.93}, |
| 38 | 41 | ||
| 39 | {"x": 0, "y": 2.93}, | 42 | {"matrix": [2, 0], "x": 0, "y": 2.93}, |
| 40 | {"x": 1, "y": 2.31}, | 43 | {"matrix": [2, 1], "x": 1, "y": 2.31}, |
| 41 | {"x": 2, "y": 2}, | 44 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 42 | {"x": 3, "y": 2.28}, | 45 | {"matrix": [2, 3], "x": 3, "y": 2.28}, |
| 43 | {"x": 4, "y": 2.42}, | 46 | {"matrix": [2, 4], "x": 4, "y": 2.42}, |
| 44 | 47 | ||
| 45 | {"x": 7, "y": 2.42}, | 48 | {"matrix": [6, 0], "x": 7, "y": 2.42}, |
| 46 | {"x": 8, "y": 2.28}, | 49 | {"matrix": [6, 1], "x": 8, "y": 2.28}, |
| 47 | {"x": 9, "y": 2}, | 50 | {"matrix": [6, 2], "x": 9, "y": 2}, |
| 48 | {"x": 10, "y": 2.31}, | 51 | {"matrix": [6, 3], "x": 10, "y": 2.31}, |
| 49 | {"x": 11, "y": 2.93}, | 52 | {"matrix": [6, 4], "x": 11, "y": 2.93}, |
| 50 | 53 | ||
| 51 | {"x": 3.5, "y": 3.75}, | 54 | {"matrix": [3, 3], "x": 3.5, "y": 3.75}, |
| 52 | {"x": 4.5, "y": 4}, | 55 | {"matrix": [3, 4], "x": 4.5, "y": 4}, |
| 53 | 56 | ||
| 54 | {"x": 6.5, "y": 4}, | 57 | {"matrix": [7, 0], "x": 6.5, "y": 4}, |
| 55 | {"x": 7.5, "y": 3.75} | 58 | {"matrix": [7, 1], "x": 7.5, "y": 3.75} |
| 56 | ] | 59 | ] |
| 57 | } | 60 | } |
| 58 | } | 61 | } |
diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h deleted file mode 100644 index 2f58831df7..0000000000 --- a/keyboards/ferris/0_2/0_2.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | #include "quantum.h" | ||
| 21 | |||
| 22 | // clang-format off | ||
| 23 | |||
| 24 | /* left hand right hand */ | ||
| 25 | #define LAYOUT_split_3x5_2(\ | ||
| 26 | K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ | ||
| 27 | K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ | ||
| 28 | K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ | ||
| 29 | K3_3, K3_4, K3_5, K3_6)\ | ||
| 30 | /* matrix positions */\ | ||
| 31 | {\ | ||
| 32 | {K0_0, K0_1, K0_2, K0_3, K0_4},\ | ||
| 33 | {K1_0, K1_1, K1_2, K1_3, K1_4},\ | ||
| 34 | {K2_0, K2_1, K2_2, K2_3, K2_4},\ | ||
| 35 | {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ | ||
| 36 | \ | ||
| 37 | {K0_5, K0_6, K0_7, K0_8, K0_9},\ | ||
| 38 | {K1_5, K1_6, K1_7, K1_8, K1_9},\ | ||
| 39 | {K2_5, K2_6, K2_7, K2_8, K2_9},\ | ||
| 40 | {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ | ||
| 41 | } | ||
| 42 | |||
| 43 | // clang-format on | ||
| 44 | #define LAYOUT LAYOUT_split_3x5_2 | ||
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index f2b6b4b07b..c6584ecf01 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json | |||
| @@ -7,50 +7,53 @@ | |||
| 7 | "processor": "STM32F072", | 7 | "processor": "STM32F072", |
| 8 | "bootloader": "stm32-dfu", | 8 | "bootloader": "stm32-dfu", |
| 9 | "community_layouts": ["split_3x5_2"], | 9 | "community_layouts": ["split_3x5_2"], |
| 10 | "layout_aliases": { | ||
| 11 | "LAYOUT": "LAYOUT_split_3x5_2" | ||
| 12 | }, | ||
| 10 | "layouts": { | 13 | "layouts": { |
| 11 | "LAYOUT_split_3x5_2": { | 14 | "LAYOUT_split_3x5_2": { |
| 12 | "layout": [ | 15 | "layout": [ |
| 13 | {"x": 0, "y": 0.93}, | 16 | {"matrix": [0, 0], "x": 0, "y": 0.93}, |
| 14 | {"x": 1, "y": 0.31}, | 17 | {"matrix": [0, 1], "x": 1, "y": 0.31}, |
| 15 | {"x": 2, "y": 0}, | 18 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 16 | {"x": 3, "y": 0.28}, | 19 | {"matrix": [0, 3], "x": 3, "y": 0.28}, |
| 17 | {"x": 4, "y": 0.42}, | 20 | {"matrix": [0, 4], "x": 4, "y": 0.42}, |
| 18 | 21 | ||
| 19 | {"x": 7, "y": 0.42}, | 22 | {"matrix": [4, 0], "x": 7, "y": 0.42}, |
| 20 | {"x": 8, "y": 0.28}, | 23 | {"matrix": [4, 1], "x": 8, "y": 0.28}, |
| 21 | {"x": 9, "y": 0}, | 24 | {"matrix": [4, 2], "x": 9, "y": 0}, |
| 22 | {"x": 10, "y": 0.31}, | 25 | {"matrix": [4, 3], "x": 10, "y": 0.31}, |
| 23 | {"x": 11, "y": 0.93}, | 26 | {"matrix": [4, 4], "x": 11, "y": 0.93}, |
| 24 | 27 | ||
| 25 | {"x": 0, "y": 1.93}, | 28 | {"matrix": [1, 0], "x": 0, "y": 1.93}, |
| 26 | {"x": 1, "y": 1.31}, | 29 | {"matrix": [1, 1], "x": 1, "y": 1.31}, |
| 27 | {"x": 2, "y": 1}, | 30 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 28 | {"x": 3, "y": 1.28}, | 31 | {"matrix": [1, 3], "x": 3, "y": 1.28}, |
| 29 | {"x": 4, "y": 1.42}, | 32 | {"matrix": [1, 4], "x": 4, "y": 1.42}, |
| 30 | 33 | ||
| 31 | {"x": 7, "y": 1.42}, | 34 | {"matrix": [5, 0], "x": 7, "y": 1.42}, |
| 32 | {"x": 8, "y": 1.28}, | 35 | {"matrix": [5, 1], "x": 8, "y": 1.28}, |
| 33 | {"x": 9, "y": 1}, | 36 | {"matrix": [5, 2], "x": 9, "y": 1}, |
| 34 | {"x": 10, "y": 1.31}, | 37 | {"matrix": [5, 3], "x": 10, "y": 1.31}, |
| 35 | {"x": 11, "y": 1.93}, | 38 | {"matrix": [5, 4], "x": 11, "y": 1.93}, |
| 36 | 39 | ||
| 37 | {"x": 0, "y": 2.93}, | 40 | {"matrix": [2, 0], "x": 0, "y": 2.93}, |
| 38 | {"x": 1, "y": 2.31}, | 41 | {"matrix": [2, 1], "x": 1, "y": 2.31}, |
| 39 | {"x": 2, "y": 2}, | 42 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 40 | {"x": 3, "y": 2.28}, | 43 | {"matrix": [2, 3], "x": 3, "y": 2.28}, |
| 41 | {"x": 4, "y": 2.42}, | 44 | {"matrix": [2, 4], "x": 4, "y": 2.42}, |
| 42 | 45 | ||
| 43 | {"x": 7, "y": 2.42}, | 46 | {"matrix": [6, 0], "x": 7, "y": 2.42}, |
| 44 | {"x": 8, "y": 2.28}, | 47 | {"matrix": [6, 1], "x": 8, "y": 2.28}, |
| 45 | {"x": 9, "y": 2}, | 48 | {"matrix": [6, 2], "x": 9, "y": 2}, |
| 46 | {"x": 10, "y": 2.31}, | 49 | {"matrix": [6, 3], "x": 10, "y": 2.31}, |
| 47 | {"x": 11, "y": 2.93}, | 50 | {"matrix": [6, 4], "x": 11, "y": 2.93}, |
| 48 | 51 | ||
| 49 | {"x": 3.5, "y": 3.75}, | 52 | {"matrix": [3, 3], "x": 3.5, "y": 3.75}, |
| 50 | {"x": 4.5, "y": 4}, | 53 | {"matrix": [3, 4], "x": 4.5, "y": 4}, |
| 51 | 54 | ||
| 52 | {"x": 6.5, "y": 4}, | 55 | {"matrix": [7, 0], "x": 6.5, "y": 4}, |
| 53 | {"x": 7.5, "y": 3.75} | 56 | {"matrix": [7, 1], "x": 7.5, "y": 3.75} |
| 54 | ] | 57 | ] |
| 55 | } | 58 | } |
| 56 | } | 59 | } |
diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h index eda21d2a94..549228104a 100644 --- a/keyboards/gboards/gergoplex/gergoplex.h +++ b/keyboards/gboards/gergoplex/gergoplex.h | |||
| @@ -35,21 +35,3 @@ extern i2c_status_t mcp23018_status; | |||
| 35 | #define OLATA 0x14 // output latch register | 35 | #define OLATA 0x14 // output latch register |
| 36 | 36 | ||
| 37 | uint8_t init_mcp23018(void); | 37 | uint8_t init_mcp23018(void); |
| 38 | |||
| 39 | #define LAYOUT_split_3x5_3( \ | ||
| 40 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 41 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 42 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 43 | L30, L31, L32, R30, R31, R32 \ | ||
| 44 | ) { \ | ||
| 45 | { L04, L14, L24, XXX }, \ | ||
| 46 | { L03, L13, L23, L32 }, \ | ||
| 47 | { L02, L12, L22, L31 }, \ | ||
| 48 | { L01, L11, L21, L30 }, \ | ||
| 49 | { L00, L10, L20, XXX }, \ | ||
| 50 | { R00, R10, R20, XXX }, \ | ||
| 51 | { R01, R11, R21, R30 }, \ | ||
| 52 | { R02, R12, R22, R31 }, \ | ||
| 53 | { R03, R13, R23, R32 }, \ | ||
| 54 | { R04, R14, R24, XXX } \ | ||
| 55 | } | ||
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index 914832aacf..061f8ff869 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json | |||
| @@ -14,45 +14,49 @@ | |||
| 14 | "layouts": { | 14 | "layouts": { |
| 15 | "LAYOUT_split_3x5_3": { | 15 | "LAYOUT_split_3x5_3": { |
| 16 | "layout": [ | 16 | "layout": [ |
| 17 | {"label":"L00", "x":0, "y":0.25}, | 17 | {"matrix": [4, 0], "x": 0, "y": 0.25}, |
| 18 | {"label":"L01", "x":1, "y":0.125}, | 18 | {"matrix": [3, 0], "x": 1, "y": 0.125}, |
| 19 | {"label":"L02", "x":2, "y":0}, | 19 | {"matrix": [2, 0], "x": 2, "y": 0}, |
| 20 | {"label":"L03", "x":3, "y":0.125}, | 20 | {"matrix": [1, 0], "x": 3, "y": 0.125}, |
| 21 | {"label":"L04", "x":4, "y":0.375}, | 21 | {"matrix": [0, 0], "x": 4, "y": 0.375}, |
| 22 | {"label":"R00", "x":8, "y":0.375}, | ||
| 23 | {"label":"R01", "x":9, "y":0.125}, | ||
| 24 | {"label":"R02", "x":10, "y":0}, | ||
| 25 | {"label":"R03", "x":11, "y":0.125}, | ||
| 26 | {"label":"R04", "x":12, "y":0.25}, | ||
| 27 | 22 | ||
| 28 | {"label":"L10", "x":0, "y":1.25}, | 23 | {"matrix": [5, 0], "x": 8, "y": 0.375}, |
| 29 | {"label":"L11", "x":1, "y":1.125}, | 24 | {"matrix": [6, 0], "x": 9, "y": 0.125}, |
| 30 | {"label":"L12", "x":2, "y":1}, | 25 | {"matrix": [7, 0], "x": 10, "y": 0}, |
| 31 | {"label":"L13", "x":3, "y":1.125}, | 26 | {"matrix": [8, 0], "x": 11, "y": 0.125}, |
| 32 | {"label":"L14", "x":4, "y":1.375}, | 27 | {"matrix": [9, 0], "x": 12, "y": 0.25}, |
| 33 | {"label":"R10", "x":8, "y":1.375}, | ||
| 34 | {"label":"R11", "x":9, "y":1.125}, | ||
| 35 | {"label":"R12", "x":10, "y":1}, | ||
| 36 | {"label":"R13", "x":11, "y":1.125}, | ||
| 37 | {"label":"R14", "x":12, "y":1.25}, | ||
| 38 | 28 | ||
| 39 | {"label":"L20", "x":0, "y":2.25}, | 29 | {"matrix": [4, 1], "x": 0, "y": 1.25}, |
| 40 | {"label":"L21", "x":1, "y":2.125}, | 30 | {"matrix": [3, 1], "x": 1, "y": 1.125}, |
| 41 | {"label":"L22", "x":2, "y":2}, | 31 | {"matrix": [2, 1], "x": 2, "y": 1}, |
| 42 | {"label":"L23", "x":3, "y":2.125}, | 32 | {"matrix": [1, 1], "x": 3, "y": 1.125}, |
| 43 | {"label":"L24", "x":4, "y":2.375}, | 33 | {"matrix": [0, 1], "x": 4, "y": 1.375}, |
| 44 | {"label":"R20", "x":8, "y":2.375}, | ||
| 45 | {"label":"R21", "x":9, "y":2.125}, | ||
| 46 | {"label":"R22", "x":10, "y":2}, | ||
| 47 | {"label":"R23", "x":11, "y":2.125}, | ||
| 48 | {"label":"R24", "x":12, "y":2.25}, | ||
| 49 | 34 | ||
| 50 | {"label":"L30", "x":2, "y":3.5}, | 35 | {"matrix": [5, 1], "x": 8, "y": 1.375}, |
| 51 | {"label":"L31", "x":3.25, "y":3.625, "w":1.5}, | 36 | {"matrix": [6, 1], "x": 9, "y": 1.125}, |
| 52 | {"label":"L32", "x":5, "y":3.125, "h":2}, | 37 | {"matrix": [7, 1], "x": 10, "y": 1}, |
| 53 | {"label":"R30", "x":7, "y":3.125, "h":2}, | 38 | {"matrix": [8, 1], "x": 11, "y": 1.125}, |
| 54 | {"label":"R31", "x":8.25, "y":3.625, "w":1.5}, | 39 | {"matrix": [9, 1], "x": 12, "y": 1.25}, |
| 55 | {"label":"R32", "x":10, "y":3.5} | 40 | |
| 41 | {"matrix": [4, 2], "x": 0, "y": 2.25}, | ||
| 42 | {"matrix": [3, 2], "x": 1, "y": 2.125}, | ||
| 43 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 44 | {"matrix": [1, 2], "x": 3, "y": 2.125}, | ||
| 45 | {"matrix": [0, 2], "x": 4, "y": 2.375}, | ||
| 46 | |||
| 47 | {"matrix": [5, 2], "x": 8, "y": 2.375}, | ||
| 48 | {"matrix": [6, 2], "x": 9, "y": 2.125}, | ||
| 49 | {"matrix": [7, 2], "x": 10, "y": 2}, | ||
| 50 | {"matrix": [8, 2], "x": 11, "y": 2.125}, | ||
| 51 | {"matrix": [9, 2], "x": 12, "y": 2.25}, | ||
| 52 | |||
| 53 | {"matrix": [3, 3], "x": 2, "y": 3.5}, | ||
| 54 | {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5}, | ||
| 55 | {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2}, | ||
| 56 | |||
| 57 | {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2}, | ||
| 58 | {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5}, | ||
| 59 | {"matrix": [8, 3], "x": 10, "y": 3.5} | ||
| 56 | ] | 60 | ] |
| 57 | } | 61 | } |
| 58 | } | 62 | } |
diff --git a/keyboards/gummykey/gummykey.h b/keyboards/gummykey/gummykey.h deleted file mode 100644 index 79d36dc8a5..0000000000 --- a/keyboards/gummykey/gummykey.h +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | // Copyright 2023 Gummor (@gumorr) | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "quantum.h" | ||
| 7 | |||
| 8 | #define ___ KC_NO | ||
| 9 | |||
| 10 | #define LAYOUT_split_4x6_5( \ | ||
| 11 | L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ | ||
| 12 | L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ | ||
| 13 | L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ | ||
| 14 | L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ | ||
| 15 | L40, L41, L42, L44, L45, R45, R44, R42, R41, R40 \ | ||
| 16 | ) \ | ||
| 17 | { \ | ||
| 18 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 19 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 20 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 21 | { L30, L31, L32, L33, L34, L35 }, \ | ||
| 22 | { L40, L41, L42, ___, L44, L45 }, \ | ||
| 23 | { R00, R01, R02, R03, R04, R05 }, \ | ||
| 24 | { R10, R11, R12, R13, R14, R15 }, \ | ||
| 25 | { R20, R21, R22, R23, R24, R25 }, \ | ||
| 26 | { R30, R31, R32, R33, R34, R35 }, \ | ||
| 27 | { R40, R41, R42, ___, R44, R45 } \ | ||
| 28 | } | ||
diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json index 4f2136f358..6f3758c31a 100644 --- a/keyboards/gummykey/info.json +++ b/keyboards/gummykey/info.json | |||
| @@ -13,77 +13,75 @@ | |||
| 13 | "diode_direction": "ROW2COL", | 13 | "diode_direction": "ROW2COL", |
| 14 | "layouts": { | 14 | "layouts": { |
| 15 | "LAYOUT_split_4x6_5": { | 15 | "LAYOUT_split_4x6_5": { |
| 16 | "layout": | 16 | "layout": [ |
| 17 | [ | 17 | {"matrix": [0, 0], "x": 0.25, "y": 0}, |
| 18 | {"x":0.25, "y":0}, | 18 | {"matrix": [0, 1], "x": 1.25, "y": 0}, |
| 19 | {"x":1.25, "y":0}, | 19 | {"matrix": [0, 2], "x": 2.25, "y": 0}, |
| 20 | {"x":2.25, "y":0}, | 20 | {"matrix": [0, 3], "x": 3.25, "y": 0}, |
| 21 | {"x":3.25, "y":0}, | 21 | {"matrix": [0, 4], "x": 4.25, "y": 0.125}, |
| 22 | {"x":4.25, "y":0.125}, | 22 | {"matrix": [0, 5], "x": 5.25, "y": 0.25}, |
| 23 | {"x":5.25, "y":0.25}, | ||
| 24 | |||
| 25 | {"x":0.25, "y":1}, | ||
| 26 | {"x":1.25, "y":1}, | ||
| 27 | {"x":2.25, "y":1}, | ||
| 28 | {"x":3.25, "y":1}, | ||
| 29 | {"x":4.25, "y":1.125}, | ||
| 30 | {"x":5.25, "y":1.25}, | ||
| 31 | |||
| 32 | {"x":0, "y":2, "w":1.25}, | ||
| 33 | {"x":1.25, "y":2}, | ||
| 34 | {"x":2.25, "y":2}, | ||
| 35 | {"x":3.25, "y":2}, | ||
| 36 | {"x":4.25, "y":2.125}, | ||
| 37 | {"x":5.25, "y":2.25}, | ||
| 38 | |||
| 39 | {"x":0, "y":3, "w":1.25}, | ||
| 40 | {"x":1.25, "y":3}, | ||
| 41 | {"x":2.25, "y":3}, | ||
| 42 | {"x":3.25, "y":3}, | ||
| 43 | {"x":4.25, "y":3.125}, | ||
| 44 | {"x":5.25, "y":3.25}, | ||
| 45 | |||
| 46 | {"x":0, "y":4, "w":1.25}, | ||
| 47 | {"x":1.25, "y":4}, | ||
| 48 | {"x":2.25, "y":4}, | ||
| 49 | {"x":3.5, "y":4.25, "w":2.25}, | ||
| 50 | {"x":6.75, "y":4.25}, | ||
| 51 | |||
| 52 | 23 | ||
| 53 | {"x":13.25, "y":0}, | 24 | {"matrix": [5, 5], "x": 0.25, "y": 1}, |
| 54 | {"x":12.25, "y":0}, | 25 | {"matrix": [5, 4], "x": 1.25, "y": 1}, |
| 55 | {"x":11.25, "y":0}, | 26 | {"matrix": [5, 3], "x": 2.25, "y": 1}, |
| 56 | {"x":10.25, "y":0}, | 27 | {"matrix": [5, 2], "x": 3.25, "y": 1}, |
| 57 | {"x":9.25, "y":0.125}, | 28 | {"matrix": [5, 1], "x": 4.25, "y": 1.125}, |
| 58 | {"x":8.25, "y":0.25}, | 29 | {"matrix": [5, 0], "x": 5.25, "y": 1.25}, |
| 59 | 30 | ||
| 60 | {"x":13.25, "y":1}, | 31 | {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25}, |
| 61 | {"x":12.25, "y":1}, | 32 | {"matrix": [1, 1], "x": 1.25, "y": 2}, |
| 62 | {"x":11.25, "y":1}, | 33 | {"matrix": [1, 2], "x": 2.25, "y": 2}, |
| 63 | {"x":10.25, "y":1}, | 34 | {"matrix": [1, 3], "x": 3.25, "y": 2}, |
| 64 | {"x":9.25, "y":1.125}, | 35 | {"matrix": [1, 4], "x": 4.25, "y": 2.125}, |
| 65 | {"x":8.25, "y":1.25}, | 36 | {"matrix": [1, 5], "x": 5.25, "y": 2.25}, |
| 66 | 37 | ||
| 67 | {"x":13.25, "y":2, "w":1.25}, | 38 | {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25}, |
| 68 | {"x":12.25, "y":2}, | 39 | {"matrix": [6, 4], "x": 1.25, "y": 3}, |
| 69 | {"x":11.25, "y":2}, | 40 | {"matrix": [6, 3], "x": 2.25, "y": 3}, |
| 70 | {"x":10.25, "y":2}, | 41 | {"matrix": [6, 2], "x": 3.25, "y": 3}, |
| 71 | {"x":9.25, "y":2.125}, | 42 | {"matrix": [6, 1], "x": 4.25, "y": 3.125}, |
| 72 | {"x":8.25, "y":2.25}, | 43 | {"matrix": [6, 0], "x": 5.25, "y": 3.25}, |
| 73 | 44 | ||
| 74 | {"x":13.25, "y":3, "w":1.25}, | 45 | {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25}, |
| 75 | {"x":12.25, "y":3}, | 46 | {"matrix": [2, 1], "x": 1.25, "y": 4}, |
| 76 | {"x":11.25, "y":3}, | 47 | {"matrix": [2, 2], "x": 2.25, "y": 4}, |
| 77 | {"x":10.25, "y":3}, | 48 | {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25}, |
| 78 | {"x":9.25, "y":3.125}, | 49 | {"matrix": [2, 4], "x": 6.75, "y": 4.25}, |
| 79 | {"x":8.25, "y":3.25}, | 50 | {"matrix": [2, 5], "x": 13.25, "y": 0}, |
| 80 | 51 | ||
| 81 | {"x":13.25, "y":4, "w":1.25}, | 52 | {"matrix": [7, 5], "x": 12.25, "y": 0}, |
| 82 | {"x":12.25, "y":4}, | 53 | {"matrix": [7, 4], "x": 11.25, "y": 0}, |
| 83 | {"x":11.25, "y":4}, | 54 | {"matrix": [7, 3], "x": 10.25, "y": 0}, |
| 84 | {"x":8, "y":4.25, "w":2.25}, | 55 | {"matrix": [7, 2], "x": 9.25, "y": 0.125}, |
| 85 | {"x":7, "y":4.25} | 56 | {"matrix": [7, 1], "x": 8.25, "y": 0.25}, |
| 86 | ] | 57 | {"matrix": [7, 0], "x": 13.25, "y": 1}, |
| 58 | |||
| 59 | {"matrix": [3, 0], "x": 12.25, "y": 1}, | ||
| 60 | {"matrix": [3, 1], "x": 11.25, "y": 1}, | ||
| 61 | {"matrix": [3, 2], "x": 10.25, "y": 1}, | ||
| 62 | {"matrix": [3, 3], "x": 9.25, "y": 1.125}, | ||
| 63 | {"matrix": [3, 4], "x": 8.25, "y": 1.25}, | ||
| 64 | {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25}, | ||
| 65 | |||
| 66 | {"matrix": [8, 5], "x": 12.25, "y": 2}, | ||
| 67 | {"matrix": [8, 4], "x": 11.25, "y": 2}, | ||
| 68 | {"matrix": [8, 3], "x": 10.25, "y": 2}, | ||
| 69 | {"matrix": [8, 2], "x": 9.25, "y": 2.125}, | ||
| 70 | {"matrix": [8, 1], "x": 8.25, "y": 2.25}, | ||
| 71 | {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25}, | ||
| 72 | |||
| 73 | {"matrix": [4, 0], "x": 12.25, "y": 3}, | ||
| 74 | {"matrix": [4, 1], "x": 11.25, "y": 3}, | ||
| 75 | {"matrix": [4, 2], "x": 10.25, "y": 3}, | ||
| 76 | {"matrix": [4, 4], "x": 9.25, "y": 3.125}, | ||
| 77 | {"matrix": [4, 5], "x": 8.25, "y": 3.25}, | ||
| 78 | |||
| 79 | {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25}, | ||
| 80 | {"matrix": [9, 4], "x": 12.25, "y": 4}, | ||
| 81 | {"matrix": [9, 2], "x": 11.25, "y": 4}, | ||
| 82 | {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25}, | ||
| 83 | {"matrix": [9, 0], "x": 7, "y": 4.25} | ||
| 84 | ] | ||
| 87 | } | 85 | } |
| 88 | } | 86 | } |
| 89 | } | 87 | } |
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c index 2bd1aefadb..5afb908d02 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c +++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c | |||
| @@ -14,7 +14,7 @@ GNU General Public License for more details. | |||
| 14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | #include "3x5_3.h" | 17 | #include "quantum.h" |
| 18 | 18 | ||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | 20 | ||
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h deleted file mode 100644 index 0a03dd9b1f..0000000000 --- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2021 @dlford | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | #include "quantum.h" | ||
| 21 | |||
| 22 | #define XXX KC_NO | ||
| 23 | |||
| 24 | #define LAYOUT_split_3x5_3( \ | ||
| 25 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 26 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 27 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 28 | L32, L33, L34, R30, R31, R32 \ | ||
| 29 | ) { \ | ||
| 30 | { L00, L01, L02, L03, L04 }, \ | ||
| 31 | { L10, L11, L12, L13, L14 }, \ | ||
| 32 | { L20, L21, L22, L23, L24 }, \ | ||
| 33 | { XXX, XXX, L32, L33, L34 }, \ | ||
| 34 | { R00, R01, R02, R03, R04 }, \ | ||
| 35 | { R10, R11, R12, R13, R14 }, \ | ||
| 36 | { R20, R21, R22, R23, R24 }, \ | ||
| 37 | { R30, R31, R32, XXX, XXX } \ | ||
| 38 | } | ||
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index f99eba6502..f6309cba46 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json | |||
| @@ -22,49 +22,49 @@ | |||
| 22 | "layouts": { | 22 | "layouts": { |
| 23 | "LAYOUT_split_3x5_3": { | 23 | "LAYOUT_split_3x5_3": { |
| 24 | "layout": [ | 24 | "layout": [ |
| 25 | {"x": 0, "y": 0}, | 25 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 26 | {"x": 1, "y": 0}, | 26 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 27 | {"x": 2, "y": 0}, | 27 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 28 | {"x": 3, "y": 0}, | 28 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 29 | {"x": 4, "y": 0}, | 29 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 30 | 30 | ||
| 31 | {"x": 10, "y": 0}, | 31 | {"matrix": [4, 0], "x": 10, "y": 0}, |
| 32 | {"x": 11, "y": 0}, | 32 | {"matrix": [4, 1], "x": 11, "y": 0}, |
| 33 | {"x": 12, "y": 0}, | 33 | {"matrix": [4, 2], "x": 12, "y": 0}, |
| 34 | {"x": 13, "y": 0}, | 34 | {"matrix": [4, 3], "x": 13, "y": 0}, |
| 35 | {"x": 14, "y": 0}, | 35 | {"matrix": [4, 4], "x": 14, "y": 0}, |
| 36 | 36 | ||
| 37 | {"x": 0, "y": 1}, | 37 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 38 | {"x": 1, "y": 1}, | 38 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 39 | {"x": 2, "y": 1}, | 39 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 40 | {"x": 3, "y": 1}, | 40 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 41 | {"x": 4, "y": 1}, | 41 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 42 | 42 | ||
| 43 | {"x": 10, "y": 1}, | 43 | {"matrix": [5, 0], "x": 10, "y": 1}, |
| 44 | {"x": 11, "y": 1}, | 44 | {"matrix": [5, 1], "x": 11, "y": 1}, |
| 45 | {"x": 12, "y": 1}, | 45 | {"matrix": [5, 2], "x": 12, "y": 1}, |
| 46 | {"x": 13, "y": 1}, | 46 | {"matrix": [5, 3], "x": 13, "y": 1}, |
| 47 | {"x": 14, "y": 1}, | 47 | {"matrix": [5, 4], "x": 14, "y": 1}, |
| 48 | 48 | ||
| 49 | {"x": 0, "y": 2}, | 49 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 50 | {"x": 1, "y": 2}, | 50 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 51 | {"x": 2, "y": 2}, | 51 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 52 | {"x": 3, "y": 2}, | 52 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 53 | {"x": 4, "y": 2}, | 53 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 54 | 54 | ||
| 55 | {"x": 10, "y": 2}, | 55 | {"matrix": [6, 0], "x": 10, "y": 2}, |
| 56 | {"x": 11, "y": 2}, | 56 | {"matrix": [6, 1], "x": 11, "y": 2}, |
| 57 | {"x": 12, "y": 2}, | 57 | {"matrix": [6, 2], "x": 12, "y": 2}, |
| 58 | {"x": 13, "y": 2}, | 58 | {"matrix": [6, 3], "x": 13, "y": 2}, |
| 59 | {"x": 14, "y": 2}, | 59 | {"matrix": [6, 4], "x": 14, "y": 2}, |
| 60 | 60 | ||
| 61 | {"x": 2, "y": 3}, | 61 | {"matrix": [3, 2], "x": 2, "y": 3}, |
| 62 | {"x": 3, "y": 3}, | 62 | {"matrix": [3, 3], "x": 3, "y": 3}, |
| 63 | {"x": 4, "y": 3}, | 63 | {"matrix": [3, 4], "x": 4, "y": 3}, |
| 64 | 64 | ||
| 65 | {"x": 10, "y": 3}, | 65 | {"matrix": [7, 0], "x": 10, "y": 3}, |
| 66 | {"x": 11, "y": 3}, | 66 | {"matrix": [7, 1], "x": 11, "y": 3}, |
| 67 | {"x": 12, "y": 3} | 67 | {"matrix": [7, 2], "x": 12, "y": 3} |
| 68 | ] | 68 | ] |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h deleted file mode 100644 index 1392cb0b18..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2022 fgoodwin <fgoodwin@north-tech.net> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #define XXX KC_NO | ||
| 22 | |||
| 23 | #define LAYOUT_split_5x6_6( \ | ||
| 24 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 25 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 26 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 27 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | ||
| 28 | L42, L43, L44, L45, R40, R41, R42, R43, \ | ||
| 29 | L54, L55, R50, R51, \ | ||
| 30 | L64, L65, R60, R61 \ | ||
| 31 | ) { \ | ||
| 32 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 33 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 34 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 35 | { L30, L31, L32, L33, L34, L35 }, \ | ||
| 36 | { XXX, XXX, L42, L43, L44, L45 }, \ | ||
| 37 | { XXX, XXX, XXX, XXX, L54, L55 }, \ | ||
| 38 | { XXX, XXX, XXX, XXX, L64, L65 }, \ | ||
| 39 | \ | ||
| 40 | { R00, R01, R02, R03, R04, R05 }, \ | ||
| 41 | { R10, R11, R12, R13, R14, R15 }, \ | ||
| 42 | { R20, R21, R22, R23, R24, R25 }, \ | ||
| 43 | { R30, R31, R32, R33, R34, R35 }, \ | ||
| 44 | { R40, R41, R42, R43, XXX, XXX }, \ | ||
| 45 | { R50, R51, XXX, XXX, XXX, XXX }, \ | ||
| 46 | { R60, R61, XXX, XXX, XXX, XXX } \ | ||
| 47 | } | ||
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index 9635c47123..a00a3bda18 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json | |||
| @@ -21,83 +21,83 @@ | |||
| 21 | "layouts": { | 21 | "layouts": { |
| 22 | "LAYOUT_split_5x6_6": { | 22 | "LAYOUT_split_5x6_6": { |
| 23 | "layout": [ | 23 | "layout": [ |
| 24 | {"x": 0, "y": 0}, | 24 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 25 | {"x": 1, "y": 0}, | 25 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 26 | {"x": 2, "y": 0}, | 26 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 27 | {"x": 3, "y": 0}, | 27 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | {"x": 4, "y": 0}, | 28 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 29 | {"x": 5, "y": 0}, | 29 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 30 | 30 | ||
| 31 | {"x": 11, "y": 0}, | 31 | {"matrix": [7, 0], "x": 11, "y": 0}, |
| 32 | {"x": 12, "y": 0}, | 32 | {"matrix": [7, 1], "x": 12, "y": 0}, |
| 33 | {"x": 13, "y": 0}, | 33 | {"matrix": [7, 2], "x": 13, "y": 0}, |
| 34 | {"x": 14, "y": 0}, | 34 | {"matrix": [7, 3], "x": 14, "y": 0}, |
| 35 | {"x": 15, "y": 0}, | 35 | {"matrix": [7, 4], "x": 15, "y": 0}, |
| 36 | {"x": 16, "y": 0}, | 36 | {"matrix": [7, 5], "x": 16, "y": 0}, |
| 37 | 37 | ||
| 38 | {"x": 0, "y": 1}, | 38 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 39 | {"x": 1, "y": 1}, | 39 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 40 | {"x": 2, "y": 1}, | 40 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 41 | {"x": 3, "y": 1}, | 41 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 42 | {"x": 4, "y": 1}, | 42 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 43 | {"x": 5, "y": 1}, | 43 | {"matrix": [1, 5], "x": 5, "y": 1}, |
| 44 | 44 | ||
| 45 | {"x": 11, "y": 1}, | 45 | {"matrix": [8, 0], "x": 11, "y": 1}, |
| 46 | {"x": 12, "y": 1}, | 46 | {"matrix": [8, 1], "x": 12, "y": 1}, |
| 47 | {"x": 13, "y": 1}, | 47 | {"matrix": [8, 2], "x": 13, "y": 1}, |
| 48 | {"x": 14, "y": 1}, | 48 | {"matrix": [8, 3], "x": 14, "y": 1}, |
| 49 | {"x": 15, "y": 1}, | 49 | {"matrix": [8, 4], "x": 15, "y": 1}, |
| 50 | {"x": 16, "y": 1}, | 50 | {"matrix": [8, 5], "x": 16, "y": 1}, |
| 51 | 51 | ||
| 52 | {"x": 0, "y": 2}, | 52 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 53 | {"x": 1, "y": 2}, | 53 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 54 | {"x": 2, "y": 2}, | 54 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 55 | {"x": 3, "y": 2}, | 55 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 56 | {"x": 4, "y": 2}, | 56 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 57 | {"x": 5, "y": 2}, | 57 | {"matrix": [2, 5], "x": 5, "y": 2}, |
| 58 | 58 | ||
| 59 | {"x": 11, "y": 2}, | 59 | {"matrix": [9, 0], "x": 11, "y": 2}, |
| 60 | {"x": 12, "y": 2}, | 60 | {"matrix": [9, 1], "x": 12, "y": 2}, |
| 61 | {"x": 13, "y": 2}, | 61 | {"matrix": [9, 2], "x": 13, "y": 2}, |
| 62 | {"x": 14, "y": 2}, | 62 | {"matrix": [9, 3], "x": 14, "y": 2}, |
| 63 | {"x": 15, "y": 2}, | 63 | {"matrix": [9, 4], "x": 15, "y": 2}, |
| 64 | {"x": 16, "y": 2}, | 64 | {"matrix": [9, 5], "x": 16, "y": 2}, |
| 65 | 65 | ||
| 66 | {"x": 0, "y": 3}, | 66 | {"matrix": [3, 0], "x": 0, "y": 3}, |
| 67 | {"x": 1, "y": 3}, | 67 | {"matrix": [3, 1], "x": 1, "y": 3}, |
| 68 | {"x": 2, "y": 3}, | 68 | {"matrix": [3, 2], "x": 2, "y": 3}, |
| 69 | {"x": 3, "y": 3}, | 69 | {"matrix": [3, 3], "x": 3, "y": 3}, |
| 70 | {"x": 4, "y": 3}, | 70 | {"matrix": [3, 4], "x": 4, "y": 3}, |
| 71 | {"x": 5, "y": 3}, | 71 | {"matrix": [3, 5], "x": 5, "y": 3}, |
| 72 | 72 | ||
| 73 | {"x": 11, "y": 3}, | 73 | {"matrix": [10, 0], "x": 11, "y": 3}, |
| 74 | {"x": 12, "y": 3}, | 74 | {"matrix": [10, 1], "x": 12, "y": 3}, |
| 75 | {"x": 13, "y": 3}, | 75 | {"matrix": [10, 2], "x": 13, "y": 3}, |
| 76 | {"x": 14, "y": 3}, | 76 | {"matrix": [10, 3], "x": 14, "y": 3}, |
| 77 | {"x": 15, "y": 3}, | 77 | {"matrix": [10, 4], "x": 15, "y": 3}, |
| 78 | {"x": 16, "y": 3}, | 78 | {"matrix": [10, 5], "x": 16, "y": 3}, |
| 79 | 79 | ||
| 80 | {"x": 2, "y": 4}, | 80 | {"matrix": [4, 2], "x": 2, "y": 4}, |
| 81 | {"x": 3, "y": 4}, | 81 | {"matrix": [4, 3], "x": 3, "y": 4}, |
| 82 | {"matrix": [4, 4], "x": 5, "y": 4}, | ||
| 83 | {"matrix": [4, 5], "x": 6, "y": 4}, | ||
| 82 | 84 | ||
| 83 | {"x": 5, "y": 4}, | 85 | {"matrix": [11, 0], "x": 7, "y": 4}, |
| 84 | {"x": 6, "y": 4}, | 86 | {"matrix": [11, 1], "x": 9, "y": 4}, |
| 85 | {"x": 7, "y": 4}, | 87 | {"matrix": [11, 2], "x": 10, "y": 4}, |
| 88 | {"matrix": [11, 3], "x": 11, "y": 4}, | ||
| 86 | 89 | ||
| 87 | {"x": 9, "y": 4}, | 90 | {"matrix": [5, 4], "x": 13, "y": 4}, |
| 88 | {"x": 10, "y": 4}, | 91 | {"matrix": [5, 5], "x": 14, "y": 4}, |
| 89 | {"x": 11, "y": 4}, | ||
| 90 | 92 | ||
| 91 | {"x": 13, "y": 4}, | 93 | {"matrix": [12, 0], "x": 5, "y": 5}, |
| 92 | {"x": 14, "y": 4}, | 94 | {"matrix": [12, 1], "x": 6, "y": 5}, |
| 93 | 95 | ||
| 94 | {"x": 5, "y": 5}, | 96 | {"matrix": [6, 4], "x": 7, "y": 5}, |
| 95 | {"x": 6, "y": 5}, | 97 | {"matrix": [6, 5], "x": 5, "y": 5}, |
| 96 | {"x": 7, "y": 5}, | ||
| 97 | 98 | ||
| 98 | {"x": 5, "y": 5}, | 99 | {"matrix": [13, 0], "x": 9, "y": 5}, |
| 99 | {"x": 9, "y": 5}, | 100 | {"matrix": [13, 1], "x": 10, "y": 5} |
| 100 | {"x": 10, "y": 5} | ||
| 101 | ] | 101 | ] |
| 102 | } | 102 | } |
| 103 | } | 103 | } |
diff --git a/keyboards/handwired/elrgo_s/elrgo_s.h b/keyboards/handwired/elrgo_s/elrgo_s.h deleted file mode 100644 index 0fb2b58e51..0000000000 --- a/keyboards/handwired/elrgo_s/elrgo_s.h +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | /* Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | |||
| 22 | #define LAYOUT_split_3x6_5(\ | ||
| 23 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 24 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 25 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 26 | L31, L32, L33, L34, L35, R30, R31, R32, R33, R34 \ | ||
| 27 | ) \ | ||
| 28 | { \ | ||
| 29 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 30 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 31 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 32 | {KC_NO, L31, L32, L33, L34, L35}, \ | ||
| 33 | \ | ||
| 34 | { R00, R01, R02, R03, R04, R05 }, \ | ||
| 35 | { R10, R11, R12, R13, R14, R15 }, \ | ||
| 36 | { R20, R21, R22, R23, R24, R25 }, \ | ||
| 37 | { R30, R31, R32, R33, R34, KC_NO} \ | ||
| 38 | } | ||
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index ba850bb5d4..9a43e14c88 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json | |||
| @@ -21,52 +21,61 @@ | |||
| 21 | "layouts": { | 21 | "layouts": { |
| 22 | "LAYOUT_split_3x6_5": { | 22 | "LAYOUT_split_3x6_5": { |
| 23 | "layout": [ | 23 | "layout": [ |
| 24 | {"label":"L00", "x":0, "y":0}, | 24 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 25 | {"label":"L01", "x":1, "y":0}, | 25 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 26 | {"label":"L02", "x":2, "y":0}, | 26 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 27 | {"label":"L03", "x":3, "y":0}, | 27 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | {"label":"L04", "x":4, "y":0}, | 28 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 29 | {"label":"L05", "x":5, "y":0}, | 29 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 30 | {"label":"R00", "x":9, "y":0}, | 30 | |
| 31 | {"label":"R01", "x":10, "y":0}, | 31 | {"matrix": [4, 0], "x": 9, "y": 0}, |
| 32 | {"label":"R02", "x":11, "y":0}, | 32 | {"matrix": [4, 1], "x": 10, "y": 0}, |
| 33 | {"label":"R03", "x":12, "y":0}, | 33 | {"matrix": [4, 2], "x": 11, "y": 0}, |
| 34 | {"label":"R04", "x":13, "y":0}, | 34 | {"matrix": [4, 3], "x": 12, "y": 0}, |
| 35 | {"label":"R05", "x":14, "y":0}, | 35 | {"matrix": [4, 4], "x": 13, "y": 0}, |
| 36 | {"label":"L10", "x":0, "y":1}, | 36 | {"matrix": [4, 5], "x": 14, "y": 0}, |
| 37 | {"label":"L11", "x":1, "y":1}, | 37 | |
| 38 | {"label":"L12", "x":2, "y":1}, | 38 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 39 | {"label":"L13", "x":3, "y":1}, | 39 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 40 | {"label":"L14", "x":4, "y":1}, | 40 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 41 | {"label":"L15", "x":5, "y":1}, | 41 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 42 | {"label":"R10", "x":9, "y":1}, | 42 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 43 | {"label":"R11", "x":10, "y":1}, | 43 | {"matrix": [1, 5], "x": 5, "y": 1}, |
| 44 | {"label":"R12", "x":11, "y":1}, | 44 | |
| 45 | {"label":"R13", "x":12, "y":1}, | 45 | {"matrix": [5, 0], "x": 9, "y": 1}, |
| 46 | {"label":"R14", "x":13, "y":1}, | 46 | {"matrix": [5, 1], "x": 10, "y": 1}, |
| 47 | {"label":"R15", "x":14, "y":1}, | 47 | {"matrix": [5, 2], "x": 11, "y": 1}, |
| 48 | {"label":"L20", "x":0, "y":2}, | 48 | {"matrix": [5, 3], "x": 12, "y": 1}, |
| 49 | {"label":"L21", "x":1, "y":2}, | 49 | {"matrix": [5, 4], "x": 13, "y": 1}, |
| 50 | {"label":"L22", "x":2, "y":2}, | 50 | {"matrix": [5, 5], "x": 14, "y": 1}, |
| 51 | {"label":"L23", "x":3, "y":2}, | 51 | |
| 52 | {"label":"L24", "x":4, "y":2}, | 52 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 53 | {"label":"L25", "x":5, "y":2}, | 53 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 54 | {"label":"R20", "x":9, "y":2}, | 54 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 55 | {"label":"R21", "x":10, "y":2}, | 55 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 56 | {"label":"R22", "x":11, "y":2}, | 56 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 57 | {"label":"R23", "x":12, "y":2}, | 57 | {"matrix": [2, 5], "x": 5, "y": 2}, |
| 58 | {"label":"R24", "x":13, "y":2}, | 58 | |
| 59 | {"label":"R25", "x":14, "y":2}, | 59 | {"matrix": [6, 0], "x": 9, "y": 2}, |
| 60 | {"label":"L31", "x":3, "y":3}, | 60 | {"matrix": [6, 1], "x": 10, "y": 2}, |
| 61 | {"label":"L32", "x":4, "y":3}, | 61 | {"matrix": [6, 2], "x": 11, "y": 2}, |
| 62 | {"label":"L33", "x":5, "y":3}, | 62 | {"matrix": [6, 3], "x": 12, "y": 2}, |
| 63 | {"label":"L34", "x":6, "y":3}, | 63 | {"matrix": [6, 4], "x": 13, "y": 2}, |
| 64 | {"label":"L35", "x":6, "y":2}, | 64 | {"matrix": [6, 5], "x": 14, "y": 2}, |
| 65 | {"label":"R30", "x":8, "y":2}, | 65 | |
| 66 | {"label":"R31", "x":8, "y":3}, | 66 | {"matrix": [3, 1], "x": 3, "y": 3}, |
| 67 | {"label":"R32", "x":9, "y":3}, | 67 | {"matrix": [3, 2], "x": 4, "y": 3}, |
| 68 | {"label":"R33", "x":10, "y":3}, | 68 | {"matrix": [3, 3], "x": 5, "y": 3}, |
| 69 | {"label":"R34", "x":11, "y":3} | 69 | {"matrix": [3, 4], "x": 6, "y": 3}, |
| 70 | |||
| 71 | {"matrix": [3, 5], "x": 6, "y": 2}, | ||
| 72 | |||
| 73 | {"matrix": [7, 0], "x": 8, "y": 2}, | ||
| 74 | |||
| 75 | {"matrix": [7, 1], "x": 8, "y": 3}, | ||
| 76 | {"matrix": [7, 2], "x": 9, "y": 3}, | ||
| 77 | {"matrix": [7, 3], "x": 10, "y": 3}, | ||
| 78 | {"matrix": [7, 4], "x": 11, "y": 3} | ||
| 70 | ] | 79 | ] |
| 71 | } | 80 | } |
| 72 | } | 81 | } |
diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json index d728ba1a73..6770e467eb 100644 --- a/keyboards/handwired/pteron38/info.json +++ b/keyboards/handwired/pteron38/info.json | |||
| @@ -18,51 +18,51 @@ | |||
| 18 | "layouts": { | 18 | "layouts": { |
| 19 | "LAYOUT_split_3x5_4": { | 19 | "LAYOUT_split_3x5_4": { |
| 20 | "layout": [ | 20 | "layout": [ |
| 21 | {"x":0, "y":0.75}, | 21 | {"matrix": [0, 0], "x": 0, "y": 0.75}, |
| 22 | {"x":1, "y":0.25}, | 22 | {"matrix": [0, 1], "x": 1, "y": 0.25}, |
| 23 | {"x":2, "y":0}, | 23 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 24 | {"x":3, "y":0.35}, | 24 | {"matrix": [0, 3], "x": 3, "y": 0.35}, |
| 25 | {"x":4, "y":0.45}, | 25 | {"matrix": [0, 4], "x": 4, "y": 0.45}, |
| 26 | 26 | ||
| 27 | {"x":10, "y":0.45}, | 27 | {"matrix": [0, 5], "x": 10, "y": 0.45}, |
| 28 | {"x":11, "y":0.35}, | 28 | {"matrix": [0, 6], "x": 11, "y": 0.35}, |
| 29 | {"x":12, "y":0}, | 29 | {"matrix": [0, 7], "x": 12, "y": 0}, |
| 30 | {"x":13, "y":0.25}, | 30 | {"matrix": [0, 8], "x": 13, "y": 0.25}, |
| 31 | {"x":14, "y":0.75}, | 31 | {"matrix": [0, 9], "x": 14, "y": 0.75}, |
| 32 | 32 | ||
| 33 | {"x":0, "y":1.75}, | 33 | {"matrix": [1, 0], "x": 0, "y": 1.75}, |
| 34 | {"x":1, "y":1.25}, | 34 | {"matrix": [1, 1], "x": 1, "y": 1.25}, |
| 35 | {"x":2, "y":1}, | 35 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 36 | {"x":3, "y":1.35}, | 36 | {"matrix": [1, 3], "x": 3, "y": 1.35}, |
| 37 | {"x":4, "y":1.45}, | 37 | {"matrix": [1, 4], "x": 4, "y": 1.45}, |
| 38 | 38 | ||
| 39 | {"x":10, "y":1.45}, | 39 | {"matrix": [1, 5], "x": 10, "y": 1.45}, |
| 40 | {"x":11, "y":1.35}, | 40 | {"matrix": [1, 6], "x": 11, "y": 1.35}, |
| 41 | {"x":12, "y":1}, | 41 | {"matrix": [1, 7], "x": 12, "y": 1}, |
| 42 | {"x":13, "y":1.25}, | 42 | {"matrix": [1, 8], "x": 13, "y": 1.25}, |
| 43 | {"x":14, "y":1.75}, | 43 | {"matrix": [1, 9], "x": 14, "y": 1.75}, |
| 44 | 44 | ||
| 45 | {"x":0, "y":2.75}, | 45 | {"matrix": [2, 0], "x": 0, "y": 2.75}, |
| 46 | {"x":1, "y":2.25}, | 46 | {"matrix": [2, 1], "x": 1, "y": 2.25}, |
| 47 | {"x":2, "y":2}, | 47 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 48 | {"x":3, "y":2.35}, | 48 | {"matrix": [2, 3], "x": 3, "y": 2.35}, |
| 49 | {"x":4, "y":2.45}, | 49 | {"matrix": [2, 4], "x": 4, "y": 2.45}, |
| 50 | 50 | ||
| 51 | {"x":10, "y":2.45}, | 51 | {"matrix": [2, 5], "x": 10, "y": 2.45}, |
| 52 | {"x":11, "y":2.35}, | 52 | {"matrix": [2, 6], "x": 11, "y": 2.35}, |
| 53 | {"x":12, "y":2}, | 53 | {"matrix": [2, 7], "x": 12, "y": 2}, |
| 54 | {"x":13, "y":2.25}, | 54 | {"matrix": [2, 8], "x": 13, "y": 2.25}, |
| 55 | {"x":14, "y":2.75}, | 55 | {"matrix": [2, 9], "x": 14, "y": 2.75}, |
| 56 | 56 | ||
| 57 | {"x":3, "y":3.35}, | 57 | {"matrix": [3, 1], "x": 3, "y": 3.35}, |
| 58 | {"x":4, "y":3.45}, | 58 | {"matrix": [3, 2], "x": 4, "y": 3.45}, |
| 59 | {"x":5, "y":3.65}, | 59 | {"matrix": [3, 3], "x": 5, "y": 3.65}, |
| 60 | {"x":6, "y":3.95}, | 60 | {"matrix": [3, 4], "x": 6, "y": 3.95}, |
| 61 | 61 | ||
| 62 | {"x":8, "y":3.95}, | 62 | {"matrix": [3, 5], "x": 8, "y": 3.95}, |
| 63 | {"x":9, "y":3.65}, | 63 | {"matrix": [3, 6], "x": 9, "y": 3.65}, |
| 64 | {"x":10, "y":3.45}, | 64 | {"matrix": [3, 7], "x": 10, "y": 3.45}, |
| 65 | {"x":11, "y":3.35} | 65 | {"matrix": [3, 8], "x": 11, "y": 3.35} |
| 66 | ] | 66 | ] |
| 67 | } | 67 | } |
| 68 | } | 68 | } |
diff --git a/keyboards/handwired/pteron38/pteron38.h b/keyboards/handwired/pteron38/pteron38.h deleted file mode 100644 index 7b9e734cfb..0000000000 --- a/keyboards/handwired/pteron38/pteron38.h +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | /* Copyright 2020 Fidel Coria | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | #define LAYOUT_split_3x5_4( \ | ||
| 22 | K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ | ||
| 23 | K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ | ||
| 24 | K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \ | ||
| 25 | K402, K403, K404, K405, K406, K407, K408, K409 \ | ||
| 26 | ) { \ | ||
| 27 | { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ | ||
| 28 | { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ | ||
| 29 | { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \ | ||
| 30 | { KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO } \ | ||
| 31 | } | ||
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index e2e2b4a3f7..c5f15104f6 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json | |||
| @@ -22,143 +22,290 @@ | |||
| 22 | "layouts": { | 22 | "layouts": { |
| 23 | "LAYOUT": { | 23 | "LAYOUT": { |
| 24 | "layout": [ | 24 | "layout": [ |
| 25 | {"label":"q", "x":0, "y":0.9}, | 25 | {"matrix": [0, 0], "x": 0, "y": 0.9}, |
| 26 | {"label":"w", "x":1, "y":0.2}, | 26 | {"matrix": [0, 1], "x": 1, "y": 0.2}, |
| 27 | {"label":"e", "x":2, "y":0}, | 27 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 28 | {"label":"r", "x":3, "y":0.1}, | 28 | {"matrix": [0, 3], "x": 3, "y": 0.1}, |
| 29 | {"label":"t", "x":4, "y":0.15}, | 29 | {"matrix": [0, 4], "x": 4, "y": 0.15}, |
| 30 | 30 | ||
| 31 | {"label":"y", "x":5, "y":0.15}, | 31 | {"matrix": [4, 4], "x": 5, "y": 0.15}, |
| 32 | {"label":"u", "x":6, "y":0.1}, | 32 | {"matrix": [4, 3], "x": 6, "y": 0.1}, |
| 33 | {"label":"i", "x":7, "y":0}, | 33 | {"matrix": [4, 2], "x": 7, "y": 0}, |
| 34 | {"label":"o", "x":8, "y":0.2}, | 34 | {"matrix": [4, 1], "x": 8, "y": 0.2}, |
| 35 | {"label":"p", "x":9, "y":0.9}, | 35 | {"matrix": [4, 0], "x": 9, "y": 0.9}, |
| 36 | 36 | ||
| 37 | {"label":"a", "x":0, "y":1.9}, | 37 | {"matrix": [1, 0], "x": 0, "y": 1.9}, |
| 38 | {"label":"s", "x":1, "y":1.2}, | 38 | {"matrix": [1, 1], "x": 1, "y": 1.2}, |
| 39 | {"label":"d", "x":2, "y":1}, | 39 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 40 | {"label":"f", "x":3, "y":1.1}, | 40 | {"matrix": [1, 3], "x": 3, "y": 1.1}, |
| 41 | {"label":"g", "x":4, "y":1.15}, | 41 | {"matrix": [1, 4], "x": 4, "y": 1.15}, |
| 42 | 42 | ||
| 43 | {"label":"h", "x":5, "y":1.15}, | 43 | {"matrix": [5, 4], "x": 5, "y": 1.15}, |
| 44 | {"label":"j", "x":6, "y":1.1}, | 44 | {"matrix": [5, 3], "x": 6, "y": 1.1}, |
| 45 | {"label":"k", "x":7, "y":1}, | 45 | {"matrix": [5, 2], "x": 7, "y": 1}, |
| 46 | {"label":"l", "x":8, "y":1.2}, | 46 | {"matrix": [5, 1], "x": 8, "y": 1.2}, |
| 47 | {"label":"'", "x":9, "y":1.9}, | 47 | {"matrix": [5, 0], "x": 9, "y": 1.9}, |
| 48 | 48 | ||
| 49 | {"label":"z", "x":0, "y":2.9}, | 49 | {"matrix": [2, 0], "x": 0, "y": 2.9}, |
| 50 | {"label":"x", "x":1, "y":2.2}, | 50 | {"matrix": [2, 1], "x": 1, "y": 2.2}, |
| 51 | {"label":"c", "x":2, "y":2}, | 51 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 52 | {"label":"v", "x":3, "y":2.1}, | 52 | {"matrix": [2, 3], "x": 3, "y": 2.1}, |
| 53 | {"label":"b", "x":4, "y":2.15}, | 53 | {"matrix": [2, 4], "x": 4, "y": 2.15}, |
| 54 | 54 | ||
| 55 | {"label":"n", "x":5, "y":2.15}, | 55 | {"matrix": [6, 4], "x": 5, "y": 2.15}, |
| 56 | {"label":"m", "x":6, "y":2.1}, | 56 | {"matrix": [6, 3], "x": 6, "y": 2.1}, |
| 57 | {"label":",", "x":7, "y":2}, | 57 | {"matrix": [6, 2], "x": 7, "y": 2}, |
| 58 | {"label":".", "x":8, "y":2.2}, | 58 | {"matrix": [6, 1], "x": 8, "y": 2.2}, |
| 59 | {"label":"/", "x":9, "y":2.9}, | 59 | {"matrix": [6, 0], "x": 9, "y": 2.9}, |
| 60 | 60 | ||
| 61 | {"label":"bspc/lwr", "x":3, "y":3.6, "h":2}, | 61 | {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, |
| 62 | {"label":"esc/sft", "x":4, "y":3.65, "h":2}, | 62 | {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, |
| 63 | 63 | ||
| 64 | {"label":"ent/alt", "x":5, "y":3.65, "h":2}, | 64 | {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, |
| 65 | {"label":"spc/ris", "x":6, "y":3.6, "h":2} | 65 | {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2} |
| 66 | ] | ||
| 67 | }, | ||
| 68 | "LAYOUT_complicated": { | ||
| 69 | "layout": [ | ||
| 70 | {"matrix": [0, 0], "x": 0, "y": 0.9}, | ||
| 71 | {"matrix": [0, 1], "x": 1, "y": 0.2}, | ||
| 72 | {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| 73 | {"matrix": [0, 3], "x": 3, "y": 0.1}, | ||
| 74 | {"matrix": [0, 4], "x": 4, "y": 0.15}, | ||
| 75 | |||
| 76 | {"matrix": [4, 4], "x": 5, "y": 0.15}, | ||
| 77 | {"matrix": [4, 3], "x": 6, "y": 0.1}, | ||
| 78 | {"matrix": [4, 2], "x": 7, "y": 0}, | ||
| 79 | {"matrix": [4, 1], "x": 8, "y": 0.2}, | ||
| 80 | {"matrix": [4, 0], "x": 9, "y": 0.9}, | ||
| 81 | |||
| 82 | {"matrix": [1, 0], "x": 0, "y": 1.9}, | ||
| 83 | {"matrix": [1, 1], "x": 1, "y": 1.2}, | ||
| 84 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 85 | {"matrix": [1, 3], "x": 3, "y": 1.1}, | ||
| 86 | {"matrix": [1, 4], "x": 4, "y": 1.15}, | ||
| 87 | |||
| 88 | {"matrix": [5, 4], "x": 5, "y": 1.15}, | ||
| 89 | {"matrix": [5, 3], "x": 6, "y": 1.1}, | ||
| 90 | {"matrix": [5, 2], "x": 7, "y": 1}, | ||
| 91 | {"matrix": [5, 1], "x": 8, "y": 1.2}, | ||
| 92 | {"matrix": [5, 0], "x": 9, "y": 1.9}, | ||
| 93 | |||
| 94 | {"matrix": [2, 0], "x": 0, "y": 2.9}, | ||
| 95 | {"matrix": [2, 1], "x": 1, "y": 2.2}, | ||
| 96 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 97 | {"matrix": [2, 3], "x": 3, "y": 2.1}, | ||
| 98 | {"matrix": [2, 4], "x": 4, "y": 2.15}, | ||
| 99 | |||
| 100 | {"matrix": [6, 4], "x": 5, "y": 2.15}, | ||
| 101 | {"matrix": [6, 3], "x": 6, "y": 2.1}, | ||
| 102 | {"matrix": [6, 2], "x": 7, "y": 2}, | ||
| 103 | {"matrix": [6, 1], "x": 8, "y": 2.2}, | ||
| 104 | {"matrix": [6, 0], "x": 9, "y": 2.9}, | ||
| 105 | |||
| 106 | {"matrix": [3, 3], "x": 3, "y": 3.6}, | ||
| 107 | {"matrix": [3, 4], "x": 4, "y": 3.65}, | ||
| 108 | |||
| 109 | {"matrix": [7, 4], "x": 5, "y": 3.65}, | ||
| 110 | {"matrix": [7, 3], "x": 6, "y": 3.6}, | ||
| 111 | |||
| 112 | {"matrix": [3, 1], "x": 3, "y": 4.6}, | ||
| 113 | {"matrix": [3, 2], "x": 4, "y": 4.65}, | ||
| 114 | |||
| 115 | {"matrix": [7, 2], "x": 5, "y": 4.65}, | ||
| 116 | {"matrix": [7, 1], "x": 6, "y": 4.6} | ||
| 117 | ] | ||
| 118 | }, | ||
| 119 | "LAYOUT_full": { | ||
| 120 | "layout": [ | ||
| 121 | {"matrix": [0, 0], "x": 0, "y": 0}, | ||
| 122 | {"matrix": [0, 1], "x": 1, "y": 0}, | ||
| 123 | {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| 124 | {"matrix": [0, 3], "x": 3, "y": 0}, | ||
| 125 | {"matrix": [0, 4], "x": 4, "y": 0}, | ||
| 126 | |||
| 127 | {"matrix": [4, 4], "x": 5, "y": 0}, | ||
| 128 | {"matrix": [4, 3], "x": 6, "y": 0}, | ||
| 129 | {"matrix": [4, 2], "x": 7, "y": 0}, | ||
| 130 | {"matrix": [4, 1], "x": 8, "y": 0}, | ||
| 131 | {"matrix": [4, 0], "x": 9, "y": 0}, | ||
| 132 | |||
| 133 | {"matrix": [1, 0], "x": 10, "y": 0}, | ||
| 134 | {"matrix": [1, 1], "x": 11, "y": 0}, | ||
| 135 | {"matrix": [1, 2], "x": 12, "y": 0}, | ||
| 136 | {"matrix": [1, 3], "x": 13, "y": 0}, | ||
| 137 | {"matrix": [1, 4], "x": 14, "y": 0}, | ||
| 138 | |||
| 139 | {"matrix": [5, 4], "x": 15, "y": 0}, | ||
| 140 | {"matrix": [5, 3], "x": 16, "y": 0}, | ||
| 141 | {"matrix": [5, 2], "x": 17, "y": 0}, | ||
| 142 | {"matrix": [5, 1], "x": 18, "y": 0}, | ||
| 143 | {"matrix": [5, 0], "x": 19, "y": 0}, | ||
| 144 | |||
| 145 | {"matrix": [2, 0], "x": 20, "y": 0}, | ||
| 146 | {"matrix": [2, 1], "x": 21, "y": 0}, | ||
| 147 | {"matrix": [2, 2], "x": 22, "y": 0}, | ||
| 148 | {"matrix": [2, 3], "x": 23, "y": 0}, | ||
| 149 | {"matrix": [2, 4], "x": 24, "y": 0}, | ||
| 150 | |||
| 151 | {"matrix": [6, 4], "x": 25, "y": 0}, | ||
| 152 | {"matrix": [6, 3], "x": 26, "y": 0}, | ||
| 153 | {"matrix": [6, 2], "x": 27, "y": 0}, | ||
| 154 | {"matrix": [6, 1], "x": 28, "y": 0}, | ||
| 155 | {"matrix": [6, 0], "x": 29, "y": 0}, | ||
| 156 | |||
| 157 | {"matrix": [3, 0], "x": 30, "y": 0}, | ||
| 158 | {"matrix": [3, 1], "x": 31, "y": 0}, | ||
| 159 | {"matrix": [3, 2], "x": 32, "y": 0}, | ||
| 160 | {"matrix": [3, 3], "x": 33, "y": 0}, | ||
| 161 | {"matrix": [3, 4], "x": 34, "y": 0}, | ||
| 162 | |||
| 163 | {"matrix": [7, 4], "x": 35, "y": 0}, | ||
| 164 | {"matrix": [7, 3], "x": 36, "y": 0}, | ||
| 165 | {"matrix": [7, 2], "x": 37, "y": 0}, | ||
| 166 | {"matrix": [7, 1], "x": 38, "y": 0}, | ||
| 167 | {"matrix": [7, 0], "x": 39, "y": 0} | ||
| 168 | ] | ||
| 169 | }, | ||
| 170 | "LAYOUT_reversed": { | ||
| 171 | "layout": [ | ||
| 172 | {"matrix": [4, 0], "x": 0, "y": 0}, | ||
| 173 | {"matrix": [4, 1], "x": 1, "y": 0}, | ||
| 174 | {"matrix": [4, 2], "x": 2, "y": 0}, | ||
| 175 | {"matrix": [4, 3], "x": 3, "y": 0}, | ||
| 176 | {"matrix": [4, 4], "x": 4, "y": 0}, | ||
| 177 | |||
| 178 | {"matrix": [0, 4], "x": 5, "y": 0}, | ||
| 179 | {"matrix": [0, 3], "x": 6, "y": 0}, | ||
| 180 | {"matrix": [0, 2], "x": 7, "y": 0}, | ||
| 181 | {"matrix": [0, 1], "x": 8, "y": 0}, | ||
| 182 | {"matrix": [0, 0], "x": 9, "y": 0}, | ||
| 183 | |||
| 184 | {"matrix": [5, 0], "x": 10, "y": 0}, | ||
| 185 | {"matrix": [5, 1], "x": 11, "y": 0}, | ||
| 186 | {"matrix": [5, 2], "x": 12, "y": 0}, | ||
| 187 | {"matrix": [5, 3], "x": 13, "y": 0}, | ||
| 188 | {"matrix": [5, 4], "x": 14, "y": 0}, | ||
| 189 | |||
| 190 | {"matrix": [1, 4], "x": 15, "y": 0}, | ||
| 191 | {"matrix": [1, 3], "x": 16, "y": 0}, | ||
| 192 | {"matrix": [1, 2], "x": 17, "y": 0}, | ||
| 193 | {"matrix": [1, 1], "x": 18, "y": 0}, | ||
| 194 | {"matrix": [1, 0], "x": 19, "y": 0}, | ||
| 195 | |||
| 196 | {"matrix": [6, 0], "x": 20, "y": 0}, | ||
| 197 | {"matrix": [6, 1], "x": 21, "y": 0}, | ||
| 198 | {"matrix": [6, 2], "x": 22, "y": 0}, | ||
| 199 | {"matrix": [6, 3], "x": 23, "y": 0}, | ||
| 200 | {"matrix": [6, 4], "x": 24, "y": 0}, | ||
| 201 | |||
| 202 | {"matrix": [2, 4], "x": 25, "y": 0}, | ||
| 203 | {"matrix": [2, 3], "x": 26, "y": 0}, | ||
| 204 | {"matrix": [2, 2], "x": 27, "y": 0}, | ||
| 205 | {"matrix": [2, 1], "x": 28, "y": 0}, | ||
| 206 | {"matrix": [2, 0], "x": 29, "y": 0}, | ||
| 207 | |||
| 208 | {"matrix": [7, 3], "x": 30, "y": 0}, | ||
| 209 | {"matrix": [7, 4], "x": 31, "y": 0}, | ||
| 210 | |||
| 211 | {"matrix": [3, 4], "x": 32, "y": 0}, | ||
| 212 | {"matrix": [3, 3], "x": 33, "y": 0} | ||
| 66 | ] | 213 | ] |
| 67 | }, | 214 | }, |
| 68 | "LAYOUT_split_3x5_3": { | 215 | "LAYOUT_split_3x5_3": { |
| 69 | "layout": [ | 216 | "layout": [ |
| 70 | {"label":"q", "x":0, "y":0.9}, | 217 | {"matrix": [0, 0], "x": 0, "y": 0.9}, |
| 71 | {"label":"w", "x":1, "y":0.2}, | 218 | {"matrix": [0, 1], "x": 1, "y": 0.2}, |
| 72 | {"label":"e", "x":2, "y":0}, | 219 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 73 | {"label":"r", "x":3, "y":0.1}, | 220 | {"matrix": [0, 3], "x": 3, "y": 0.1}, |
| 74 | {"label":"t", "x":4, "y":0.15}, | 221 | {"matrix": [0, 4], "x": 4, "y": 0.15}, |
| 75 | 222 | ||
| 76 | {"label":"y", "x":5, "y":0.15}, | 223 | {"matrix": [4, 4], "x": 5, "y": 0.15}, |
| 77 | {"label":"u", "x":6, "y":0.1}, | 224 | {"matrix": [4, 3], "x": 6, "y": 0.1}, |
| 78 | {"label":"i", "x":7, "y":0}, | 225 | {"matrix": [4, 2], "x": 7, "y": 0}, |
| 79 | {"label":"o", "x":8, "y":0.2}, | 226 | {"matrix": [4, 1], "x": 8, "y": 0.2}, |
| 80 | {"label":"p", "x":9, "y":0.9}, | 227 | {"matrix": [4, 0], "x": 9, "y": 0.9}, |
| 81 | 228 | ||
| 82 | {"label":"a", "x":0, "y":1.9}, | 229 | {"matrix": [1, 0], "x": 0, "y": 1.9}, |
| 83 | {"label":"s", "x":1, "y":1.2}, | 230 | {"matrix": [1, 1], "x": 1, "y": 1.2}, |
| 84 | {"label":"d", "x":2, "y":1}, | 231 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 85 | {"label":"f", "x":3, "y":1.1}, | 232 | {"matrix": [1, 3], "x": 3, "y": 1.1}, |
| 86 | {"label":"g", "x":4, "y":1.15}, | 233 | {"matrix": [1, 4], "x": 4, "y": 1.15}, |
| 87 | 234 | ||
| 88 | {"label":"h", "x":5, "y":1.15}, | 235 | {"matrix": [5, 4], "x": 5, "y": 1.15}, |
| 89 | {"label":"j", "x":6, "y":1.1}, | 236 | {"matrix": [5, 3], "x": 6, "y": 1.1}, |
| 90 | {"label":"k", "x":7, "y":1}, | 237 | {"matrix": [5, 2], "x": 7, "y": 1}, |
| 91 | {"label":"l", "x":8, "y":1.2}, | 238 | {"matrix": [5, 1], "x": 8, "y": 1.2}, |
| 92 | {"label":"'", "x":9, "y":1.9}, | 239 | {"matrix": [5, 0], "x": 9, "y": 1.9}, |
| 93 | 240 | ||
| 94 | {"label":"z", "x":0, "y":2.9}, | 241 | {"matrix": [2, 0], "x": 0, "y": 2.9}, |
| 95 | {"label":"x", "x":1, "y":2.2}, | 242 | {"matrix": [2, 1], "x": 1, "y": 2.2}, |
| 96 | {"label":"c", "x":2, "y":2}, | 243 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 97 | {"label":"v", "x":3, "y":2.1}, | 244 | {"matrix": [2, 3], "x": 3, "y": 2.1}, |
| 98 | {"label":"b", "x":4, "y":2.15}, | 245 | {"matrix": [2, 4], "x": 4, "y": 2.15}, |
| 99 | 246 | ||
| 100 | {"label":"n", "x":5, "y":2.15}, | 247 | {"matrix": [6, 4], "x": 5, "y": 2.15}, |
| 101 | {"label":"m", "x":6, "y":2.1}, | 248 | {"matrix": [6, 3], "x": 6, "y": 2.1}, |
| 102 | {"label":",", "x":7, "y":2}, | 249 | {"matrix": [6, 2], "x": 7, "y": 2}, |
| 103 | {"label":".", "x":8, "y":2.2}, | 250 | {"matrix": [6, 1], "x": 8, "y": 2.2}, |
| 104 | {"label":"/", "x":9, "y":2.9}, | 251 | {"matrix": [6, 0], "x": 9, "y": 2.9}, |
| 105 | 252 | ||
| 106 | {"label":"lower", "x":2, "y":3.6, "h":1.25}, | 253 | {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25}, |
| 107 | {"label":"bspc", "x":3, "y":3.6, "h":2}, | 254 | {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, |
| 108 | {"label":"esc/sft", "x":4, "y":3.65, "h":2}, | 255 | {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, |
| 109 | 256 | ||
| 110 | {"label":"ent/alt", "x":5, "y":3.65, "h":2}, | 257 | {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, |
| 111 | {"label":"spc", "x":6, "y":3.6, "h":2}, | 258 | {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}, |
| 112 | {"label":"raise", "x":7, "y":3.6, "h":1.25} | 259 | {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25} |
| 113 | ] | 260 | ] |
| 114 | }, | 261 | }, |
| 115 | "LAYOUT_complicated": { | 262 | "LAYOUT_thumbrow": { |
| 116 | "layout": [ | 263 | "layout": [ |
| 117 | {"label":"q", "x":0, "y":0.9}, | 264 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 118 | {"label":"w", "x":1, "y":0.2}, | 265 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 119 | {"label":"e", "x":2, "y":0}, | 266 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 120 | {"label":"r", "x":3, "y":0.1}, | 267 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 121 | {"label":"t", "x":4, "y":0.15}, | 268 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 122 | 269 | ||
| 123 | {"label":"y", "x":5, "y":0.15}, | 270 | {"matrix": [4, 4], "x": 5, "y": 0}, |
| 124 | {"label":"u", "x":6, "y":0.1}, | 271 | {"matrix": [4, 3], "x": 6, "y": 0}, |
| 125 | {"label":"i", "x":7, "y":0}, | 272 | {"matrix": [4, 2], "x": 7, "y": 0}, |
| 126 | {"label":"o", "x":8, "y":0.2}, | 273 | {"matrix": [4, 1], "x": 8, "y": 0}, |
| 127 | {"label":"p", "x":9, "y":0.9}, | 274 | {"matrix": [4, 0], "x": 9, "y": 0}, |
| 128 | 275 | ||
| 129 | {"label":"a", "x":0, "y":1.9}, | 276 | {"matrix": [1, 0], "x": 10, "y": 0}, |
| 130 | {"label":"s", "x":1, "y":1.2}, | 277 | {"matrix": [1, 1], "x": 11, "y": 0}, |
| 131 | {"label":"d", "x":2, "y":1}, | 278 | {"matrix": [1, 2], "x": 12, "y": 0}, |
| 132 | {"label":"f", "x":3, "y":1.1}, | 279 | {"matrix": [1, 3], "x": 13, "y": 0}, |
| 133 | {"label":"g", "x":4, "y":1.15}, | 280 | {"matrix": [1, 4], "x": 14, "y": 0}, |
| 134 | 281 | ||
| 135 | {"label":"h", "x":5, "y":1.15}, | 282 | {"matrix": [5, 4], "x": 15, "y": 0}, |
| 136 | {"label":"j", "x":6, "y":1.1}, | 283 | {"matrix": [5, 3], "x": 16, "y": 0}, |
| 137 | {"label":"k", "x":7, "y":1}, | 284 | {"matrix": [5, 2], "x": 17, "y": 0}, |
| 138 | {"label":"l", "x":8, "y":1.2}, | 285 | {"matrix": [5, 1], "x": 18, "y": 0}, |
| 139 | {"label":"'", "x":9, "y":1.9}, | 286 | {"matrix": [5, 0], "x": 19, "y": 0}, |
| 140 | 287 | ||
| 141 | {"label":"z", "x":0, "y":2.9}, | 288 | {"matrix": [2, 0], "x": 20, "y": 0}, |
| 142 | {"label":"x", "x":1, "y":2.2}, | 289 | {"matrix": [2, 1], "x": 21, "y": 0}, |
| 143 | {"label":"c", "x":2, "y":2}, | 290 | {"matrix": [2, 2], "x": 22, "y": 0}, |
| 144 | {"label":"v", "x":3, "y":2.1}, | 291 | {"matrix": [2, 3], "x": 23, "y": 0}, |
| 145 | {"label":"b", "x":4, "y":2.15}, | 292 | {"matrix": [2, 4], "x": 24, "y": 0}, |
| 146 | 293 | ||
| 147 | {"label":"n", "x":5, "y":2.15}, | 294 | {"matrix": [6, 4], "x": 25, "y": 0}, |
| 148 | {"label":"m", "x":6, "y":2.1}, | 295 | {"matrix": [6, 3], "x": 26, "y": 0}, |
| 149 | {"label":",", "x":7, "y":2}, | 296 | {"matrix": [6, 2], "x": 27, "y": 0}, |
| 150 | {"label":".", "x":8, "y":2.2}, | 297 | {"matrix": [6, 1], "x": 28, "y": 0}, |
| 151 | {"label":"/", "x":9, "y":2.9}, | 298 | {"matrix": [6, 0], "x": 29, "y": 0}, |
| 152 | 299 | ||
| 153 | {"label":"bspc", "x":3, "y":3.6}, | 300 | {"matrix": [3, 1], "x": 30, "y": 0}, |
| 154 | {"label":"esc/sft", "x":4, "y":3.65}, | 301 | {"matrix": [3, 2], "x": 31, "y": 0}, |
| 155 | {"label":"ent/alt", "x":5, "y":3.65}, | 302 | {"matrix": [3, 3], "x": 32, "y": 0}, |
| 156 | {"label":"spc", "x":6, "y":3.6}, | 303 | {"matrix": [3, 4], "x": 33, "y": 0}, |
| 157 | 304 | ||
| 158 | {"label":"lower", "x":3, "y":4.6}, | 305 | {"matrix": [7, 4], "x": 34, "y": 0}, |
| 159 | {"label":"gui", "x":4, "y":4.65}, | 306 | {"matrix": [7, 3], "x": 35, "y": 0}, |
| 160 | {"label":"tab", "x":5, "y":4.65}, | 307 | {"matrix": [7, 2], "x": 36, "y": 0}, |
| 161 | {"label":"raise", "x":6, "y":4.6} | 308 | {"matrix": [7, 1], "x": 37, "y": 0} |
| 162 | ] | 309 | ] |
| 163 | } | 310 | } |
| 164 | } | 311 | } |
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h deleted file mode 100644 index 7d2ce91cdd..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.h +++ /dev/null | |||
| @@ -1,117 +0,0 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #include "quantum.h" | ||
| 4 | |||
| 5 | #define ___ KC_NO | ||
| 6 | |||
| 7 | /* This is a shortcut to help you visually see your layout. | ||
| 8 | * | ||
| 9 | * The first section contains all of the arguments representing the physical | ||
| 10 | * layout of the board and position of the keys. | ||
| 11 | * | ||
| 12 | * The second converts the arguments into a two-dimensional array which | ||
| 13 | * represents the switch matrix. | ||
| 14 | */ | ||
| 15 | #define LAYOUT( \ | ||
| 16 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 17 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 18 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 19 | L33, L34, R30, R31 \ | ||
| 20 | ) \ | ||
| 21 | { \ | ||
| 22 | { L00, L01, L02, L03, L04 }, \ | ||
| 23 | { L10, L11, L12, L13, L14 }, \ | ||
| 24 | { L20, L21, L22, L23, L24 }, \ | ||
| 25 | { ___, ___, ___, L33, L34 }, \ | ||
| 26 | { R04, R03, R02, R01, R00 }, \ | ||
| 27 | { R14, R13, R12, R11, R10 }, \ | ||
| 28 | { R24, R23, R22, R21, R20 }, \ | ||
| 29 | { ___, ___, ___, R31, R30 }, \ | ||
| 30 | } | ||
| 31 | |||
| 32 | #define LAYOUT_reversed( \ | ||
| 33 | R04, R03, R02, R01, R00, L04, L03, L02, L01, L00, \ | ||
| 34 | R14, R13, R12, R11, R10, L14, L13, L12, L11, L10, \ | ||
| 35 | R24, R23, R22, R21, R20, L24, L23, L22, L21, L20, \ | ||
| 36 | R31, R30, L34, L33 \ | ||
| 37 | ) \ | ||
| 38 | { \ | ||
| 39 | { L00, L01, L02, L03, L04 }, \ | ||
| 40 | { L10, L11, L12, L13, L14 }, \ | ||
| 41 | { L20, L21, L22, L23, L24 }, \ | ||
| 42 | { ___, ___, ___, L33, L34 }, \ | ||
| 43 | { R04, R03, R02, R01, R00 }, \ | ||
| 44 | { R14, R13, R12, R11, R10 }, \ | ||
| 45 | { R24, R23, R22, R21, R20 }, \ | ||
| 46 | { ___, ___, ___, R31, R30 }, \ | ||
| 47 | } | ||
| 48 | |||
| 49 | #define LAYOUT_split_3x5_3(\ | ||
| 50 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 51 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 52 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 53 | L32, L33, L34, R30, R31, R32 \ | ||
| 54 | ) \ | ||
| 55 | { \ | ||
| 56 | { L00, L01, L02, L03, L04 }, \ | ||
| 57 | { L10, L11, L12, L13, L14 }, \ | ||
| 58 | { L20, L21, L22, L23, L24 }, \ | ||
| 59 | { ___, ___, L32, L33, L34 }, \ | ||
| 60 | { R04, R03, R02, R01, R00 }, \ | ||
| 61 | { R14, R13, R12, R11, R10 }, \ | ||
| 62 | { R24, R23, R22, R21, R20 }, \ | ||
| 63 | { ___, ___, R32, R31, R30 }, \ | ||
| 64 | } | ||
| 65 | |||
| 66 | #define LAYOUT_complicated(\ | ||
| 67 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 68 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 69 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 70 | L33, L34, R30, R31, \ | ||
| 71 | L31, L32, R32, R33 \ | ||
| 72 | ) \ | ||
| 73 | { \ | ||
| 74 | { L00, L01, L02, L03, L04 }, \ | ||
| 75 | { L10, L11, L12, L13, L14 }, \ | ||
| 76 | { L20, L21, L22, L23, L24 }, \ | ||
| 77 | { ___, L31, L32, L33, L34 }, \ | ||
| 78 | { R04, R03, R02, R01, R00 }, \ | ||
| 79 | { R14, R13, R12, R11, R10 }, \ | ||
| 80 | { R24, R23, R22, R21, R20 }, \ | ||
| 81 | { ___, R33, R32, R31, R30 }, \ | ||
| 82 | } | ||
| 83 | |||
| 84 | #define LAYOUT_thumbrow(\ | ||
| 85 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 86 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 87 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 88 | L31, L32, L33, L34, R30, R31, R32, R33 \ | ||
| 89 | ) \ | ||
| 90 | { \ | ||
| 91 | { L00, L01, L02, L03, L04 }, \ | ||
| 92 | { L10, L11, L12, L13, L14 }, \ | ||
| 93 | { L20, L21, L22, L23, L24 }, \ | ||
| 94 | { ___, L31, L32, L33, L34 }, \ | ||
| 95 | { R04, R03, R02, R01, R00 }, \ | ||
| 96 | { R14, R13, R12, R11, R10 }, \ | ||
| 97 | { R24, R23, R22, R21, R20 }, \ | ||
| 98 | { ___, R33, R32, R31, R30 }, \ | ||
| 99 | } | ||
| 100 | |||
| 101 | #define LAYOUT_full(\ | ||
| 102 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 103 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 104 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 105 | L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \ | ||
| 106 | ) \ | ||
| 107 | { \ | ||
| 108 | { L00, L01, L02, L03, L04 }, \ | ||
| 109 | { L10, L11, L12, L13, L14 }, \ | ||
| 110 | { L20, L21, L22, L23, L24 }, \ | ||
| 111 | { L30, L31, L32, L33, L34 }, \ | ||
| 112 | { R04, R03, R02, R01, R00 }, \ | ||
| 113 | { R14, R13, R12, R11, R10 }, \ | ||
| 114 | { R24, R23, R22, R21, R20 }, \ | ||
| 115 | { R34, R33, R32, R31, R30 }, \ | ||
| 116 | } | ||
| 117 | |||
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json index 7030086a5c..d9259d5f32 100644 --- a/keyboards/ingrained/info.json +++ b/keyboards/ingrained/info.json | |||
| @@ -14,266 +14,103 @@ | |||
| 14 | "layouts": { | 14 | "layouts": { |
| 15 | "LAYOUT_split_3x6_3": { | 15 | "LAYOUT_split_3x6_3": { |
| 16 | "layout": [ | 16 | "layout": [ |
| 17 | { | 17 | {"matrix": [0, 0], "x": 0, "y": 0.3}, |
| 18 | "label": "Esc", | 18 | {"matrix": [0, 1], "x": 1, "y": 0.3}, |
| 19 | "x": 0, | 19 | {"matrix": [0, 2], "x": 2, "y": 0.1}, |
| 20 | "y": 0.3 | 20 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 21 | }, | 21 | {"matrix": [0, 4], "x": 4, "y": 0.1}, |
| 22 | { | 22 | {"matrix": [0, 5], "x": 5, "y": 0.2}, |
| 23 | "label": "Q", | 23 | |
| 24 | "x": 1, | 24 | {"matrix": [4, 5], "x": 9, "y": 0.2}, |
| 25 | "y": 0.3 | 25 | {"matrix": [4, 4], "x": 10, "y": 0.1}, |
| 26 | }, | 26 | {"matrix": [4, 3], "x": 11, "y": 0}, |
| 27 | { | 27 | {"matrix": [4, 2], "x": 12, "y": 0.1}, |
| 28 | "label": "W", | 28 | {"matrix": [4, 1], "x": 13, "y": 0.3}, |
| 29 | "x": 2, | 29 | {"matrix": [4, 0], "x": 14, "y": 0.3}, |
| 30 | "y": 0.1 | 30 | |
| 31 | }, | 31 | {"matrix": [1, 0], "x": 0, "y": 1.3}, |
| 32 | { | 32 | {"matrix": [1, 1], "x": 1, "y": 1.3}, |
| 33 | "label": "E", | 33 | {"matrix": [1, 2], "x": 2, "y": 1.1}, |
| 34 | "x": 3, | 34 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 35 | "y": 0 | 35 | {"matrix": [1, 4], "x": 4, "y": 1.1}, |
| 36 | }, | 36 | {"matrix": [1, 5], "x": 5, "y": 1.2}, |
| 37 | { | 37 | |
| 38 | "label": "R", | 38 | {"matrix": [5, 5], "x": 9, "y": 1.2}, |
| 39 | "x": 4, | 39 | {"matrix": [5, 4], "x": 10, "y": 1.1}, |
| 40 | "y": 0.1 | 40 | {"matrix": [5, 3], "x": 11, "y": 1}, |
| 41 | }, | 41 | {"matrix": [5, 2], "x": 12, "y": 1.1}, |
| 42 | { | 42 | {"matrix": [5, 1], "x": 13, "y": 1.3}, |
| 43 | "label": "T", | 43 | {"matrix": [5, 0], "x": 14, "y": 1.3}, |
| 44 | "x": 5, | 44 | |
| 45 | "y": 0.2 | 45 | {"matrix": [2, 0], "x": 0, "y": 2.3}, |
| 46 | }, | 46 | {"matrix": [2, 1], "x": 1, "y": 2.3}, |
| 47 | { | 47 | {"matrix": [2, 2], "x": 2, "y": 2.1}, |
| 48 | "label": "Y", | 48 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 49 | "x": 9, | 49 | {"matrix": [2, 4], "x": 4, "y": 2.1}, |
| 50 | "y": 0.2 | 50 | {"matrix": [2, 5], "x": 5, "y": 2.2}, |
| 51 | }, | 51 | |
| 52 | { | 52 | {"matrix": [6, 5], "x": 9, "y": 2.2}, |
| 53 | "label": "U", | 53 | {"matrix": [6, 4], "x": 10, "y": 2.1}, |
| 54 | "x": 10, | 54 | {"matrix": [6, 3], "x": 11, "y": 2}, |
| 55 | "y": 0.1 | 55 | {"matrix": [6, 2], "x": 12, "y": 2.1}, |
| 56 | }, | 56 | {"matrix": [6, 1], "x": 13, "y": 2.3}, |
| 57 | { | 57 | {"matrix": [6, 0], "x": 14, "y": 2.3}, |
| 58 | "label": "I", | 58 | |
| 59 | "x": 11, | 59 | {"matrix": [3, 3], "x": 4, "y": 3.7}, |
| 60 | "y": 0 | 60 | {"matrix": [3, 4], "x": 5, "y": 3.7}, |
| 61 | }, | 61 | {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, |
| 62 | { | 62 | |
| 63 | "label": "O", | 63 | {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, |
| 64 | "x": 12, | 64 | {"matrix": [7, 4], "x": 9, "y": 3.7}, |
| 65 | "y": 0.1 | 65 | {"matrix": [7, 3], "x": 10, "y": 3.7} |
| 66 | }, | ||
| 67 | { | ||
| 68 | "label": "P", | ||
| 69 | "x": 13, | ||
| 70 | "y": 0.3 | ||
| 71 | }, | ||
| 72 | { | ||
| 73 | "label": "Back Space", | ||
| 74 | "x": 14, | ||
| 75 | "y": 0.3 | ||
| 76 | }, | ||
| 77 | { | ||
| 78 | "label": "Tab", | ||
| 79 | "x": 0, | ||
| 80 | "y": 1.3 | ||
| 81 | }, | ||
| 82 | { | ||
| 83 | "label": "A", | ||
| 84 | "x": 1, | ||
| 85 | "y": 1.3 | ||
| 86 | }, | ||
| 87 | { | ||
| 88 | "label": "S", | ||
| 89 | "x": 2, | ||
| 90 | "y": 1.1 | ||
| 91 | }, | ||
| 92 | { | ||
| 93 | "label": "D", | ||
| 94 | "x": 3, | ||
| 95 | "y": 1 | ||
| 96 | }, | ||
| 97 | { | ||
| 98 | "label": "F", | ||
| 99 | "x": 4, | ||
| 100 | "y": 1.1 | ||
| 101 | }, | ||
| 102 | { | ||
| 103 | "label": "G", | ||
| 104 | "x": 5, | ||
| 105 | "y": 1.2 | ||
| 106 | }, | ||
| 107 | { | ||
| 108 | "label": "H", | ||
| 109 | "x": 9, | ||
| 110 | "y": 1.2 | ||
| 111 | }, | ||
| 112 | { | ||
| 113 | "label": "J", | ||
| 114 | "x": 10, | ||
| 115 | "y": 1.1 | ||
| 116 | }, | ||
| 117 | { | ||
| 118 | "label": "K", | ||
| 119 | "x": 11, | ||
| 120 | "y": 1 | ||
| 121 | }, | ||
| 122 | { | ||
| 123 | "label": "L", | ||
| 124 | "x": 12, | ||
| 125 | "y": 1.1 | ||
| 126 | }, | ||
| 127 | { | ||
| 128 | "label": ";", | ||
| 129 | "x": 13, | ||
| 130 | "y": 1.3 | ||
| 131 | }, | ||
| 132 | { | ||
| 133 | "label": "'", | ||
| 134 | "x": 14, | ||
| 135 | "y": 1.3 | ||
| 136 | }, | ||
| 137 | { | ||
| 138 | "label": "Shift", | ||
| 139 | "x": 0, | ||
| 140 | "y": 2.3 | ||
| 141 | }, | ||
| 142 | { | ||
| 143 | "label": "Z", | ||
| 144 | "x": 1, | ||
| 145 | "y": 2.3 | ||
| 146 | }, | ||
| 147 | { | ||
| 148 | "label": "X", | ||
| 149 | "x": 2, | ||
| 150 | "y": 2.1 | ||
| 151 | }, | ||
| 152 | { | ||
| 153 | "label": "C", | ||
| 154 | "x": 3, | ||
| 155 | "y": 2 | ||
| 156 | }, | ||
| 157 | { | ||
| 158 | "label": "V", | ||
| 159 | "x": 4, | ||
| 160 | "y": 2.1 | ||
| 161 | }, | ||
| 162 | { | ||
| 163 | "label": "B", | ||
| 164 | "x": 5, | ||
| 165 | "y": 2.2 | ||
| 166 | }, | ||
| 167 | { | ||
| 168 | "label": "N", | ||
| 169 | "x": 9, | ||
| 170 | "y": 2.2 | ||
| 171 | }, | ||
| 172 | { | ||
| 173 | "label": "M", | ||
| 174 | "x": 10, | ||
| 175 | "y": 2.1 | ||
| 176 | }, | ||
| 177 | { | ||
| 178 | "label": ",", | ||
| 179 | "x": 11, | ||
| 180 | "y": 2 | ||
| 181 | }, | ||
| 182 | { | ||
| 183 | "label": ".", | ||
| 184 | "x": 12, | ||
| 185 | "y": 2.1 | ||
| 186 | }, | ||
| 187 | { | ||
| 188 | "label": "/", | ||
| 189 | "x": 13, | ||
| 190 | "y": 2.3 | ||
| 191 | }, | ||
| 192 | { | ||
| 193 | "label": "Shift", | ||
| 194 | "x": 14, | ||
| 195 | "y": 2.3 | ||
| 196 | }, | ||
| 197 | { | ||
| 198 | "label": "GUI", | ||
| 199 | "x": 4, | ||
| 200 | "y": 3.7 | ||
| 201 | }, | ||
| 202 | { | ||
| 203 | "label": "Lower", | ||
| 204 | "x": 5, | ||
| 205 | "y": 3.7 | ||
| 206 | }, | ||
| 207 | { | ||
| 208 | "label": "Space", | ||
| 209 | "x": 6, | ||
| 210 | "y": 3.2, | ||
| 211 | "h": 1.5 | ||
| 212 | }, | ||
| 213 | { | ||
| 214 | "label": "Enter", | ||
| 215 | "x": 8, | ||
| 216 | "y": 3.2, | ||
| 217 | "h": 1.5 | ||
| 218 | }, | ||
| 219 | { | ||
| 220 | "label": "Raise", | ||
| 221 | "x": 9, | ||
| 222 | "y": 3.7 | ||
| 223 | }, | ||
| 224 | { | ||
| 225 | "label": "Alt", | ||
| 226 | "x": 10, | ||
| 227 | "y": 3.7 | ||
| 228 | } | ||
| 229 | ] | 66 | ] |
| 230 | }, | 67 | }, |
| 231 | "LAYOUT_split_3x5_3": { | 68 | "LAYOUT_split_3x5_3": { |
| 232 | "layout": [ | 69 | "layout": [ |
| 233 | {"label":"Q", "x":0, "y":0.3}, | 70 | {"matrix": [0, 1], "x": 0, "y": 0.3}, |
| 234 | {"label":"W", "x":1, "y":0.1}, | 71 | {"matrix": [0, 2], "x": 1, "y": 0.1}, |
| 235 | {"label":"E", "x":2, "y":0}, | 72 | {"matrix": [0, 3], "x": 2, "y": 0}, |
| 236 | {"label":"R", "x":3, "y":0.1}, | 73 | {"matrix": [0, 4], "x": 3, "y": 0.1}, |
| 237 | {"label":"T", "x":4, "y":0.2}, | 74 | {"matrix": [0, 5], "x": 4, "y": 0.2}, |
| 238 | 75 | ||
| 239 | {"label":"Y", "x":8, "y":0.2}, | 76 | {"matrix": [4, 5], "x": 8, "y": 0.2}, |
| 240 | {"label":"U", "x":9, "y":0.1}, | 77 | {"matrix": [4, 4], "x": 9, "y": 0.1}, |
| 241 | {"label":"I", "x":10, "y":0}, | 78 | {"matrix": [4, 3], "x": 10, "y": 0}, |
| 242 | {"label":"O", "x":11, "y":0.1}, | 79 | {"matrix": [4, 2], "x": 11, "y": 0.1}, |
| 243 | {"label":"P", "x":12, "y":0.3}, | 80 | {"matrix": [4, 1], "x": 12, "y": 0.3}, |
| 244 | 81 | ||
| 245 | {"label":"A", "x":0, "y":1.3}, | 82 | {"matrix": [1, 1], "x": 0, "y": 1.3}, |
| 246 | {"label":"S", "x":1, "y":1.1}, | 83 | {"matrix": [1, 2], "x": 1, "y": 1.1}, |
| 247 | {"label":"D", "x":2, "y":1}, | 84 | {"matrix": [1, 3], "x": 2, "y": 1}, |
| 248 | {"label":"F", "x":3, "y":1.1}, | 85 | {"matrix": [1, 4], "x": 3, "y": 1.1}, |
| 249 | {"label":"G", "x":4, "y":1.2}, | 86 | {"matrix": [1, 5], "x": 4, "y": 1.2}, |
| 250 | 87 | ||
| 251 | {"label":"H", "x":8, "y":1.2}, | 88 | {"matrix": [5, 5], "x": 8, "y": 1.2}, |
| 252 | {"label":"J", "x":9, "y":1.1}, | 89 | {"matrix": [5, 4], "x": 9, "y": 1.1}, |
| 253 | {"label":"K", "x":10, "y":1}, | 90 | {"matrix": [5, 3], "x": 10, "y": 1}, |
| 254 | {"label":"L", "x":11, "y":1.1}, | 91 | {"matrix": [5, 2], "x": 11, "y": 1.1}, |
| 255 | {"label":";", "x":12, "y":1.3}, | 92 | {"matrix": [5, 1], "x": 12, "y": 1.3}, |
| 256 | 93 | ||
| 257 | {"label":"Z", "x":0, "y":2.3}, | 94 | {"matrix": [2, 1], "x": 0, "y": 2.3}, |
| 258 | {"label":"X", "x":1, "y":2.1}, | 95 | {"matrix": [2, 2], "x": 1, "y": 2.1}, |
| 259 | {"label":"C", "x":2, "y":2}, | 96 | {"matrix": [2, 3], "x": 2, "y": 2}, |
| 260 | {"label":"V", "x":3, "y":2.1}, | 97 | {"matrix": [2, 4], "x": 3, "y": 2.1}, |
| 261 | {"label":"B", "x":4, "y":2.2}, | 98 | {"matrix": [2, 5], "x": 4, "y": 2.2}, |
| 262 | 99 | ||
| 263 | {"label":"N", "x":8, "y":2.2}, | 100 | {"matrix": [6, 5], "x": 8, "y": 2.2}, |
| 264 | {"label":"M", "x":9, "y":2.1}, | 101 | {"matrix": [6, 4], "x": 9, "y": 2.1}, |
| 265 | {"label":",", "x":10, "y":2}, | 102 | {"matrix": [6, 3], "x": 10, "y": 2}, |
| 266 | {"label":".", "x":11, "y":2.1}, | 103 | {"matrix": [6, 2], "x": 11, "y": 2.1}, |
| 267 | {"label":"/", "x":12, "y":2.3}, | 104 | {"matrix": [6, 1], "x": 12, "y": 2.3}, |
| 268 | 105 | ||
| 269 | {"label":"GUI", "x":3, "y":3.7}, | 106 | {"matrix": [3, 3], "x": 3, "y": 3.7}, |
| 270 | {"label":"Lower", "x":4, "y":3.7}, | 107 | {"matrix": [3, 4], "x": 4, "y": 3.7}, |
| 271 | {"label":"Space", "x":5, "y":3.2, "h":1.5}, | 108 | {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, |
| 272 | 109 | ||
| 273 | {"label":"Enter", "x":7, "y":3.2, "h":1.5}, | 110 | {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, |
| 274 | {"label":"Raise", "x":8, "y":3.7}, | 111 | {"matrix": [7, 4], "x": 8, "y": 3.7}, |
| 275 | {"label":"Alt", "x":9, "y":3.7} | 112 | {"matrix": [7, 3], "x": 9, "y": 3.7} |
| 276 | ] | 113 | ] |
| 277 | } | 114 | } |
| 278 | } | 115 | } |
| 279 | } | 116 | } |
diff --git a/keyboards/ingrained/ingrained.h b/keyboards/ingrained/ingrained.h deleted file mode 100644 index d2e3055951..0000000000 --- a/keyboards/ingrained/ingrained.h +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | // Copyright 2021 s8erdude (@jpuerto96) | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "quantum.h" | ||
| 7 | |||
| 8 | /* This is a shortcut to help you visually see your layout. | ||
| 9 | * | ||
| 10 | * The first section contains all of the arguments representing the physical | ||
| 11 | * layout of the board and position of the keys. | ||
| 12 | * | ||
| 13 | * The second converts the arguments into a two-dimensional array which | ||
| 14 | * represents the switch matrix. | ||
| 15 | */ | ||
| 16 | #define XXX KC_NO | ||
| 17 | |||
| 18 | #define LAYOUT_split_3x6_3( \ | ||
| 19 | k00, k01, k02, k03, k04, k05, k011, k010, k09, k08, k07, k06,\ | ||
| 20 | k10, k11, k12, k13, k14, k15, k111, k110, k19, k18, k17, k16,\ | ||
| 21 | k20, k21, k22, k23, k24, k25, k211, k210, k29, k28, k27, k26,\ | ||
| 22 | k33, k34, k35, k311, k310, k39\ | ||
| 23 | ) { \ | ||
| 24 | { k00, k01, k02, k03, k04, k05 },\ | ||
| 25 | { k10, k11, k12, k13, k14, k15 },\ | ||
| 26 | { k20, k21, k22, k23, k24, k25 },\ | ||
| 27 | { XXX, XXX, XXX, k33, k34, k35 },\ | ||
| 28 | { k06, k07, k08, k09, k010, k011 },\ | ||
| 29 | { k16, k17, k18, k19, k110, k111 },\ | ||
| 30 | { k26, k27, k28, k29, k210, k211 },\ | ||
| 31 | { XXX, XXX, XXX, k39, k310, k311 }\ | ||
| 32 | } | ||
| 33 | #define LAYOUT_split_3x5_3( \ | ||
| 34 | k01, k02, k03, k04, k05, k011, k010, k09, k08, k07,\ | ||
| 35 | k11, k12, k13, k14, k15, k111, k110, k19, k18, k17,\ | ||
| 36 | k21, k22, k23, k24, k25, k211, k210, k29, k28, k27,\ | ||
| 37 | k33, k34, k35, k311, k310, k39\ | ||
| 38 | ) { \ | ||
| 39 | { XXX, k01, k02, k03, k04, k05 },\ | ||
| 40 | { XXX, k11, k12, k13, k14, k15 },\ | ||
| 41 | { XXX, k21, k22, k23, k24, k25 },\ | ||
| 42 | { XXX, XXX, XXX, k33, k34, k35 },\ | ||
| 43 | { XXX, k07, k08, k09, k010, k011 },\ | ||
| 44 | { XXX, k17, k18, k19, k110, k111 },\ | ||
| 45 | { XXX, k27, k28, k29, k210, k211 },\ | ||
| 46 | { XXX, XXX, XXX, k39, k310, k311 }\ | ||
| 47 | } | ||
diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h deleted file mode 100644 index ba93405ecc..0000000000 --- a/keyboards/kakunpc/suihankey/split/alpha/alpha.h +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | /* Copyright 2019 kakunpc | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the Leys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT_split_3x5_3( \ | ||
| 29 | L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ | ||
| 30 | L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ | ||
| 31 | L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ | ||
| 32 | L30, L31, L32, R32, R31, R30 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { L00, L01, L02, L03, L04 }, \ | ||
| 36 | { L10, L11, L12, L13, L14 }, \ | ||
| 37 | { L20, L21, L22, L23, L24 }, \ | ||
| 38 | { L30, L31, L32 }, \ | ||
| 39 | { R00, R01, R02, R03, R04 }, \ | ||
| 40 | { R10, R11, R12, R13, R14 }, \ | ||
| 41 | { R20, R21, R22, R23, R24 }, \ | ||
| 42 | { R30, R31, R32 }, \ | ||
| 43 | } | ||
| 44 | |||
| 45 | #define LAYOUT LAYOUT_split_3x5_3 | ||
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json index d1bbbdde66..fa44995dbd 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/info.json +++ b/keyboards/kakunpc/suihankey/split/alpha/info.json | |||
| @@ -3,5 +3,57 @@ | |||
| 3 | "cols": ["D4", "C6", "D7", "E6", "B4"], | 3 | "cols": ["D4", "C6", "D7", "E6", "B4"], |
| 4 | "rows": ["F4", "F5", "F6", "F7"] | 4 | "rows": ["F4", "F5", "F6", "F7"] |
| 5 | }, | 5 | }, |
| 6 | "diode_direction": "COL2ROW" | 6 | "diode_direction": "COL2ROW", |
| 7 | "layout_aliases": { | ||
| 8 | "LAYOUT": "LAYOUT_split_3x5_3" | ||
| 9 | }, | ||
| 10 | "layouts": { | ||
| 11 | "LAYOUT_split_3x5_3": { | ||
| 12 | "layout": [ | ||
| 13 | {"matrix": [0, 0], "x": 0, "y": 0.375}, | ||
| 14 | {"matrix": [0, 1], "x": 1, "y": 0.125}, | ||
| 15 | {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| 16 | {"matrix": [0, 3], "x": 3, "y": 0.125}, | ||
| 17 | {"matrix": [0, 4], "x": 4, "y": 0.25}, | ||
| 18 | |||
| 19 | {"matrix": [4, 4], "x": 8.2, "y": 0.25}, | ||
| 20 | {"matrix": [4, 3], "x": 9.2, "y": 0.125}, | ||
| 21 | {"matrix": [4, 2], "x": 10.2, "y": 0}, | ||
| 22 | {"matrix": [4, 1], "x": 11.2, "y": 0.125}, | ||
| 23 | {"matrix": [4, 0], "x": 12.2, "y": 0.375}, | ||
| 24 | |||
| 25 | {"matrix": [1, 0], "x": 0, "y": 1.375}, | ||
| 26 | {"matrix": [1, 1], "x": 1, "y": 1.125}, | ||
| 27 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 28 | {"matrix": [1, 3], "x": 3, "y": 1.125}, | ||
| 29 | {"matrix": [1, 4], "x": 4, "y": 1.25}, | ||
| 30 | |||
| 31 | {"matrix": [5, 4], "x": 8.2, "y": 1.25}, | ||
| 32 | {"matrix": [5, 3], "x": 9.2, "y": 1.125}, | ||
| 33 | {"matrix": [5, 2], "x": 10.2, "y": 1}, | ||
| 34 | {"matrix": [5, 1], "x": 11.2, "y": 1.125}, | ||
| 35 | {"matrix": [5, 0], "x": 12.2, "y": 1.375}, | ||
| 36 | |||
| 37 | {"matrix": [2, 0], "x": 0, "y": 2.375}, | ||
| 38 | {"matrix": [2, 1], "x": 1, "y": 2.125}, | ||
| 39 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 40 | {"matrix": [2, 3], "x": 3, "y": 2.125}, | ||
| 41 | {"matrix": [2, 4], "x": 4, "y": 2.25}, | ||
| 42 | |||
| 43 | {"matrix": [6, 4], "x": 8.2, "y": 2.25}, | ||
| 44 | {"matrix": [6, 3], "x": 9.2, "y": 2.125}, | ||
| 45 | {"matrix": [6, 2], "x": 10.2, "y": 2}, | ||
| 46 | {"matrix": [6, 1], "x": 11.2, "y": 2.125}, | ||
| 47 | {"matrix": [6, 0], "x": 12.2, "y": 2.375}, | ||
| 48 | |||
| 49 | {"matrix": [3, 0], "x": 3.4, "y": 3.25}, | ||
| 50 | {"matrix": [3, 1], "x": 4.4, "y": 3.55}, | ||
| 51 | {"matrix": [3, 2], "x": 5.4, "y": 3.85}, | ||
| 52 | |||
| 53 | {"matrix": [7, 2], "x": 6.8, "y": 3.85}, | ||
| 54 | {"matrix": [7, 1], "x": 7.8, "y": 3.55}, | ||
| 55 | {"matrix": [7, 0], "x": 8.8, "y": 3.25} | ||
| 56 | ] | ||
| 57 | } | ||
| 58 | } | ||
| 7 | } | 59 | } |
diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 4cab8c48f2..8f624aeb6c 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json | |||
| @@ -13,54 +13,5 @@ | |||
| 13 | }, | 13 | }, |
| 14 | "processor": "atmega32u4", | 14 | "processor": "atmega32u4", |
| 15 | "bootloader": "atmel-dfu", | 15 | "bootloader": "atmel-dfu", |
| 16 | "community_layouts": ["split_3x5_3"], | 16 | "community_layouts": ["split_3x5_3"] |
| 17 | "layouts": { | ||
| 18 | "LAYOUT_split_3x5_3": { | ||
| 19 | "layout": [ | ||
| 20 | {"x": 0, "y": 0.375}, | ||
| 21 | {"x": 1, "y": 0.125}, | ||
| 22 | {"x": 2, "y": 0}, | ||
| 23 | {"x": 3, "y": 0.125}, | ||
| 24 | {"x": 4, "y": 0.25}, | ||
| 25 | |||
| 26 | {"x": 8.2, "y": 0.25}, | ||
| 27 | {"x": 9.2, "y": 0.125}, | ||
| 28 | {"x": 10.2, "y": 0}, | ||
| 29 | {"x": 11.2, "y": 0.125}, | ||
| 30 | {"x": 12.2, "y": 0.375}, | ||
| 31 | |||
| 32 | {"x": 0, "y": 1.375}, | ||
| 33 | {"x": 1, "y": 1.125}, | ||
| 34 | {"x": 2, "y": 1}, | ||
| 35 | {"x": 3, "y": 1.125}, | ||
| 36 | {"x": 4, "y": 1.25}, | ||
| 37 | |||
| 38 | {"x": 8.2, "y": 1.25}, | ||
| 39 | {"x": 9.2, "y": 1.125}, | ||
| 40 | {"x": 10.2, "y": 1}, | ||
| 41 | {"x": 11.2, "y": 1.125}, | ||
| 42 | {"x": 12.2, "y": 1.375}, | ||
| 43 | |||
| 44 | {"x": 0, "y": 2.375}, | ||
| 45 | {"x": 1, "y": 2.125}, | ||
| 46 | {"x": 2, "y": 2}, | ||
| 47 | {"x": 3, "y": 2.125}, | ||
| 48 | {"x": 4, "y": 2.25}, | ||
| 49 | |||
| 50 | {"x": 8.2, "y": 2.25}, | ||
| 51 | {"x": 9.2, "y": 2.125}, | ||
| 52 | {"x": 10.2, "y": 2}, | ||
| 53 | {"x": 11.2, "y": 2.125}, | ||
| 54 | {"x": 12.2, "y": 2.375}, | ||
| 55 | |||
| 56 | {"x": 3.4, "y": 3.25}, | ||
| 57 | {"x": 4.4, "y": 3.55}, | ||
| 58 | {"x": 5.4, "y": 3.85}, | ||
| 59 | |||
| 60 | {"x": 6.8, "y": 3.85}, | ||
| 61 | {"x": 7.8, "y": 3.55}, | ||
| 62 | {"x": 8.8, "y": 3.25} | ||
| 63 | ] | ||
| 64 | } | ||
| 65 | } | ||
| 66 | } | 17 | } |
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json index 3d13b5b2f2..071d876c1a 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/info.json +++ b/keyboards/kakunpc/suihankey/split/rev1/info.json | |||
| @@ -3,5 +3,57 @@ | |||
| 3 | "cols": ["F4", "F5", "F6", "F7"], | 3 | "cols": ["F4", "F5", "F6", "F7"], |
| 4 | "rows": ["D4", "C6", "D7", "E6", "B4"] | 4 | "rows": ["D4", "C6", "D7", "E6", "B4"] |
| 5 | }, | 5 | }, |
| 6 | "diode_direction": "COL2ROW" | 6 | "diode_direction": "COL2ROW", |
| 7 | "layout_aliases": { | ||
| 8 | "LAYOUT": "LAYOUT_split_3x5_3" | ||
| 9 | }, | ||
| 10 | "layouts": { | ||
| 11 | "LAYOUT_split_3x5_3": { | ||
| 12 | "layout": [ | ||
| 13 | {"matrix": [0, 0], "x": 0, "y": 0.375}, | ||
| 14 | {"matrix": [1, 0], "x": 1, "y": 0.125}, | ||
| 15 | {"matrix": [2, 0], "x": 2, "y": 0}, | ||
| 16 | {"matrix": [3, 0], "x": 3, "y": 0.125}, | ||
| 17 | {"matrix": [4, 0], "x": 4, "y": 0.25}, | ||
| 18 | |||
| 19 | {"matrix": [9, 0], "x": 8.2, "y": 0.25}, | ||
| 20 | {"matrix": [8, 0], "x": 9.2, "y": 0.125}, | ||
| 21 | {"matrix": [7, 0], "x": 10.2, "y": 0}, | ||
| 22 | {"matrix": [6, 0], "x": 11.2, "y": 0.125}, | ||
| 23 | {"matrix": [5, 0], "x": 12.2, "y": 0.375}, | ||
| 24 | |||
| 25 | {"matrix": [0, 1], "x": 0, "y": 1.375}, | ||
| 26 | {"matrix": [1, 1], "x": 1, "y": 1.125}, | ||
| 27 | {"matrix": [2, 1], "x": 2, "y": 1}, | ||
| 28 | {"matrix": [3, 1], "x": 3, "y": 1.125}, | ||
| 29 | {"matrix": [4, 1], "x": 4, "y": 1.25}, | ||
| 30 | |||
| 31 | {"matrix": [9, 1], "x": 8.2, "y": 1.25}, | ||
| 32 | {"matrix": [8, 1], "x": 9.2, "y": 1.125}, | ||
| 33 | {"matrix": [7, 1], "x": 10.2, "y": 1}, | ||
| 34 | {"matrix": [6, 1], "x": 11.2, "y": 1.125}, | ||
| 35 | {"matrix": [5, 1], "x": 12.2, "y": 1.375}, | ||
| 36 | |||
| 37 | {"matrix": [0, 2], "x": 0, "y": 2.375}, | ||
| 38 | {"matrix": [1, 2], "x": 1, "y": 2.125}, | ||
| 39 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 40 | {"matrix": [3, 2], "x": 3, "y": 2.125}, | ||
| 41 | {"matrix": [4, 2], "x": 4, "y": 2.25}, | ||
| 42 | |||
| 43 | {"matrix": [9, 2], "x": 8.2, "y": 2.25}, | ||
| 44 | {"matrix": [8, 2], "x": 9.2, "y": 2.125}, | ||
| 45 | {"matrix": [7, 2], "x": 10.2, "y": 2}, | ||
| 46 | {"matrix": [6, 2], "x": 11.2, "y": 2.125}, | ||
| 47 | {"matrix": [5, 2], "x": 12.2, "y": 2.375}, | ||
| 48 | |||
| 49 | {"matrix": [0, 3], "x": 3.4, "y": 3.25}, | ||
| 50 | {"matrix": [1, 3], "x": 4.4, "y": 3.55}, | ||
| 51 | {"matrix": [2, 3], "x": 5.4, "y": 3.85}, | ||
| 52 | |||
| 53 | {"matrix": [7, 3], "x": 6.8, "y": 3.85}, | ||
| 54 | {"matrix": [6, 3], "x": 7.8, "y": 3.55}, | ||
| 55 | {"matrix": [5, 3], "x": 8.8, "y": 3.25} | ||
| 56 | ] | ||
| 57 | } | ||
| 58 | } | ||
| 7 | } | 59 | } |
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h deleted file mode 100644 index 98618ba712..0000000000 --- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | /* Copyright 2019 kakunpc | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the Leys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT_split_3x5_3( \ | ||
| 29 | L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ | ||
| 30 | L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ | ||
| 31 | L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ | ||
| 32 | L30, L31, L32, R32, R31, R30 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { L00, L10, L20, L30 }, \ | ||
| 36 | { L01, L11, L21, L31 }, \ | ||
| 37 | { L02, L12, L22, L32 }, \ | ||
| 38 | { L03, L13, L23, KC_NO }, \ | ||
| 39 | { L04, L14, L24, KC_NO }, \ | ||
| 40 | { R00, R10, R20, R30 }, \ | ||
| 41 | { R01, R11, R21, R31 }, \ | ||
| 42 | { R02, R12, R22, R32 }, \ | ||
| 43 | { R03, R13, R23, KC_NO }, \ | ||
| 44 | { R04, R14, R24, KC_NO }, \ | ||
| 45 | } | ||
| 46 | |||
| 47 | #define LAYOUT LAYOUT_split_3x5_3 | ||
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 9d1e2b806f..e42ec5a08d 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json | |||
| @@ -19,9 +19,56 @@ | |||
| 19 | "processor": "atmega32u4", | 19 | "processor": "atmega32u4", |
| 20 | "bootloader": "caterina", | 20 | "bootloader": "caterina", |
| 21 | "community_layouts": ["split_3x5_3"], | 21 | "community_layouts": ["split_3x5_3"], |
| 22 | "layout_aliases": { | ||
| 23 | "LAYOUT": "LAYOUT_split_3x5_3" | ||
| 24 | }, | ||
| 22 | "layouts": { | 25 | "layouts": { |
| 23 | "LAYOUT_split_3x5_3": { | 26 | "LAYOUT_split_3x5_3": { |
| 24 | "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}] | 27 | "layout": [ |
| 28 | {"matrix": [0, 0], "x": 0, "y": 0.375}, | ||
| 29 | {"matrix": [0, 1], "x": 1, "y": 0.125}, | ||
| 30 | {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| 31 | {"matrix": [0, 3], "x": 3, "y": 0.125}, | ||
| 32 | {"matrix": [0, 4], "x": 4, "y": 0.25}, | ||
| 33 | |||
| 34 | {"matrix": [4, 4], "x": 7, "y": 0.25}, | ||
| 35 | {"matrix": [4, 3], "x": 8, "y": 0.125}, | ||
| 36 | {"matrix": [4, 2], "x": 9, "y": 0}, | ||
| 37 | {"matrix": [4, 1], "x": 10, "y": 0.125}, | ||
| 38 | {"matrix": [4, 0], "x": 11, "y": 0.375}, | ||
| 39 | |||
| 40 | {"matrix": [1, 0], "x": 0, "y": 1.375}, | ||
| 41 | {"matrix": [1, 1], "x": 1, "y": 1.125}, | ||
| 42 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 43 | {"matrix": [1, 3], "x": 3, "y": 1.125}, | ||
| 44 | {"matrix": [1, 4], "x": 4, "y": 1.25}, | ||
| 45 | |||
| 46 | {"matrix": [5, 4], "x": 7, "y": 1.25}, | ||
| 47 | {"matrix": [5, 3], "x": 8, "y": 1.125}, | ||
| 48 | {"matrix": [5, 2], "x": 9, "y": 1}, | ||
| 49 | {"matrix": [5, 1], "x": 10, "y": 1.125}, | ||
| 50 | {"matrix": [5, 0], "x": 11, "y": 1.375}, | ||
| 51 | |||
| 52 | {"matrix": [2, 0], "x": 0, "y": 2.375}, | ||
| 53 | {"matrix": [2, 1], "x": 1, "y": 2.125}, | ||
| 54 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 55 | {"matrix": [2, 3], "x": 3, "y": 2.125}, | ||
| 56 | {"matrix": [2, 4], "x": 4, "y": 2.25}, | ||
| 57 | |||
| 58 | {"matrix": [6, 4], "x": 7, "y": 2.25}, | ||
| 59 | {"matrix": [6, 3], "x": 8, "y": 2.125}, | ||
| 60 | {"matrix": [6, 2], "x": 9, "y": 2}, | ||
| 61 | {"matrix": [6, 1], "x": 10, "y": 2.125}, | ||
| 62 | {"matrix": [6, 0], "x": 11, "y": 2.375}, | ||
| 63 | |||
| 64 | {"matrix": [3, 2], "x": 2.5, "y": 4.75}, | ||
| 65 | {"matrix": [3, 3], "x": 3.5, "y": 4.75}, | ||
| 66 | {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2}, | ||
| 67 | |||
| 68 | {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2}, | ||
| 69 | {"matrix": [7, 3], "x": 7.5, "y": 4.75}, | ||
| 70 | {"matrix": [7, 2], "x": 8.5, "y": 4.75} | ||
| 71 | ] | ||
| 25 | } | 72 | } |
| 26 | } | 73 | } |
| 27 | } | 74 | } |
diff --git a/keyboards/maple_computing/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h deleted file mode 100644 index bb8bd64666..0000000000 --- a/keyboards/maple_computing/minidox/rev1/rev1.h +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #include "quantum.h" | ||
| 4 | |||
| 5 | // readability | ||
| 6 | #define ___ KC_NO | ||
| 7 | |||
| 8 | #define LAYOUT_split_3x5_3( \ | ||
| 9 | k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, \ | ||
| 10 | k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, \ | ||
| 11 | k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, \ | ||
| 12 | k33, k34, k35, k75, k74, k73 \ | ||
| 13 | ) \ | ||
| 14 | { \ | ||
| 15 | { k01, k02, k03, k04, k05 }, \ | ||
| 16 | { k11, k12, k13, k14, k15 }, \ | ||
| 17 | { k21, k22, k23, k24, k25 }, \ | ||
| 18 | { ___, ___, k33, k34, k35 }, \ | ||
| 19 | { k41, k42, k43, k44, k45 }, \ | ||
| 20 | { k51, k52, k53, k54, k55 }, \ | ||
| 21 | { k61, k62, k63, k64, k65 }, \ | ||
| 22 | { ___, ___, k73, k74, k75 } \ | ||
| 23 | } | ||
| 24 | |||
| 25 | #define LAYOUT LAYOUT_split_3x5_3 | ||
diff --git a/keyboards/obosob/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h deleted file mode 100644 index 11c5e2de22..0000000000 --- a/keyboards/obosob/arch_36/arch_36.h +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /* Copyright 2020 Obosob <obosob@riseup.net> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the keys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT_split_3x5_3( \ | ||
| 29 | L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ | ||
| 30 | L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ | ||
| 31 | L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \ | ||
| 32 | L32, L33, L34, R35, R36, R37 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { L00, L01, L02, L03, L04 }, \ | ||
| 36 | { L10, L11, L12, L13, L14 }, \ | ||
| 37 | { L20, L21, L22, L23, L24 }, \ | ||
| 38 | { KC_NO, KC_NO, L32, L33, L34 }, \ | ||
| 39 | { R09, R08, R07, R06, R05 }, \ | ||
| 40 | { R19, R18, R17, R16, R15 }, \ | ||
| 41 | { R29, R28, R27, R26, R25 }, \ | ||
| 42 | { KC_NO, KC_NO, R37, R36, R35 }, \ | ||
| 43 | } | ||
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 9b0fa7841e..9eef360e86 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json | |||
| @@ -22,45 +22,49 @@ | |||
| 22 | "layouts": { | 22 | "layouts": { |
| 23 | "LAYOUT_split_3x5_3": { | 23 | "LAYOUT_split_3x5_3": { |
| 24 | "layout": [ | 24 | "layout": [ |
| 25 | {"x":0, "y":1}, | 25 | {"matrix": [0, 0], "x": 0, "y": 1}, |
| 26 | {"x":1, "y":0.25}, | 26 | {"matrix": [0, 1], "x": 1, "y": 0.25}, |
| 27 | {"x":2, "y":0}, | 27 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 28 | {"x":3, "y":0.375}, | 28 | {"matrix": [0, 3], "x": 3, "y": 0.375}, |
| 29 | {"x":4, "y":0.5}, | 29 | {"matrix": [0, 4], "x": 4, "y": 0.5}, |
| 30 | {"x":9, "y":0.5}, | ||
| 31 | {"x":10, "y":0.375}, | ||
| 32 | {"x":11, "y":0}, | ||
| 33 | {"x":12, "y":0.25}, | ||
| 34 | {"x":13, "y":1}, | ||
| 35 | 30 | ||
| 36 | {"x":0, "y":2}, | 31 | {"matrix": [4, 4], "x": 9, "y": 0.5}, |
| 37 | {"x":1, "y":1.25}, | 32 | {"matrix": [4, 3], "x": 10, "y": 0.375}, |
| 38 | {"x":2, "y":1}, | 33 | {"matrix": [4, 2], "x": 11, "y": 0}, |
| 39 | {"x":3, "y":1.375}, | 34 | {"matrix": [4, 1], "x": 12, "y": 0.25}, |
| 40 | {"x":4, "y":1.5}, | 35 | {"matrix": [4, 0], "x": 13, "y": 1}, |
| 41 | {"x":9, "y":1.5}, | ||
| 42 | {"x":10, "y":1.375}, | ||
| 43 | {"x":11, "y":1}, | ||
| 44 | {"x":12, "y":1.25}, | ||
| 45 | {"x":13, "y":2}, | ||
| 46 | 36 | ||
| 47 | {"x":0, "y":3}, | 37 | {"matrix": [1, 0], "x": 0, "y": 2}, |
| 48 | {"x":1, "y":2.25}, | 38 | {"matrix": [1, 1], "x": 1, "y": 1.25}, |
| 49 | {"x":2, "y":2}, | 39 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 50 | {"x":3, "y":2.375}, | 40 | {"matrix": [1, 3], "x": 3, "y": 1.375}, |
| 51 | {"x":4, "y":2.5}, | 41 | {"matrix": [1, 4], "x": 4, "y": 1.5}, |
| 52 | {"x":9, "y":2.5}, | ||
| 53 | {"x":10, "y":2.375}, | ||
| 54 | {"x":11, "y":2}, | ||
| 55 | {"x":12, "y":2.25}, | ||
| 56 | {"x":13, "y":3}, | ||
| 57 | 42 | ||
| 58 | {"x":3.5, "y":3.5}, | 43 | {"matrix": [5, 4], "x": 9, "y": 1.5}, |
| 59 | {"x":4.5, "y":3.7}, | 44 | {"matrix": [5, 3], "x": 10, "y": 1.375}, |
| 60 | {"x":5.5, "y":4.1}, | 45 | {"matrix": [5, 2], "x": 11, "y": 1}, |
| 61 | {"x":7.5, "y":4.1}, | 46 | {"matrix": [5, 1], "x": 12, "y": 1.25}, |
| 62 | {"x":8.5, "y":3.7}, | 47 | {"matrix": [5, 0], "x": 13, "y": 2}, |
| 63 | {"x":9.5, "y":3.5} | 48 | |
| 49 | {"matrix": [2, 0], "x": 0, "y": 3}, | ||
| 50 | {"matrix": [2, 1], "x": 1, "y": 2.25}, | ||
| 51 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 52 | {"matrix": [2, 3], "x": 3, "y": 2.375}, | ||
| 53 | {"matrix": [2, 4], "x": 4, "y": 2.5}, | ||
| 54 | |||
| 55 | {"matrix": [6, 4], "x": 9, "y": 2.5}, | ||
| 56 | {"matrix": [6, 3], "x": 10, "y": 2.375}, | ||
| 57 | {"matrix": [6, 2], "x": 11, "y": 2}, | ||
| 58 | {"matrix": [6, 1], "x": 12, "y": 2.25}, | ||
| 59 | {"matrix": [6, 0], "x": 13, "y": 3}, | ||
| 60 | |||
| 61 | {"matrix": [3, 2], "x": 3.5, "y": 3.5}, | ||
| 62 | {"matrix": [3, 3], "x": 4.5, "y": 3.7}, | ||
| 63 | {"matrix": [3, 4], "x": 5.5, "y": 4.1}, | ||
| 64 | |||
| 65 | {"matrix": [7, 4], "x": 7.5, "y": 4.1}, | ||
| 66 | {"matrix": [7, 3], "x": 8.5, "y": 3.7}, | ||
| 67 | {"matrix": [7, 2], "x": 9.5, "y": 3.5} | ||
| 64 | ] | 68 | ] |
| 65 | } | 69 | } |
| 66 | } | 70 | } |
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json index 1f11badbfc..971b9939cf 100644 --- a/keyboards/pierce/info.json +++ b/keyboards/pierce/info.json | |||
| @@ -14,46 +14,49 @@ | |||
| 14 | "layouts": { | 14 | "layouts": { |
| 15 | "LAYOUT_split_3x5_3": { | 15 | "LAYOUT_split_3x5_3": { |
| 16 | "layout": [ | 16 | "layout": [ |
| 17 | {"x":0, "y":0.5}, | 17 | {"matrix": [0, 0], "x": 0, "y": 0.5}, |
| 18 | {"x":1, "y":0.13}, | 18 | {"matrix": [0, 1], "x": 1, "y": 0.13}, |
| 19 | {"x":2, "y":0}, | 19 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 20 | {"x":3, "y":0.13}, | 20 | {"matrix": [0, 3], "x": 3, "y": 0.13}, |
| 21 | {"x":4, "y":0.25}, | 21 | {"matrix": [0, 4], "x": 4, "y": 0.25}, |
| 22 | {"x":7, "y":0.25}, | ||
| 23 | {"x":8, "y":0.13}, | ||
| 24 | {"x":9, "y":0}, | ||
| 25 | {"x":10, "y":0.13}, | ||
| 26 | {"x":11, "y":0.5}, | ||
| 27 | 22 | ||
| 28 | {"x":0, "y":1.5}, | 23 | {"matrix": [0, 5], "x": 7, "y": 0.25}, |
| 29 | {"x":1, "y":1.13}, | 24 | {"matrix": [0, 6], "x": 8, "y": 0.13}, |
| 30 | {"x":2, "y":1}, | 25 | {"matrix": [0, 7], "x": 9, "y": 0}, |
| 31 | {"x":3, "y":1.13}, | 26 | {"matrix": [0, 8], "x": 10, "y": 0.13}, |
| 32 | {"x":4, "y":1.25}, | 27 | {"matrix": [0, 9], "x": 11, "y": 0.5}, |
| 33 | {"x":7, "y":1.25}, | ||
| 34 | {"x":8, "y":1.13}, | ||
| 35 | {"x":9, "y":1}, | ||
| 36 | {"x":10, "y":1.13}, | ||
| 37 | {"x":11, "y":1.5}, | ||
| 38 | 28 | ||
| 39 | {"x":0, "y":2.5}, | 29 | {"matrix": [1, 0], "x": 0, "y": 1.5}, |
| 40 | {"x":1, "y":2.13}, | 30 | {"matrix": [1, 1], "x": 1, "y": 1.13}, |
| 41 | {"x":2, "y":2}, | 31 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 42 | {"x":3, "y":2.13}, | 32 | {"matrix": [1, 3], "x": 3, "y": 1.13}, |
| 43 | {"x":4, "y":2.25}, | 33 | {"matrix": [1, 4], "x": 4, "y": 1.25}, |
| 44 | {"x":7, "y":2.25}, | ||
| 45 | {"x":8, "y":2.13}, | ||
| 46 | {"x":9, "y":2}, | ||
| 47 | {"x":10, "y":2.13}, | ||
| 48 | {"x":11, "y":2.5}, | ||
| 49 | 34 | ||
| 50 | {"x":2.5, "y":3.16}, | 35 | {"matrix": [1, 5], "x": 7, "y": 1.25}, |
| 51 | {"x":3.5, "y":3.5}, | 36 | {"matrix": [1, 6], "x": 8, "y": 1.13}, |
| 52 | {"x":4.5, "y":3.75}, | 37 | {"matrix": [1, 7], "x": 9, "y": 1}, |
| 38 | {"matrix": [1, 8], "x": 10, "y": 1.13}, | ||
| 39 | {"matrix": [1, 9], "x": 11, "y": 1.5}, | ||
| 53 | 40 | ||
| 54 | {"x":6.5, "y":3.75}, | 41 | {"matrix": [2, 0], "x": 0, "y": 2.5}, |
| 55 | {"x":7.5, "y":3.5}, | 42 | {"matrix": [2, 1], "x": 1, "y": 2.13}, |
| 56 | {"x":8.5, "y":3.16} | 43 | {"matrix": [2, 2], "x": 2, "y": 2}, |
| 44 | {"matrix": [2, 3], "x": 3, "y": 2.13}, | ||
| 45 | {"matrix": [2, 4], "x": 4, "y": 2.25}, | ||
| 46 | |||
| 47 | {"matrix": [2, 5], "x": 7, "y": 2.25}, | ||
| 48 | {"matrix": [2, 6], "x": 8, "y": 2.13}, | ||
| 49 | {"matrix": [2, 7], "x": 9, "y": 2}, | ||
| 50 | {"matrix": [2, 8], "x": 10, "y": 2.13}, | ||
| 51 | {"matrix": [2, 9], "x": 11, "y": 2.5}, | ||
| 52 | |||
| 53 | {"matrix": [3, 2], "x": 2.5, "y": 3.16}, | ||
| 54 | {"matrix": [3, 3], "x": 3.5, "y": 3.5}, | ||
| 55 | {"matrix": [3, 4], "x": 4.5, "y": 3.75}, | ||
| 56 | |||
| 57 | {"matrix": [3, 5], "x": 6.5, "y": 3.75}, | ||
| 58 | {"matrix": [3, 6], "x": 7.5, "y": 3.5}, | ||
| 59 | {"matrix": [3, 7], "x": 8.5, "y": 3.16} | ||
| 57 | ] | 60 | ] |
| 58 | } | 61 | } |
| 59 | } | 62 | } |
diff --git a/keyboards/pierce/pierce.h b/keyboards/pierce/pierce.h deleted file mode 100644 index edb4151740..0000000000 --- a/keyboards/pierce/pierce.h +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | /* Copyright 2022 durken (https://github.com/durken1/) | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | #define LAYOUT_split_3x5_3( \ | ||
| 22 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ | ||
| 23 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ | ||
| 24 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ | ||
| 25 | K32, K33, K34, K35, K36, K37 \ | ||
| 26 | ) { \ | ||
| 27 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ | ||
| 28 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ | ||
| 29 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ | ||
| 30 | { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \ | ||
| 31 | } | ||
diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h deleted file mode 100644 index f492646176..0000000000 --- a/keyboards/pinky/3/3.h +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #include "quantum.h" | ||
| 4 | |||
| 5 | #define LAYOUT_split_3x7_4( \ | ||
| 6 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ | ||
| 7 | L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ | ||
| 8 | L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ | ||
| 9 | L30, L31, L32, L33, R30, R31, R32, R33 \ | ||
| 10 | ) \ | ||
| 11 | { \ | ||
| 12 | { L00, L01, L02, L03, L04, L05, L06 }, \ | ||
| 13 | { L10, L11, L12, L13, L14, L15, L16 }, \ | ||
| 14 | { L20, L21, L22, L23, L24, L25, L26 }, \ | ||
| 15 | { KC_NO, KC_NO, KC_NO, L30, L31, L32, L33 }, \ | ||
| 16 | { R06, R05, R04, R03, R02, R01, R00 }, \ | ||
| 17 | { R16, R15, R14, R13, R12, R11, R10 }, \ | ||
| 18 | { R26, R25, R24, R23, R22, R21, R20 }, \ | ||
| 19 | { KC_NO, KC_NO, KC_NO, R33, R32, R31, R30 } \ | ||
| 20 | } | ||
| 21 | |||
| 22 | #define LAYOUT LAYOUT_split_3x7_4 | ||
diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json index 13a87f9121..770d368399 100644 --- a/keyboards/pinky/3/info.json +++ b/keyboards/pinky/3/info.json | |||
| @@ -18,62 +18,69 @@ | |||
| 18 | }, | 18 | }, |
| 19 | "processor": "atmega32u4", | 19 | "processor": "atmega32u4", |
| 20 | "bootloader": "caterina", | 20 | "bootloader": "caterina", |
| 21 | "layout_aliases": { | ||
| 22 | "LAYOUT": "LAYOUT_split_3x7_4" | ||
| 23 | }, | ||
| 21 | "layouts": { | 24 | "layouts": { |
| 22 | "LAYOUT_split_3x7_4": { | 25 | "LAYOUT_split_3x7_4": { |
| 23 | "layout": [ | 26 | "layout": [ |
| 24 | {"label":"Esc", "x":0, "y":0.3}, | 27 | {"matrix": [0, 0], "x": 0, "y": 0.3}, |
| 25 | {"label":"Q", "x":1, "y":0.3}, | 28 | {"matrix": [0, 1], "x": 1, "y": 0.3}, |
| 26 | {"label":"W", "x":2, "y":0.2}, | 29 | {"matrix": [0, 2], "x": 2, "y": 0.2}, |
| 27 | {"label":"E", "x":3, "y":0}, | 30 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | {"label":"R", "x":4, "y":0.2}, | 31 | {"matrix": [0, 4], "x": 4, "y": 0.2}, |
| 29 | {"label":"T", "x":5, "y":0.4}, | 32 | {"matrix": [0, 5], "x": 5, "y": 0.4}, |
| 30 | {"label":"(", "x":6, "y":0.6}, | 33 | {"matrix": [0, 6], "x": 6, "y": 0.6}, |
| 31 | {"label":")", "x":9, "y":0.6}, | 34 | |
| 32 | {"label":"Y", "x":10, "y":0.4}, | 35 | {"matrix": [4, 6], "x": 9, "y": 0.6}, |
| 33 | {"label":"U", "x":11, "y":0.2}, | 36 | {"matrix": [4, 5], "x": 10, "y": 0.4}, |
| 34 | {"label":"I", "x":12, "y":0}, | 37 | {"matrix": [4, 4], "x": 11, "y": 0.2}, |
| 35 | {"label":"O", "x":13, "y":0.2}, | 38 | {"matrix": [4, 3], "x": 12, "y": 0}, |
| 36 | {"label":"P", "x":14, "y":0.3}, | 39 | {"matrix": [4, 2], "x": 13, "y": 0.2}, |
| 37 | {"label":"Backspace", "x":15, "y":0.3}, | 40 | {"matrix": [4, 1], "x": 14, "y": 0.3}, |
| 41 | {"matrix": [4, 0], "x": 15, "y": 0.3}, | ||
| 42 | |||
| 43 | {"matrix": [1, 0], "x": 0, "y": 1.3}, | ||
| 44 | {"matrix": [1, 1], "x": 1, "y": 1.3}, | ||
| 45 | {"matrix": [1, 2], "x": 2, "y": 1.2}, | ||
| 46 | {"matrix": [1, 3], "x": 3, "y": 1}, | ||
| 47 | {"matrix": [1, 4], "x": 4, "y": 1.2}, | ||
| 48 | {"matrix": [1, 5], "x": 5, "y": 1.4}, | ||
| 49 | {"matrix": [1, 6], "x": 6, "y": 1.6}, | ||
| 50 | |||
| 51 | {"matrix": [5, 6], "x": 9, "y": 1.6}, | ||
| 52 | {"matrix": [5, 5], "x": 10, "y": 1.4}, | ||
| 53 | {"matrix": [5, 4], "x": 11, "y": 1.2}, | ||
| 54 | {"matrix": [5, 3], "x": 12, "y": 1}, | ||
| 55 | {"matrix": [5, 2], "x": 13, "y": 1.2}, | ||
| 56 | {"matrix": [5, 1], "x": 14, "y": 1.3}, | ||
| 57 | {"matrix": [5, 0], "x": 15, "y": 1.3}, | ||
| 58 | |||
| 59 | {"matrix": [2, 0], "x": 0, "y": 2.3}, | ||
| 60 | {"matrix": [2, 1], "x": 1, "y": 2.3}, | ||
| 61 | {"matrix": [2, 2], "x": 2, "y": 2.2}, | ||
| 62 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 63 | {"matrix": [2, 4], "x": 4, "y": 2.2}, | ||
| 64 | {"matrix": [2, 5], "x": 5, "y": 2.4}, | ||
| 65 | {"matrix": [2, 6], "x": 6, "y": 3}, | ||
| 38 | 66 | ||
| 39 | {"label":"Ctrl / Tab", "x":0, "y":1.3}, | 67 | {"matrix": [6, 6], "x": 9, "y": 3}, |
| 40 | {"label":"A", "x":1, "y":1.3}, | 68 | {"matrix": [6, 5], "x": 10, "y": 2.4}, |
| 41 | {"label":"S", "x":2, "y":1.2}, | 69 | {"matrix": [6, 4], "x": 11, "y": 2.2}, |
| 42 | {"label":"D", "x":3, "y":1}, | 70 | {"matrix": [6, 3], "x": 12, "y": 2}, |
| 43 | {"label":"F", "x":4, "y":1.2}, | 71 | {"matrix": [6, 2], "x": 13, "y": 2.2}, |
| 44 | {"label":"G", "x":5, "y":1.4}, | 72 | {"matrix": [6, 1], "x": 14, "y": 2.3}, |
| 45 | {"label":"[", "x":6, "y":1.6}, | 73 | {"matrix": [6, 0], "x": 15, "y": 2.3}, |
| 46 | {"label":"]", "x":9, "y":1.6}, | ||
| 47 | {"label":"H", "x":10, "y":1.4}, | ||
| 48 | {"label":"J", "x":11, "y":1.2}, | ||
| 49 | {"label":"K", "x":12, "y":1}, | ||
| 50 | {"label":"L", "x":13, "y":1.2}, | ||
| 51 | {"label":":", "x":14, "y":1.3}, | ||
| 52 | {"label":"\"", "x":15, "y":1.3}, | ||
| 53 | 74 | ||
| 54 | {"label":"Shift", "x":0, "y":2.3}, | 75 | {"matrix": [3, 3], "x": 3.5, "y": 3.7}, |
| 55 | {"label":"Z", "x":1, "y":2.3}, | 76 | {"matrix": [3, 4], "x": 4.5, "y": 3.8}, |
| 56 | {"label":"X", "x":2, "y":2.2}, | 77 | {"matrix": [3, 5], "x": 5.5, "y": 4}, |
| 57 | {"label":"C", "x":3, "y":2}, | 78 | {"matrix": [3, 6], "x": 6.5, "y": 4.3}, |
| 58 | {"label":"V", "x":4, "y":2.2}, | ||
| 59 | {"label":"B", "x":5, "y":2.4}, | ||
| 60 | {"label":"MO(_ADJUST)", "x":6, "y":3}, | ||
| 61 | {"label":"MO(_ADJUST)", "x":9, "y":3}, | ||
| 62 | {"label":"N", "x":10, "y":2.4}, | ||
| 63 | {"label":"M", "x":11, "y":2.2}, | ||
| 64 | {"label":"<", "x":12, "y":2}, | ||
| 65 | {"label":">", "x":13, "y":2.2}, | ||
| 66 | {"label":"?", "x":14, "y":2.3}, | ||
| 67 | {"label":"Enter", "x":15, "y":2.3}, | ||
| 68 | 79 | ||
| 69 | {"label":"Alt", "x":3.5, "y":3.7}, | 80 | {"matrix": [7, 6], "x": 8.5, "y": 4.3}, |
| 70 | {"label":"MO(_LOWER)", "x":4.5, "y":3.8}, | 81 | {"matrix": [7, 5], "x": 9.5, "y": 4}, |
| 71 | {"label":"GUI", "x":5.5, "y":4}, | 82 | {"matrix": [7, 4], "x": 10.5, "y": 3.8}, |
| 72 | {"label":"Space", "x":6.5, "y":4.3}, | 83 | {"matrix": [7, 3], "x": 11.5, "y": 3.7} |
| 73 | {"label":"Space", "x":8.5, "y":4.3}, | ||
| 74 | {"label":"GUI", "x":9.5, "y":4}, | ||
| 75 | {"label":"MO(_RAISE)", "x":10.5, "y":3.8}, | ||
| 76 | {"label":"Alt", "x":11.5, "y":3.7} | ||
| 77 | ] | 84 | ] |
| 78 | } | 85 | } |
| 79 | } | 86 | } |
diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h deleted file mode 100644 index 381ce82bce..0000000000 --- a/keyboards/pinky/4/4.h +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #include "quantum.h" | ||
| 4 | |||
| 5 | #define LAYOUT_split_4x7_4( \ | ||
| 6 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ | ||
| 7 | L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ | ||
| 8 | L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ | ||
| 9 | L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ | ||
| 10 | L40, L41, L42, L43, R40, R41, R42, R43 \ | ||
| 11 | ) \ | ||
| 12 | { \ | ||
| 13 | { L00, L01, L02, L03, L04, L05, L06 }, \ | ||
| 14 | { L10, L11, L12, L13, L14, L15, L16 }, \ | ||
| 15 | { L20, L21, L22, L23, L24, L25, L26 }, \ | ||
| 16 | { L30, L31, L32, L33, L34, L35, L36 }, \ | ||
| 17 | { KC_NO, KC_NO, KC_NO, L40, L41, L42, L43 }, \ | ||
| 18 | { R06, R05, R04, R03, R02, R01, R00 }, \ | ||
| 19 | { R16, R15, R14, R13, R12, R11, R10 }, \ | ||
| 20 | { R26, R25, R24, R23, R22, R21, R20 }, \ | ||
| 21 | { R36, R35, R34, R33, R32, R31, R30 }, \ | ||
| 22 | { KC_NO, KC_NO, KC_NO, R43, R42, R41, R40 } \ | ||
| 23 | } | ||
| 24 | |||
| 25 | #define LAYOUT LAYOUT_split_4x7_4 | ||
diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json index 2c1732ea16..01e44a647b 100644 --- a/keyboards/pinky/4/info.json +++ b/keyboards/pinky/4/info.json | |||
| @@ -18,77 +18,85 @@ | |||
| 18 | }, | 18 | }, |
| 19 | "processor": "atmega32u4", | 19 | "processor": "atmega32u4", |
| 20 | "bootloader": "caterina", | 20 | "bootloader": "caterina", |
| 21 | "layout_aliases": { | ||
| 22 | "LAYOUT": "LAYOUT_split_4x7_4" | ||
| 23 | }, | ||
| 21 | "layouts": { | 24 | "layouts": { |
| 22 | "LAYOUT_split_4x7_4": { | 25 | "LAYOUT_split_4x7_4": { |
| 23 | "layout": [ | 26 | "layout": [ |
| 24 | {"label":"Esc", "x":0, "y":0.3}, | 27 | {"matrix": [0, 0], "x": 0, "y": 0.3}, |
| 25 | {"label":"1", "x":1, "y":0.3}, | 28 | {"matrix": [0, 1], "x": 1, "y": 0.3}, |
| 26 | {"label":"2", "x":2, "y":0.2}, | 29 | {"matrix": [0, 2], "x": 2, "y": 0.2}, |
| 27 | {"label":"3", "x":3, "y":0}, | 30 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | {"label":"4", "x":4, "y":0.2}, | 31 | {"matrix": [0, 4], "x": 4, "y": 0.2}, |
| 29 | {"label":"5", "x":5, "y":0.4}, | 32 | {"matrix": [0, 5], "x": 5, "y": 0.4}, |
| 30 | {"label":"(", "x":6, "y":0.6}, | 33 | {"matrix": [0, 6], "x": 6, "y": 0.6}, |
| 31 | {"label":")", "x":9, "y":0.6}, | 34 | |
| 32 | {"label":"6", "x":10, "y":0.4}, | 35 | {"matrix": [5, 6], "x": 9, "y": 0.6}, |
| 33 | {"label":"7", "x":11, "y":0.2}, | 36 | {"matrix": [5, 5], "x": 10, "y": 0.4}, |
| 34 | {"label":"8", "x":12, "y":0}, | 37 | {"matrix": [5, 4], "x": 11, "y": 0.2}, |
| 35 | {"label":"9", "x":13, "y":0.2}, | 38 | {"matrix": [5, 3], "x": 12, "y": 0}, |
| 36 | {"label":"0", "x":14, "y":0.3}, | 39 | {"matrix": [5, 2], "x": 13, "y": 0.2}, |
| 37 | {"label":"Backspace", "x":15, "y":0.3}, | 40 | {"matrix": [5, 1], "x": 14, "y": 0.3}, |
| 41 | {"matrix": [5, 0], "x": 15, "y": 0.3}, | ||
| 42 | |||
| 43 | {"matrix": [1, 0], "x": 0, "y": 1.3}, | ||
| 44 | {"matrix": [1, 1], "x": 1, "y": 1.3}, | ||
| 45 | {"matrix": [1, 2], "x": 2, "y": 1.2}, | ||
| 46 | {"matrix": [1, 3], "x": 3, "y": 1}, | ||
| 47 | {"matrix": [1, 4], "x": 4, "y": 1.2}, | ||
| 48 | {"matrix": [1, 5], "x": 5, "y": 1.4}, | ||
| 49 | {"matrix": [1, 6], "x": 6, "y": 1.6}, | ||
| 50 | |||
| 51 | {"matrix": [6, 6], "x": 9, "y": 1.6}, | ||
| 52 | {"matrix": [6, 5], "x": 10, "y": 1.4}, | ||
| 53 | {"matrix": [6, 4], "x": 11, "y": 1.2}, | ||
| 54 | {"matrix": [6, 3], "x": 12, "y": 1}, | ||
| 55 | {"matrix": [6, 2], "x": 13, "y": 1.2}, | ||
| 56 | {"matrix": [6, 1], "x": 14, "y": 1.3}, | ||
| 57 | {"matrix": [6, 0], "x": 15, "y": 1.3}, | ||
| 58 | |||
| 59 | {"matrix": [2, 0], "x": 0, "y": 2.3}, | ||
| 60 | {"matrix": [2, 1], "x": 1, "y": 2.3}, | ||
| 61 | {"matrix": [2, 2], "x": 2, "y": 2.2}, | ||
| 62 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 63 | {"matrix": [2, 4], "x": 4, "y": 2.2}, | ||
| 64 | {"matrix": [2, 5], "x": 5, "y": 2.4}, | ||
| 65 | {"matrix": [2, 6], "x": 6, "y": 2.6}, | ||
| 66 | |||
| 67 | {"matrix": [7, 6], "x": 9, "y": 2.6}, | ||
| 68 | {"matrix": [7, 5], "x": 10, "y": 2.4}, | ||
| 69 | {"matrix": [7, 4], "x": 11, "y": 2.2}, | ||
| 70 | {"matrix": [7, 3], "x": 12, "y": 2}, | ||
| 71 | {"matrix": [7, 2], "x": 13, "y": 2.2}, | ||
| 72 | {"matrix": [7, 1], "x": 14, "y": 2.3}, | ||
| 73 | {"matrix": [7, 0], "x": 15, "y": 2.3}, | ||
| 38 | 74 | ||
| 39 | {"label":"Tab", "x":0, "y":1.3}, | 75 | {"matrix": [3, 0], "x": 0, "y": 3.3}, |
| 40 | {"label":"Q", "x":1, "y":1.3}, | 76 | {"matrix": [3, 1], "x": 1, "y": 3.3}, |
| 41 | {"label":"W", "x":2, "y":1.2}, | 77 | {"matrix": [3, 2], "x": 2, "y": 3.2}, |
| 42 | {"label":"E", "x":3, "y":1}, | 78 | {"matrix": [3, 3], "x": 3, "y": 3}, |
| 43 | {"label":"R", "x":4, "y":1.2}, | 79 | {"matrix": [3, 4], "x": 4, "y": 3.2}, |
| 44 | {"label":"T", "x":5, "y":1.4}, | 80 | {"matrix": [3, 5], "x": 5, "y": 3.4}, |
| 45 | {"label":"[", "x":6, "y":1.6}, | 81 | {"matrix": [3, 6], "x": 6, "y": 4}, |
| 46 | {"label":"]", "x":9, "y":1.6}, | ||
| 47 | {"label":"Y", "x":10, "y":1.4}, | ||
| 48 | {"label":"U", "x":11, "y":1.2}, | ||
| 49 | {"label":"I", "x":12, "y":1}, | ||
| 50 | {"label":"O", "x":13, "y":1.2}, | ||
| 51 | {"label":"P", "x":14, "y":1.3}, | ||
| 52 | {"label":"\\", "x":15, "y":1.3}, | ||
| 53 | 82 | ||
| 54 | {"label":"Ctrl / Tab", "x":0, "y":2.3}, | 83 | {"matrix": [8, 6], "x": 9, "y": 4}, |
| 55 | {"label":"A", "x":1, "y":2.3}, | 84 | {"matrix": [8, 5], "x": 10, "y": 3.4}, |
| 56 | {"label":"S", "x":2, "y":2.2}, | 85 | {"matrix": [8, 4], "x": 11, "y": 3.2}, |
| 57 | {"label":"D", "x":3, "y":2}, | 86 | {"matrix": [8, 3], "x": 12, "y": 3}, |
| 58 | {"label":"F", "x":4, "y":2.2}, | 87 | {"matrix": [8, 2], "x": 13, "y": 3.2}, |
| 59 | {"label":"G", "x":5, "y":2.4}, | 88 | {"matrix": [8, 1], "x": 14, "y": 3.3}, |
| 60 | {"label":"{", "x":6, "y":2.6}, | 89 | {"matrix": [8, 0], "x": 15, "y": 3.3}, |
| 61 | {"label":"}", "x":9, "y":2.6}, | ||
| 62 | {"label":"H", "x":10, "y":2.4}, | ||
| 63 | {"label":"J", "x":11, "y":2.2}, | ||
| 64 | {"label":"K", "x":12, "y":2}, | ||
| 65 | {"label":"L", "x":13, "y":2.2}, | ||
| 66 | {"label":":", "x":14, "y":2.3}, | ||
| 67 | {"label":"\"", "x":15, "y":2.3}, | ||
| 68 | 90 | ||
| 69 | {"label":"Shift", "x":0, "y":3.3}, | 91 | {"matrix": [4, 3], "x": 3.5, "y": 4.7}, |
| 70 | {"label":"Z", "x":1, "y":3.3}, | 92 | {"matrix": [4, 4], "x": 4.5, "y": 4.8}, |
| 71 | {"label":"X", "x":2, "y":3.2}, | 93 | {"matrix": [4, 5], "x": 5.5, "y": 5}, |
| 72 | {"label":"C", "x":3, "y":3}, | 94 | {"matrix": [4, 6], "x": 6.5, "y": 5.3}, |
| 73 | {"label":"V", "x":4, "y":3.2}, | ||
| 74 | {"label":"B", "x":5, "y":3.4}, | ||
| 75 | {"label":"MO(_ADJUST)", "x":6, "y":4}, | ||
| 76 | {"label":"MO(_ADJUST)", "x":9, "y":4}, | ||
| 77 | {"label":"N", "x":10, "y":3.4}, | ||
| 78 | {"label":"M", "x":11, "y":3.2}, | ||
| 79 | {"label":"<", "x":12, "y":3}, | ||
| 80 | {"label":">", "x":13, "y":3.2}, | ||
| 81 | {"label":"?", "x":14, "y":3.3}, | ||
| 82 | {"label":"Enter", "x":15, "y":3.3}, | ||
| 83 | 95 | ||
| 84 | {"label":"Alt", "x":3.5, "y":4.7}, | 96 | {"matrix": [9, 6], "x": 8.5, "y": 5.3}, |
| 85 | {"label":"MO(_LOWER)", "x":4.5, "y":4.8}, | 97 | {"matrix": [9, 5], "x": 9.5, "y": 5}, |
| 86 | {"label":"GUI", "x":5.5, "y":5}, | 98 | {"matrix": [9, 4], "x": 10.5, "y": 4.8}, |
| 87 | {"label":"Space", "x":6.5, "y":5.3}, | 99 | {"matrix": [9, 3], "x": 11.5, "y": 4.7} |
| 88 | {"label":"Space", "x":8.5, "y":5.3}, | ||
| 89 | {"label":"GUI", "x":9.5, "y":5}, | ||
| 90 | {"label":"MO(_RAISE)", "x":10.5, "y":4.8}, | ||
| 91 | {"label":"Alt", "x":11.5, "y":4.7} | ||
| 92 | ] | 100 | ] |
| 93 | } | 101 | } |
| 94 | } | 102 | } |
diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json index f1d548a8a0..e3dfef5ab7 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/info.json | |||
| @@ -21,9 +21,49 @@ | |||
| 21 | "layouts": { | 21 | "layouts": { |
| 22 | "LAYOUT_split_3x6_1": { | 22 | "LAYOUT_split_3x6_1": { |
| 23 | "layout": [ | 23 | "layout": [ |
| 24 | {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, | 24 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 25 | {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, | 25 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 26 | {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2} | 26 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 27 | {"matrix": [0, 3], "x": 3, "y": 0}, | ||
| 28 | {"matrix": [0, 4], "x": 4, "y": 0}, | ||
| 29 | {"matrix": [0, 5], "x": 5, "y": 0}, | ||
| 30 | |||
| 31 | {"matrix": [3, 5], "x": 9, "y": 0}, | ||
| 32 | {"matrix": [3, 4], "x": 10, "y": 0}, | ||
| 33 | {"matrix": [3, 3], "x": 11, "y": 0}, | ||
| 34 | {"matrix": [3, 2], "x": 12, "y": 0}, | ||
| 35 | {"matrix": [3, 1], "x": 13, "y": 0}, | ||
| 36 | {"matrix": [3, 0], "x": 14, "y": 0}, | ||
| 37 | |||
| 38 | {"matrix": [1, 0], "x": 0, "y": 1}, | ||
| 39 | {"matrix": [1, 1], "x": 1, "y": 1}, | ||
| 40 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 41 | {"matrix": [1, 3], "x": 3, "y": 1}, | ||
| 42 | {"matrix": [1, 4], "x": 4, "y": 1}, | ||
| 43 | {"matrix": [1, 5], "x": 5, "y": 1}, | ||
| 44 | |||
| 45 | {"matrix": [4, 5], "x": 9, "y": 1}, | ||
| 46 | {"matrix": [4, 4], "x": 10, "y": 1}, | ||
| 47 | {"matrix": [4, 3], "x": 11, "y": 1}, | ||
| 48 | {"matrix": [4, 2], "x": 12, "y": 1}, | ||
| 49 | {"matrix": [4, 1], "x": 13, "y": 1}, | ||
| 50 | {"matrix": [4, 0], "x": 14, "y": 1}, | ||
| 51 | |||
| 52 | {"matrix": [2, 0], "x": 0, "y": 2}, | ||
| 53 | {"matrix": [2, 1], "x": 1, "y": 2}, | ||
| 54 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 55 | {"matrix": [2, 3], "x": 3, "y": 2}, | ||
| 56 | {"matrix": [2, 4], "x": 4, "y": 2}, | ||
| 57 | {"matrix": [2, 5], "x": 5, "y": 2}, | ||
| 58 | {"matrix": [2, 6], "x": 6, "y": 2}, | ||
| 59 | |||
| 60 | {"matrix": [5, 6], "x": 8, "y": 2}, | ||
| 61 | {"matrix": [5, 5], "x": 9, "y": 2}, | ||
| 62 | {"matrix": [5, 4], "x": 10, "y": 2}, | ||
| 63 | {"matrix": [5, 3], "x": 11, "y": 2}, | ||
| 64 | {"matrix": [5, 2], "x": 12, "y": 2}, | ||
| 65 | {"matrix": [5, 1], "x": 13, "y": 2}, | ||
| 66 | {"matrix": [5, 0], "x": 14, "y": 2} | ||
| 27 | ] | 67 | ] |
| 28 | } | 68 | } |
| 29 | } | 69 | } |
diff --git a/keyboards/pisces/pisces.c b/keyboards/pisces/pisces.c index 18814c4744..ca2016280d 100644 --- a/keyboards/pisces/pisces.c +++ b/keyboards/pisces/pisces.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "pisces.h" | 17 | #include "quantum.h" |
| 18 | 18 | ||
| 19 | const matrix_row_t matrix_mask[MATRIX_ROWS] = { | 19 | const matrix_row_t matrix_mask[MATRIX_ROWS] = { |
| 20 | // 87654321 | 20 | // 87654321 |
diff --git a/keyboards/pisces/pisces.h b/keyboards/pisces/pisces.h deleted file mode 100644 index b2d61c17c3..0000000000 --- a/keyboards/pisces/pisces.h +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | /* Copyright 2021 knaruo | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | |||
| 30 | #define LAYOUT_split_3x6_1( \ | ||
| 31 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 32 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 33 | L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25 \ | ||
| 34 | ) { \ | ||
| 35 | { L00, L01, L02, L03, L04, L05, KC_NO }, \ | ||
| 36 | { L10, L11, L12, L13, L14, L15, KC_NO }, \ | ||
| 37 | { L20, L21, L22, L23, L24, L25, L26 }, \ | ||
| 38 | { R05, R04, R03, R02, R01, R00, KC_NO }, \ | ||
| 39 | { R15, R14, R13, R12, R11, R10, KC_NO }, \ | ||
| 40 | { R25, R24, R23, R22, R21, R20, R26 } \ | ||
| 41 | } | ||
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index 66092d592c..54bcb2e7fa 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json | |||
| @@ -34,90 +34,98 @@ | |||
| 34 | "layouts": { | 34 | "layouts": { |
| 35 | "LAYOUT_split_3x5_3": { | 35 | "LAYOUT_split_3x5_3": { |
| 36 | "layout": [ | 36 | "layout": [ |
| 37 | {"x":0, "y":1}, | 37 | {"matrix": [0, 0], "x": 0, "y": 1}, |
| 38 | {"x":1, "y":0.5}, | 38 | {"matrix": [0, 1], "x": 1, "y": 0.5}, |
| 39 | {"x":2, "y":0}, | 39 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 40 | {"x":3, "y":0.5}, | 40 | {"matrix": [0, 3], "x": 3, "y": 0.5}, |
| 41 | {"x":4, "y":0.75}, | 41 | {"matrix": [0, 4], "x": 4, "y": 0.75}, |
| 42 | {"x":10, "y":0.75}, | ||
| 43 | {"x":11, "y":0.5}, | ||
| 44 | {"x":12, "y":0}, | ||
| 45 | {"x":13, "y":0.5}, | ||
| 46 | {"x":14, "y":1}, | ||
| 47 | 42 | ||
| 48 | {"x":0, "y":2}, | 43 | {"matrix": [4, 4], "x": 10, "y": 0.75}, |
| 49 | {"x":1, "y":1.5}, | 44 | {"matrix": [4, 3], "x": 11, "y": 0.5}, |
| 50 | {"x":2, "y":1}, | 45 | {"matrix": [4, 2], "x": 12, "y": 0}, |
| 51 | {"x":3, "y":1.5}, | 46 | {"matrix": [4, 1], "x": 13, "y": 0.5}, |
| 52 | {"x":4, "y":1.75}, | 47 | {"matrix": [4, 0], "x": 14, "y": 1}, |
| 53 | {"x":10, "y":1.75}, | ||
| 54 | {"x":11, "y":1.5}, | ||
| 55 | {"x":12, "y":1}, | ||
| 56 | {"x":13, "y":1.5}, | ||
| 57 | {"x":14, "y":2}, | ||
| 58 | 48 | ||
| 59 | {"x":0, "y":3}, | 49 | {"matrix": [1, 0], "x": 0, "y": 2}, |
| 60 | {"x":1, "y":2.5}, | 50 | {"matrix": [1, 1], "x": 1, "y": 1.5}, |
| 61 | {"x":2, "y":2}, | 51 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 62 | {"x":3, "y":2.5}, | 52 | {"matrix": [1, 3], "x": 3, "y": 1.5}, |
| 63 | {"x":4, "y":2.75}, | 53 | {"matrix": [1, 4], "x": 4, "y": 1.75}, |
| 64 | {"x":10, "y":2.75}, | ||
| 65 | {"x":11, "y":2.5}, | ||
| 66 | {"x":12, "y":2}, | ||
| 67 | {"x":13, "y":2.5}, | ||
| 68 | {"x":14, "y":3}, | ||
| 69 | 54 | ||
| 70 | {"x":4, "y":4}, | 55 | {"matrix": [5, 4], "x": 10, "y": 1.75}, |
| 71 | {"x":5, "y":4}, | 56 | {"matrix": [5, 3], "x": 11, "y": 1.5}, |
| 72 | {"x":6, "y":4}, | 57 | {"matrix": [5, 2], "x": 12, "y": 1}, |
| 73 | {"x":8, "y":4}, | 58 | {"matrix": [5, 1], "x": 13, "y": 1.5}, |
| 74 | {"x":9, "y":4}, | 59 | {"matrix": [5, 0], "x": 14, "y": 2}, |
| 75 | {"x":10, "y":4} | 60 | |
| 61 | {"matrix": [2, 0], "x": 0, "y": 3}, | ||
| 62 | {"matrix": [2, 1], "x": 1, "y": 2.5}, | ||
| 63 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 64 | {"matrix": [2, 3], "x": 3, "y": 2.5}, | ||
| 65 | {"matrix": [2, 4], "x": 4, "y": 2.75}, | ||
| 66 | |||
| 67 | {"matrix": [6, 4], "x": 10, "y": 2.75}, | ||
| 68 | {"matrix": [6, 3], "x": 11, "y": 2.5}, | ||
| 69 | {"matrix": [6, 2], "x": 12, "y": 2}, | ||
| 70 | {"matrix": [6, 1], "x": 13, "y": 2.5}, | ||
| 71 | {"matrix": [6, 0], "x": 14, "y": 3}, | ||
| 72 | |||
| 73 | {"matrix": [3, 0], "x": 4, "y": 4}, | ||
| 74 | {"matrix": [3, 1], "x": 5, "y": 4}, | ||
| 75 | {"matrix": [3, 2], "x": 6, "y": 4}, | ||
| 76 | |||
| 77 | {"matrix": [7, 2], "x": 8, "y": 4}, | ||
| 78 | {"matrix": [7, 1], "x": 9, "y": 4}, | ||
| 79 | {"matrix": [7, 0], "x": 10, "y": 4} | ||
| 76 | ] | 80 | ] |
| 77 | }, | 81 | }, |
| 78 | "LAYOUT_split_3x5_3_encoder": { | 82 | "LAYOUT_split_3x5_3_encoder": { |
| 79 | "layout": [ | 83 | "layout": [ |
| 80 | {"x":0, "y":1}, | 84 | {"matrix": [0, 0], "x": 0, "y": 1}, |
| 81 | {"x":1, "y":0.5}, | 85 | {"matrix": [0, 1], "x": 1, "y": 0.5}, |
| 82 | {"x":2, "y":0}, | 86 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 83 | {"x":3, "y":0.5}, | 87 | {"matrix": [0, 3], "x": 3, "y": 0.5}, |
| 84 | {"x":4, "y":0.75}, | 88 | {"matrix": [0, 4], "x": 4, "y": 0.75}, |
| 85 | {"x":10, "y":0.75}, | 89 | |
| 86 | {"x":11, "y":0.5}, | 90 | {"matrix": [4, 4], "x": 10, "y": 0.75}, |
| 87 | {"x":12, "y":0}, | 91 | {"matrix": [4, 3], "x": 11, "y": 0.5}, |
| 88 | {"x":13, "y":0.5}, | 92 | {"matrix": [4, 2], "x": 12, "y": 0}, |
| 89 | {"x":14, "y":1}, | 93 | {"matrix": [4, 1], "x": 13, "y": 0.5}, |
| 94 | {"matrix": [4, 0], "x": 14, "y": 1}, | ||
| 95 | |||
| 96 | {"matrix": [1, 0], "x": 0, "y": 2}, | ||
| 97 | {"matrix": [1, 1], "x": 1, "y": 1.5}, | ||
| 98 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 99 | {"matrix": [1, 3], "x": 3, "y": 1.5}, | ||
| 100 | {"matrix": [1, 4], "x": 4, "y": 1.75}, | ||
| 101 | |||
| 102 | {"matrix": [5, 4], "x": 10, "y": 1.75}, | ||
| 103 | {"matrix": [5, 3], "x": 11, "y": 1.5}, | ||
| 104 | {"matrix": [5, 2], "x": 12, "y": 1}, | ||
| 105 | {"matrix": [5, 1], "x": 13, "y": 1.5}, | ||
| 106 | {"matrix": [5, 0], "x": 14, "y": 2}, | ||
| 107 | |||
| 108 | {"matrix": [2, 0], "x": 0, "y": 3}, | ||
| 109 | {"matrix": [2, 1], "x": 1, "y": 2.5}, | ||
| 110 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 111 | {"matrix": [2, 3], "x": 3, "y": 2.5}, | ||
| 112 | {"matrix": [2, 4], "x": 4, "y": 2.75}, | ||
| 113 | {"matrix": [3, 4], "x": 5.5, "y": 2.75}, | ||
| 90 | 114 | ||
| 91 | {"x":0, "y":2}, | 115 | {"matrix": [7, 4], "x": 8.5, "y": 2.75}, |
| 92 | {"x":1, "y":1.5}, | 116 | {"matrix": [6, 4], "x": 10, "y": 2.75}, |
| 93 | {"x":2, "y":1}, | 117 | {"matrix": [6, 3], "x": 11, "y": 2.5}, |
| 94 | {"x":3, "y":1.5}, | 118 | {"matrix": [6, 2], "x": 12, "y": 2}, |
| 95 | {"x":4, "y":1.75}, | 119 | {"matrix": [6, 1], "x": 13, "y": 2.5}, |
| 96 | {"x":10, "y":1.75}, | 120 | {"matrix": [6, 0], "x": 14, "y": 3}, |
| 97 | {"x":11, "y":1.5}, | ||
| 98 | {"x":12, "y":1}, | ||
| 99 | {"x":13, "y":1.5}, | ||
| 100 | {"x":14, "y":2}, | ||
| 101 | 121 | ||
| 102 | {"x":0, "y":3}, | 122 | {"matrix": [3, 0], "x": 4, "y": 4}, |
| 103 | {"x":1, "y":2.5}, | 123 | {"matrix": [3, 1], "x": 5, "y": 4}, |
| 104 | {"x":2, "y":2}, | 124 | {"matrix": [3, 2], "x": 6, "y": 4}, |
| 105 | {"x":3, "y":2.5}, | ||
| 106 | {"x":4, "y":2.75}, | ||
| 107 | {"label":"enc1", "x":5.5, "y":2.75}, | ||
| 108 | {"label":"enc2", "x":8.5, "y":2.75}, | ||
| 109 | {"x":10, "y":2.75}, | ||
| 110 | {"x":11, "y":2.5}, | ||
| 111 | {"x":12, "y":2}, | ||
| 112 | {"x":13, "y":2.5}, | ||
| 113 | {"x":14, "y":3}, | ||
| 114 | 125 | ||
| 115 | {"x":4, "y":4}, | 126 | {"matrix": [7, 2], "x": 8, "y": 4}, |
| 116 | {"x":5, "y":4}, | 127 | {"matrix": [7, 1], "x": 9, "y": 4}, |
| 117 | {"x":6, "y":4}, | 128 | {"matrix": [7, 0], "x": 10, "y": 4} |
| 118 | {"x":8, "y":4}, | ||
| 119 | {"x":9, "y":4}, | ||
| 120 | {"x":10, "y":4} | ||
| 121 | ] | 129 | ] |
| 122 | } | 130 | } |
| 123 | } | 131 | } |
diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c index 4c14e6ebd5..fbcc64b706 100644 --- a/keyboards/pteron36/pteron36.c +++ b/keyboards/pteron36/pteron36.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "pteron36.h" | 17 | #include "quantum.h" |
| 18 | 18 | ||
| 19 | //common encoder setup | 19 | //common encoder setup |
| 20 | 20 | ||
diff --git a/keyboards/pteron36/pteron36.h b/keyboards/pteron36/pteron36.h deleted file mode 100644 index 113e7270db..0000000000 --- a/keyboards/pteron36/pteron36.h +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | /* Copyright 2021 Harshit Goel | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | |||
| 30 | #define LAYOUT_split_3x5_3( \ | ||
| 31 | L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\ | ||
| 32 | L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\ | ||
| 33 | L20, L21, L22,L23, L24 , R24, R23, R22, R21, R20, \ | ||
| 34 | L30, L31, L32, R32, R31, R30\ | ||
| 35 | ) {\ | ||
| 36 | {L00, L01, L02,L03, L04 },\ | ||
| 37 | {L10, L11, L12,L13, L14 },\ | ||
| 38 | {L20, L21, L22,L23, L24 },\ | ||
| 39 | {L30, L31, L32, KC_NO, KC_NO },\ | ||
| 40 | {R00, R01, R02,R03, R04 },\ | ||
| 41 | {R10, R11, R12,R13, R14 },\ | ||
| 42 | {R20, R21, R22,R23, R24 },\ | ||
| 43 | {R30, R31, R32,KC_NO, KC_NO }\ | ||
| 44 | } | ||
| 45 | #define LAYOUT_split_3x5_3_encoder(\ | ||
| 46 | L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\ | ||
| 47 | L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\ | ||
| 48 | L20, L21, L22,L23, L24 ,L34, R34,R24, R23, R22, R21, R20, \ | ||
| 49 | L30, L31, L32, R32, R31, R30\ | ||
| 50 | ){\ | ||
| 51 | {L00, L01, L02,L03, L04 },\ | ||
| 52 | {L10, L11, L12,L13, L14 },\ | ||
| 53 | {L20, L21, L22,L23, L24 },\ | ||
| 54 | {L30, L31, L32, KC_NO, L34 },\ | ||
| 55 | {R00, R01, R02,R03, R04 },\ | ||
| 56 | {R10, R11, R12,R13, R14 },\ | ||
| 57 | {R20, R21, R22,R23, R24 },\ | ||
| 58 | {R30, R31, R32,KC_NO, R34 }\ | ||
| 59 | } | ||
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 3a2b853eac..03774dcfe5 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json | |||
| @@ -23,59 +23,130 @@ | |||
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | }, | 25 | }, |
| 26 | "layout_aliases": { | ||
| 27 | "LAYOUT": "LAYOUT_split_3x6_5" | ||
| 28 | }, | ||
| 26 | "layouts": { | 29 | "layouts": { |
| 27 | "LAYOUT": { | 30 | "LAYOUT_split_3x6_5": { |
| 31 | "layout": [ | ||
| 32 | {"matrix": [0, 7], "x": 0, "y": 0.75}, | ||
| 33 | {"matrix": [0, 6], "x": 1, "y": 0.75}, | ||
| 34 | {"matrix": [0, 5], "x": 2, "y": 0.25}, | ||
| 35 | {"matrix": [0, 4], "x": 3, "y": 0}, | ||
| 36 | {"matrix": [0, 3], "x": 4, "y": 0.25}, | ||
| 37 | {"matrix": [0, 2], "x": 5, "y": 0.5}, | ||
| 38 | |||
| 39 | {"matrix": [4, 2], "x": 10.5, "y": 0.5}, | ||
| 40 | {"matrix": [4, 3], "x": 11.5, "y": 0.25}, | ||
| 41 | {"matrix": [4, 4], "x": 12.5, "y": 0}, | ||
| 42 | {"matrix": [4, 5], "x": 13.5, "y": 0.25}, | ||
| 43 | {"matrix": [4, 6], "x": 14.5, "y": 0.75}, | ||
| 44 | {"matrix": [4, 7], "x": 15.5, "y": 0.75}, | ||
| 45 | |||
| 46 | {"matrix": [1, 7], "x": 0, "y": 1.75}, | ||
| 47 | {"matrix": [1, 6], "x": 1, "y": 1.75}, | ||
| 48 | {"matrix": [1, 5], "x": 2, "y": 1.25}, | ||
| 49 | {"matrix": [1, 4], "x": 3, "y": 1}, | ||
| 50 | {"matrix": [1, 3], "x": 4, "y": 1.25}, | ||
| 51 | {"matrix": [1, 2], "x": 5, "y": 1.5}, | ||
| 52 | |||
| 53 | {"matrix": [5, 2], "x": 10.5, "y": 1.5}, | ||
| 54 | {"matrix": [5, 3], "x": 11.5, "y": 1.25}, | ||
| 55 | {"matrix": [5, 4], "x": 12.5, "y": 1}, | ||
| 56 | {"matrix": [5, 5], "x": 13.5, "y": 1.25}, | ||
| 57 | {"matrix": [5, 6], "x": 14.5, "y": 1.75}, | ||
| 58 | {"matrix": [5, 7], "x": 15.5, "y": 1.75}, | ||
| 59 | |||
| 60 | {"matrix": [2, 7], "x": 0, "y": 2.75}, | ||
| 61 | {"matrix": [2, 6], "x": 1, "y": 2.75}, | ||
| 62 | {"matrix": [2, 5], "x": 2, "y": 2.25}, | ||
| 63 | {"matrix": [2, 4], "x": 3, "y": 2}, | ||
| 64 | {"matrix": [2, 3], "x": 4, "y": 2.25}, | ||
| 65 | {"matrix": [2, 2], "x": 5, "y": 2.5}, | ||
| 66 | {"matrix": [2, 1], "x": 6, "y": 3}, | ||
| 67 | {"matrix": [2, 0], "x": 7, "y": 3.25}, | ||
| 68 | |||
| 69 | {"matrix": [6, 0], "x": 8.5, "y": 3.25}, | ||
| 70 | {"matrix": [6, 1], "x": 9.5, "y": 3}, | ||
| 71 | {"matrix": [6, 2], "x": 10.5, "y": 2.5}, | ||
| 72 | {"matrix": [6, 3], "x": 11.5, "y": 2.25}, | ||
| 73 | {"matrix": [6, 4], "x": 12.5, "y": 2}, | ||
| 74 | {"matrix": [6, 5], "x": 13.5, "y": 2.25}, | ||
| 75 | {"matrix": [6, 6], "x": 14.5, "y": 2.75}, | ||
| 76 | {"matrix": [6, 7], "x": 15.5, "y": 2.75}, | ||
| 77 | |||
| 78 | {"matrix": [3, 4], "x": 2.5, "y": 3.25}, | ||
| 79 | {"matrix": [3, 3], "x": 3.5, "y": 3.25}, | ||
| 80 | {"matrix": [3, 2], "x": 4.5, "y": 3.5}, | ||
| 81 | {"matrix": [3, 1], "x": 5.5, "y": 4}, | ||
| 82 | {"matrix": [3, 0], "x": 6.5, "y": 4.25}, | ||
| 83 | |||
| 84 | {"matrix": [7, 0], "x": 9, "y": 4.25}, | ||
| 85 | {"matrix": [7, 1], "x": 10, "y": 4}, | ||
| 86 | {"matrix": [7, 2], "x": 11, "y": 3.5}, | ||
| 87 | {"matrix": [7, 3], "x": 12, "y": 3.25}, | ||
| 88 | {"matrix": [7, 4], "x": 13, "y": 3.25} | ||
| 89 | ] | ||
| 90 | }, | ||
| 91 | "LAYOUT_stack": { | ||
| 28 | "layout": [ | 92 | "layout": [ |
| 29 | {"x":0, "y":0.75}, | 93 | {"matrix": [0, 7], "x": 0, "y": 0}, |
| 30 | {"x":1, "y":0.75}, | 94 | {"matrix": [0, 6], "x": 1, "y": 0}, |
| 31 | {"x":2, "y":0.25}, | 95 | {"matrix": [0, 5], "x": 2, "y": 0}, |
| 32 | {"x":3, "y":0}, | 96 | {"matrix": [0, 4], "x": 3, "y": 0}, |
| 33 | {"x":4, "y":0.25}, | 97 | {"matrix": [0, 3], "x": 4, "y": 0}, |
| 34 | {"x":5, "y":0.5}, | 98 | {"matrix": [0, 2], "x": 5, "y": 0}, |
| 35 | {"x":10.5, "y":0.5}, | 99 | |
| 36 | {"x":11.5, "y":0.25}, | 100 | {"matrix": [1, 7], "x": 6, "y": 0}, |
| 37 | {"x":12.5, "y":0}, | 101 | {"matrix": [1, 6], "x": 7, "y": 0}, |
| 38 | {"x":13.5, "y":0.25}, | 102 | {"matrix": [1, 5], "x": 8, "y": 0}, |
| 39 | {"x":14.5, "y":0.75}, | 103 | {"matrix": [1, 4], "x": 9, "y": 0}, |
| 40 | {"x":15.5, "y":0.75}, | 104 | {"matrix": [1, 3], "x": 10, "y": 0}, |
| 41 | {"x":0, "y":1.75}, | 105 | {"matrix": [1, 2], "x": 11, "y": 0}, |
| 42 | {"x":1, "y":1.75}, | 106 | |
| 43 | {"x":2, "y":1.25}, | 107 | {"matrix": [2, 7], "x": 12, "y": 0}, |
| 44 | {"x":3, "y":1}, | 108 | {"matrix": [2, 6], "x": 13, "y": 0}, |
| 45 | {"x":4, "y":1.25}, | 109 | {"matrix": [2, 5], "x": 14, "y": 0}, |
| 46 | {"x":5, "y":1.5}, | 110 | {"matrix": [2, 4], "x": 15, "y": 0}, |
| 47 | {"x":10.5, "y":1.5}, | 111 | {"matrix": [2, 3], "x": 16, "y": 0}, |
| 48 | {"x":11.5, "y":1.25}, | 112 | {"matrix": [2, 2], "x": 17, "y": 0}, |
| 49 | {"x":12.5, "y":1}, | 113 | {"matrix": [2, 1], "x": 18, "y": 0}, |
| 50 | {"x":13.5, "y":1.25}, | 114 | {"matrix": [2, 0], "x": 19, "y": 0}, |
| 51 | {"x":14.5, "y":1.75}, | 115 | |
| 52 | {"x":15.5, "y":1.75}, | 116 | {"matrix": [3, 4], "x": 20, "y": 0}, |
| 53 | {"x":0, "y":2.75}, | 117 | {"matrix": [3, 3], "x": 21, "y": 0}, |
| 54 | {"x":1, "y":2.75}, | 118 | {"matrix": [3, 2], "x": 22, "y": 0}, |
| 55 | {"x":2, "y":2.25}, | 119 | {"matrix": [3, 1], "x": 23, "y": 0}, |
| 56 | {"x":3, "y":2}, | 120 | {"matrix": [3, 0], "x": 24, "y": 0}, |
| 57 | {"x":4, "y":2.25}, | 121 | |
| 58 | {"x":5, "y":2.5}, | 122 | {"matrix": [4, 2], "x": 25, "y": 0}, |
| 59 | {"x":6, "y":3}, | 123 | {"matrix": [4, 3], "x": 26, "y": 0}, |
| 60 | {"x":7, "y":3.25}, | 124 | {"matrix": [4, 4], "x": 27, "y": 0}, |
| 61 | {"x":8.5, "y":3.25}, | 125 | {"matrix": [4, 5], "x": 28, "y": 0}, |
| 62 | {"x":9.5, "y":3}, | 126 | {"matrix": [4, 6], "x": 29, "y": 0}, |
| 63 | {"x":10.5, "y":2.5}, | 127 | {"matrix": [4, 7], "x": 30, "y": 0}, |
| 64 | {"x":11.5, "y":2.25}, | 128 | |
| 65 | {"x":12.5, "y":2}, | 129 | {"matrix": [5, 2], "x": 31, "y": 0}, |
| 66 | {"x":13.5, "y":2.25}, | 130 | {"matrix": [5, 3], "x": 32, "y": 0}, |
| 67 | {"x":14.5, "y":2.75}, | 131 | {"matrix": [5, 4], "x": 33, "y": 0}, |
| 68 | {"x":15.5, "y":2.75}, | 132 | {"matrix": [5, 5], "x": 34, "y": 0}, |
| 69 | {"x":2.5, "y":3.25}, | 133 | {"matrix": [5, 6], "x": 35, "y": 0}, |
| 70 | {"x":3.5, "y":3.25}, | 134 | {"matrix": [5, 7], "x": 36, "y": 0}, |
| 71 | {"x":4.5, "y":3.5}, | 135 | |
| 72 | {"x":5.5, "y":4}, | 136 | {"matrix": [6, 0], "x": 37, "y": 0}, |
| 73 | {"x":6.5, "y":4.25}, | 137 | {"matrix": [6, 1], "x": 38, "y": 0}, |
| 74 | {"x":9, "y":4.25}, | 138 | {"matrix": [6, 2], "x": 39, "y": 0}, |
| 75 | {"x":10, "y":4}, | 139 | {"matrix": [6, 3], "x": 40, "y": 0}, |
| 76 | {"x":11, "y":3.5}, | 140 | {"matrix": [6, 4], "x": 41, "y": 0}, |
| 77 | {"x":12, "y":3.25}, | 141 | {"matrix": [6, 5], "x": 42, "y": 0}, |
| 78 | {"x":13, "y":3.25} | 142 | {"matrix": [6, 6], "x": 43, "y": 0}, |
| 143 | {"matrix": [6, 7], "x": 44, "y": 0}, | ||
| 144 | |||
| 145 | {"matrix": [7, 0], "x": 45, "y": 0}, | ||
| 146 | {"matrix": [7, 1], "x": 46, "y": 0}, | ||
| 147 | {"matrix": [7, 2], "x": 47, "y": 0}, | ||
| 148 | {"matrix": [7, 3], "x": 48, "y": 0}, | ||
| 149 | {"matrix": [7, 4], "x": 49, "y": 0} | ||
| 79 | ] | 150 | ] |
| 80 | } | 151 | } |
| 81 | } | 152 | } |
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c index 52a62ccef8..db14411933 100644 --- a/keyboards/splitkb/kyria/rev1/rev1.c +++ b/keyboards/splitkb/kyria/rev1/rev1.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "rev1.h" | 16 | #include "quantum.h" |
| 17 | 17 | ||
| 18 | #ifdef SWAP_HANDS_ENABLE | 18 | #ifdef SWAP_HANDS_ENABLE |
| 19 | // clang-format off | 19 | // clang-format off |
diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h deleted file mode 100644 index 9b5ea58ead..0000000000 --- a/keyboards/splitkb/kyria/rev1/rev1.h +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 1 | /* Copyright 2019 Thomas Baart <thomas@splitkb.com> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the keys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT( \ | ||
| 29 | L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \ | ||
| 30 | L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \ | ||
| 31 | L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \ | ||
| 32 | L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ | ||
| 36 | { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ | ||
| 37 | { L31, L30, L29, L28, L27, L26, L25, L24 }, \ | ||
| 38 | { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \ | ||
| 39 | { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ | ||
| 40 | { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ | ||
| 41 | { R32, R33, R34, R35, R36, R37, R38, R39 }, \ | ||
| 42 | { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \ | ||
| 43 | } | ||
| 44 | |||
| 45 | #define LAYOUT_stack( \ | ||
| 46 | L00, L01, L02, L03, L04, L05, \ | ||
| 47 | L12, L13, L14, L15, L16, L17, \ | ||
| 48 | L24, L25, L26, L27, L28, L29, L30, L31, \ | ||
| 49 | L40, L41, L42, L43, L44, \ | ||
| 50 | \ | ||
| 51 | R06, R07, R08, R09, R10, R11, \ | ||
| 52 | R18, R19, R20, R21, R22, R23, \ | ||
| 53 | R32, R33, R34, R35, R36, R37, R38, R39, \ | ||
| 54 | R45, R46, R47, R48, R49 \ | ||
| 55 | ) \ | ||
| 56 | { \ | ||
| 57 | { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ | ||
| 58 | { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ | ||
| 59 | { L31, L30, L29, L28, L27, L26, L25, L24 }, \ | ||
| 60 | { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \ | ||
| 61 | { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ | ||
| 62 | { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ | ||
| 63 | { R32, R33, R34, R35, R36, R37, R38, R39 }, \ | ||
| 64 | { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \ | ||
| 65 | } | ||
| 66 | |||
| 67 | #define LAYOUT_split_3x6_5 LAYOUT | ||
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index c0aa1047c5..67c9e7a775 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json | |||
| @@ -29,59 +29,130 @@ | |||
| 29 | } | 29 | } |
| 30 | } | 30 | } |
| 31 | }, | 31 | }, |
| 32 | "layout_aliases": { | ||
| 33 | "LAYOUT_split_3x6_5": "LAYOUT" | ||
| 34 | }, | ||
| 32 | "layouts": { | 35 | "layouts": { |
| 33 | "LAYOUT": { | 36 | "LAYOUT": { |
| 34 | "layout": [ | 37 | "layout": [ |
| 35 | {"x":0, "y":0.75}, | 38 | {"matrix": [0, 7], "x": 0, "y": 0.75}, |
| 36 | {"x":1, "y":0.75}, | 39 | {"matrix": [0, 6], "x": 1, "y": 0.75}, |
| 37 | {"x":2, "y":0.25}, | 40 | {"matrix": [0, 5], "x": 2, "y": 0.25}, |
| 38 | {"x":3, "y":0}, | 41 | {"matrix": [0, 4], "x": 3, "y": 0}, |
| 39 | {"x":4, "y":0.25}, | 42 | {"matrix": [0, 3], "x": 4, "y": 0.25}, |
| 40 | {"x":5, "y":0.5}, | 43 | {"matrix": [0, 2], "x": 5, "y": 0.5}, |
| 41 | {"x":10.5, "y":0.5}, | 44 | |
| 42 | {"x":11.5, "y":0.25}, | 45 | {"matrix": [4, 2], "x": 10.5, "y": 0.5}, |
| 43 | {"x":12.5, "y":0}, | 46 | {"matrix": [4, 3], "x": 11.5, "y": 0.25}, |
| 44 | {"x":13.5, "y":0.25}, | 47 | {"matrix": [4, 4], "x": 12.5, "y": 0}, |
| 45 | {"x":14.5, "y":0.75}, | 48 | {"matrix": [4, 5], "x": 13.5, "y": 0.25}, |
| 46 | {"x":15.5, "y":0.75}, | 49 | {"matrix": [4, 6], "x": 14.5, "y": 0.75}, |
| 47 | {"x":0, "y":1.75}, | 50 | {"matrix": [4, 7], "x": 15.5, "y": 0.75}, |
| 48 | {"x":1, "y":1.75}, | 51 | |
| 49 | {"x":2, "y":1.25}, | 52 | {"matrix": [1, 7], "x": 0, "y": 1.75}, |
| 50 | {"x":3, "y":1}, | 53 | {"matrix": [1, 6], "x": 1, "y": 1.75}, |
| 51 | {"x":4, "y":1.25}, | 54 | {"matrix": [1, 5], "x": 2, "y": 1.25}, |
| 52 | {"x":5, "y":1.5}, | 55 | {"matrix": [1, 4], "x": 3, "y": 1}, |
| 53 | {"x":10.5, "y":1.5}, | 56 | {"matrix": [1, 3], "x": 4, "y": 1.25}, |
| 54 | {"x":11.5, "y":1.25}, | 57 | {"matrix": [1, 2], "x": 5, "y": 1.5}, |
| 55 | {"x":12.5, "y":1}, | 58 | |
| 56 | {"x":13.5, "y":1.25}, | 59 | {"matrix": [5, 2], "x": 10.5, "y": 1.5}, |
| 57 | {"x":14.5, "y":1.75}, | 60 | {"matrix": [5, 3], "x": 11.5, "y": 1.25}, |
| 58 | {"x":15.5, "y":1.75}, | 61 | {"matrix": [5, 4], "x": 12.5, "y": 1}, |
| 59 | {"x":0, "y":2.75}, | 62 | {"matrix": [5, 5], "x": 13.5, "y": 1.25}, |
| 60 | {"x":1, "y":2.75}, | 63 | {"matrix": [5, 6], "x": 14.5, "y": 1.75}, |
| 61 | {"x":2, "y":2.25}, | 64 | {"matrix": [5, 7], "x": 15.5, "y": 1.75}, |
| 62 | {"x":3, "y":2}, | 65 | |
| 63 | {"x":4, "y":2.25}, | 66 | {"matrix": [2, 7], "x": 0, "y": 2.75}, |
| 64 | {"x":5, "y":2.5}, | 67 | {"matrix": [2, 6], "x": 1, "y": 2.75}, |
| 65 | {"x":6, "y":3}, | 68 | {"matrix": [2, 5], "x": 2, "y": 2.25}, |
| 66 | {"x":7, "y":3.25}, | 69 | {"matrix": [2, 4], "x": 3, "y": 2}, |
| 67 | {"x":8.5, "y":3.25}, | 70 | {"matrix": [2, 3], "x": 4, "y": 2.25}, |
| 68 | {"x":9.5, "y":3}, | 71 | {"matrix": [2, 2], "x": 5, "y": 2.5}, |
| 69 | {"x":10.5, "y":2.5}, | 72 | {"matrix": [2, 1], "x": 6, "y": 3}, |
| 70 | {"x":11.5, "y":2.25}, | 73 | {"matrix": [2, 0], "x": 7, "y": 3.25}, |
| 71 | {"x":12.5, "y":2}, | 74 | |
| 72 | {"x":13.5, "y":2.25}, | 75 | {"matrix": [6, 0], "x": 8.5, "y": 3.25}, |
| 73 | {"x":14.5, "y":2.75}, | 76 | {"matrix": [6, 1], "x": 9.5, "y": 3}, |
| 74 | {"x":15.5, "y":2.75}, | 77 | {"matrix": [6, 2], "x": 10.5, "y": 2.5}, |
| 75 | {"x":2.5, "y":3.25}, | 78 | {"matrix": [6, 3], "x": 11.5, "y": 2.25}, |
| 76 | {"x":3.5, "y":3.25}, | 79 | {"matrix": [6, 4], "x": 12.5, "y": 2}, |
| 77 | {"x":4.5, "y":3.5}, | 80 | {"matrix": [6, 5], "x": 13.5, "y": 2.25}, |
| 78 | {"x":5.5, "y":4}, | 81 | {"matrix": [6, 6], "x": 14.5, "y": 2.75}, |
| 79 | {"x":6.5, "y":4.25}, | 82 | {"matrix": [6, 7], "x": 15.5, "y": 2.75}, |
| 80 | {"x":9, "y":4.25}, | 83 | |
| 81 | {"x":10, "y":4}, | 84 | {"matrix": [3, 5], "x": 2.5, "y": 3.25}, |
| 82 | {"x":11, "y":3.5}, | 85 | {"matrix": [3, 3], "x": 3.5, "y": 3.25}, |
| 83 | {"x":12, "y":3.25}, | 86 | {"matrix": [3, 2], "x": 4.5, "y": 3.5}, |
| 84 | {"x":13, "y":3.25} | 87 | {"matrix": [3, 1], "x": 5.5, "y": 4}, |
| 88 | {"matrix": [3, 0], "x": 6.5, "y": 4.25}, | ||
| 89 | |||
| 90 | {"matrix": [7, 0], "x": 9, "y": 4.25}, | ||
| 91 | {"matrix": [7, 1], "x": 10, "y": 4}, | ||
| 92 | {"matrix": [7, 2], "x": 11, "y": 3.5}, | ||
| 93 | {"matrix": [7, 3], "x": 12, "y": 3.25}, | ||
| 94 | {"matrix": [7, 5], "x": 13, "y": 3.25} | ||
| 95 | ] | ||
| 96 | }, | ||
| 97 | "LAYOUT_stack": { | ||
| 98 | "layout": [ | ||
| 99 | {"matrix": [0, 7], "x": 0, "y": 0}, | ||
| 100 | {"matrix": [0, 6], "x": 1, "y": 0}, | ||
| 101 | {"matrix": [0, 5], "x": 2, "y": 0}, | ||
| 102 | {"matrix": [0, 4], "x": 3, "y": 0}, | ||
| 103 | {"matrix": [0, 3], "x": 4, "y": 0}, | ||
| 104 | {"matrix": [0, 2], "x": 5, "y": 0}, | ||
| 105 | |||
| 106 | {"matrix": [1, 7], "x": 6, "y": 0}, | ||
| 107 | {"matrix": [1, 6], "x": 7, "y": 0}, | ||
| 108 | {"matrix": [1, 5], "x": 8, "y": 0}, | ||
| 109 | {"matrix": [1, 4], "x": 9, "y": 0}, | ||
| 110 | {"matrix": [1, 3], "x": 10, "y": 0}, | ||
| 111 | {"matrix": [1, 2], "x": 11, "y": 0}, | ||
| 112 | |||
| 113 | {"matrix": [2, 7], "x": 12, "y": 0}, | ||
| 114 | {"matrix": [2, 6], "x": 13, "y": 0}, | ||
| 115 | {"matrix": [2, 5], "x": 14, "y": 0}, | ||
| 116 | {"matrix": [2, 4], "x": 15, "y": 0}, | ||
| 117 | {"matrix": [2, 3], "x": 16, "y": 0}, | ||
| 118 | {"matrix": [2, 2], "x": 17, "y": 0}, | ||
| 119 | {"matrix": [2, 1], "x": 18, "y": 0}, | ||
| 120 | {"matrix": [2, 0], "x": 19, "y": 0}, | ||
| 121 | |||
| 122 | {"matrix": [3, 5], "x": 20, "y": 0}, | ||
| 123 | {"matrix": [3, 3], "x": 21, "y": 0}, | ||
| 124 | {"matrix": [3, 2], "x": 22, "y": 0}, | ||
| 125 | {"matrix": [3, 1], "x": 23, "y": 0}, | ||
| 126 | {"matrix": [3, 0], "x": 24, "y": 0}, | ||
| 127 | |||
| 128 | {"matrix": [4, 2], "x": 25, "y": 0}, | ||
| 129 | {"matrix": [4, 3], "x": 26, "y": 0}, | ||
| 130 | {"matrix": [4, 4], "x": 27, "y": 0}, | ||
| 131 | {"matrix": [4, 5], "x": 28, "y": 0}, | ||
| 132 | {"matrix": [4, 6], "x": 29, "y": 0}, | ||
| 133 | {"matrix": [4, 7], "x": 30, "y": 0}, | ||
| 134 | |||
| 135 | {"matrix": [5, 2], "x": 31, "y": 0}, | ||
| 136 | {"matrix": [5, 3], "x": 32, "y": 0}, | ||
| 137 | {"matrix": [5, 4], "x": 33, "y": 0}, | ||
| 138 | {"matrix": [5, 5], "x": 34, "y": 0}, | ||
| 139 | {"matrix": [5, 6], "x": 35, "y": 0}, | ||
| 140 | {"matrix": [5, 7], "x": 36, "y": 0}, | ||
| 141 | |||
| 142 | {"matrix": [6, 0], "x": 37, "y": 0}, | ||
| 143 | {"matrix": [6, 1], "x": 38, "y": 0}, | ||
| 144 | {"matrix": [6, 2], "x": 39, "y": 0}, | ||
| 145 | {"matrix": [6, 3], "x": 40, "y": 0}, | ||
| 146 | {"matrix": [6, 4], "x": 41, "y": 0}, | ||
| 147 | {"matrix": [6, 5], "x": 42, "y": 0}, | ||
| 148 | {"matrix": [6, 6], "x": 43, "y": 0}, | ||
| 149 | {"matrix": [6, 7], "x": 44, "y": 0}, | ||
| 150 | |||
| 151 | {"matrix": [7, 0], "x": 45, "y": 0}, | ||
| 152 | {"matrix": [7, 1], "x": 46, "y": 0}, | ||
| 153 | {"matrix": [7, 2], "x": 47, "y": 0}, | ||
| 154 | {"matrix": [7, 3], "x": 48, "y": 0}, | ||
| 155 | {"matrix": [7, 5], "x": 49, "y": 0} | ||
| 85 | ] | 156 | ] |
| 86 | } | 157 | } |
| 87 | } | 158 | } |
diff --git a/keyboards/splitkb/kyria/rev2/rev2.c b/keyboards/splitkb/kyria/rev2/rev2.c index 3ec4aa37f0..37300c8188 100644 --- a/keyboards/splitkb/kyria/rev2/rev2.c +++ b/keyboards/splitkb/kyria/rev2/rev2.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "rev2.h" | 16 | #include "quantum.h" |
| 17 | 17 | ||
| 18 | // Mask out handedness diode to prevent it | 18 | // Mask out handedness diode to prevent it |
| 19 | // from keeping the keyboard awake | 19 | // from keeping the keyboard awake |
diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h deleted file mode 100644 index 89d69abc9a..0000000000 --- a/keyboards/splitkb/kyria/rev2/rev2.h +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 1 | /* Copyright 2022 Thomas Baart <thomas@splitkb.com> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include "quantum.h" | ||
| 19 | |||
| 20 | /* This a shortcut to help you visually see your layout. | ||
| 21 | * | ||
| 22 | * The first section contains all of the arguments representing the physical | ||
| 23 | * layout of the board and position of the keys. | ||
| 24 | * | ||
| 25 | * The second converts the arguments into a two-dimensional array which | ||
| 26 | * represents the switch matrix. | ||
| 27 | */ | ||
| 28 | #define LAYOUT( \ | ||
| 29 | L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \ | ||
| 30 | L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \ | ||
| 31 | L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \ | ||
| 32 | L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \ | ||
| 33 | ) \ | ||
| 34 | { \ | ||
| 35 | { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ | ||
| 36 | { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ | ||
| 37 | { L31, L30, L29, L28, L27, L26, L25, L24 }, \ | ||
| 38 | { L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \ | ||
| 39 | { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ | ||
| 40 | { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ | ||
| 41 | { R32, R33, R34, R35, R36, R37, R38, R39 }, \ | ||
| 42 | { R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \ | ||
| 43 | } | ||
| 44 | |||
| 45 | #define LAYOUT_stack( \ | ||
| 46 | L00, L01, L02, L03, L04, L05, \ | ||
| 47 | L12, L13, L14, L15, L16, L17, \ | ||
| 48 | L24, L25, L26, L27, L28, L29, L30, L31, \ | ||
| 49 | L40, L41, L42, L43, L44, \ | ||
| 50 | \ | ||
| 51 | R06, R07, R08, R09, R10, R11, \ | ||
| 52 | R18, R19, R20, R21, R22, R23, \ | ||
| 53 | R32, R33, R34, R35, R36, R37, R38, R39, \ | ||
| 54 | R45, R46, R47, R48, R49 \ | ||
| 55 | ) \ | ||
| 56 | { \ | ||
| 57 | { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ | ||
| 58 | { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ | ||
| 59 | { L31, L30, L29, L28, L27, L26, L25, L24 }, \ | ||
| 60 | { L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \ | ||
| 61 | { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ | ||
| 62 | { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ | ||
| 63 | { R32, R33, R34, R35, R36, R37, R38, R39 }, \ | ||
| 64 | { R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \ | ||
| 65 | } | ||
| 66 | |||
| 67 | #define LAYOUT_split_3x6_5 LAYOUT | ||
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json index 32b7c90d44..c5294d14af 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/info.json | |||
| @@ -18,50 +18,57 @@ | |||
| 18 | "layouts": { | 18 | "layouts": { |
| 19 | "LAYOUT_split_3x6_4": { | 19 | "LAYOUT_split_3x6_4": { |
| 20 | "layout": [ | 20 | "layout": [ |
| 21 | {"label":"SW1", "x":0, "y":0.375}, | 21 | {"matrix": [0, 0], "x": 0, "y": 0.375}, |
| 22 | {"label":"SW2", "x":1, "y":0.375}, | 22 | {"matrix": [0, 1], "x": 1, "y": 0.375}, |
| 23 | {"label":"SW3", "x":2, "y":0.125}, | 23 | {"matrix": [0, 2], "x": 2, "y": 0.125}, |
| 24 | {"label":"SW4", "x":3, "y":0}, | 24 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 25 | {"label":"SW5", "x":4, "y":0.125}, | 25 | {"matrix": [0, 4], "x": 4, "y": 0.125}, |
| 26 | {"label":"SW6", "x":5, "y":0.25}, | 26 | {"matrix": [0, 5], "x": 5, "y": 0.25}, |
| 27 | {"label":"SW23", "x":9, "y":0.25}, | 27 | |
| 28 | {"label":"SW24", "x":10, "y":0.125}, | 28 | {"matrix": [0, 6], "x": 9, "y": 0.25}, |
| 29 | {"label":"SW25", "x":11, "y":0}, | 29 | {"matrix": [0, 7], "x": 10, "y": 0.125}, |
| 30 | {"label":"SW26", "x":12, "y":0.125}, | 30 | {"matrix": [0, 8], "x": 11, "y": 0}, |
| 31 | {"label":"SW27", "x":13, "y":0.375}, | 31 | {"matrix": [0, 9], "x": 12, "y": 0.125}, |
| 32 | {"label":"SW28", "x":14, "y":0.375}, | 32 | {"matrix": [0, 10], "x": 13, "y": 0.375}, |
| 33 | {"label":"SW7", "x":0, "y":1.375}, | 33 | {"matrix": [0, 11], "x": 14, "y": 0.375}, |
| 34 | {"label":"SW8", "x":1, "y":1.375}, | 34 | |
| 35 | {"label":"SW9", "x":2, "y":1.125}, | 35 | {"matrix": [1, 0], "x": 0, "y": 1.375}, |
| 36 | {"label":"SW10", "x":3, "y":1}, | 36 | {"matrix": [1, 1], "x": 1, "y": 1.375}, |
| 37 | {"label":"SW11", "x":4, "y":1.125}, | 37 | {"matrix": [1, 2], "x": 2, "y": 1.125}, |
| 38 | {"label":"SW12", "x":5, "y":1.25}, | 38 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 39 | {"label":"SW29", "x":9, "y":1.25}, | 39 | {"matrix": [1, 4], "x": 4, "y": 1.125}, |
| 40 | {"label":"SW30", "x":10, "y":1.125}, | 40 | {"matrix": [1, 5], "x": 5, "y": 1.25}, |
| 41 | {"label":"SW31", "x":11, "y":1}, | 41 | |
| 42 | {"label":"SW32", "x":12, "y":1.125}, | 42 | {"matrix": [1, 6], "x": 9, "y": 1.25}, |
| 43 | {"label":"SW33", "x":13, "y":1.375}, | 43 | {"matrix": [1, 7], "x": 10, "y": 1.125}, |
| 44 | {"label":"SW34", "x":14, "y":1.375}, | 44 | {"matrix": [1, 8], "x": 11, "y": 1}, |
| 45 | {"label":"SW13", "x":0, "y":2.375}, | 45 | {"matrix": [1, 9], "x": 12, "y": 1.125}, |
| 46 | {"label":"SW14", "x":1, "y":2.375}, | 46 | {"matrix": [1, 10], "x": 13, "y": 1.375}, |
| 47 | {"label":"SW15", "x":2, "y":2.125}, | 47 | {"matrix": [1, 11], "x": 14, "y": 1.375}, |
| 48 | {"label":"SW16", "x":3, "y":2}, | 48 | |
| 49 | {"label":"SW17", "x":4, "y":2.125}, | 49 | {"matrix": [2, 0], "x": 0, "y": 2.375}, |
| 50 | {"label":"SW18", "x":5, "y":2.25}, | 50 | {"matrix": [2, 1], "x": 1, "y": 2.375}, |
| 51 | {"label":"SW35", "x":9, "y":2.25}, | 51 | {"matrix": [2, 2], "x": 2, "y": 2.125}, |
| 52 | {"label":"SW36", "x":10, "y":2.125}, | 52 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 53 | {"label":"SW37", "x":11, "y":2}, | 53 | {"matrix": [2, 4], "x": 4, "y": 2.125}, |
| 54 | {"label":"SW38", "x":12, "y":2.125}, | 54 | {"matrix": [2, 5], "x": 5, "y": 2.25}, |
| 55 | {"label":"SW39", "x":13, "y":2.375}, | 55 | |
| 56 | {"label":"SW40", "x":14, "y":2.375}, | 56 | {"matrix": [2, 6], "x": 9, "y": 2.25}, |
| 57 | {"label":"SW19", "x":3, "y":3.1}, | 57 | {"matrix": [2, 7], "x": 10, "y": 2.125}, |
| 58 | {"label":"SW20", "x":4, "y":3.25}, | 58 | {"matrix": [2, 8], "x": 11, "y": 2}, |
| 59 | {"label":"SW21", "x":5, "y":3.4}, | 59 | {"matrix": [2, 9], "x": 12, "y": 2.125}, |
| 60 | {"label":"SW22", "x":6, "y":3.55}, | 60 | {"matrix": [2, 10], "x": 13, "y": 2.375}, |
| 61 | {"label":"SW41", "x":8, "y":3.55}, | 61 | {"matrix": [2, 11], "x": 14, "y": 2.375}, |
| 62 | {"label":"SW42", "x":9, "y":3.4}, | 62 | |
| 63 | {"label":"SW43", "x":10, "y":3.25}, | 63 | {"matrix": [3, 2], "x": 3, "y": 3.1}, |
| 64 | {"label":"SW44", "x":11, "y":3.1} | 64 | {"matrix": [3, 3], "x": 4, "y": 3.25}, |
| 65 | {"matrix": [3, 4], "x": 5, "y": 3.4}, | ||
| 66 | {"matrix": [3, 5], "x": 6, "y": 3.55}, | ||
| 67 | |||
| 68 | {"matrix": [3, 6], "x": 8, "y": 3.55}, | ||
| 69 | {"matrix": [3, 7], "x": 9, "y": 3.4}, | ||
| 70 | {"matrix": [3, 8], "x": 10, "y": 3.25}, | ||
| 71 | {"matrix": [3, 9], "x": 11, "y": 3.1} | ||
| 65 | ] | 72 | ] |
| 66 | } | 73 | } |
| 67 | } | 74 | } |
diff --git a/keyboards/torn/torn.h b/keyboards/torn/torn.h index c25b5c2a0c..0b4355e86a 100644 --- a/keyboards/torn/torn.h +++ b/keyboards/torn/torn.h | |||
| @@ -19,22 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #include "quantum.h" | 20 | #include "quantum.h" |
| 21 | 21 | ||
| 22 | #define ___ KC_NO | ||
| 23 | |||
| 24 | // clang-format off | ||
| 25 | #define LAYOUT_split_3x6_4( \ | ||
| 26 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | ||
| 27 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ | ||
| 28 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ | ||
| 29 | k32, k33, k34, k35, k36, k37, k38, k39 \ | ||
| 30 | ) { \ | ||
| 31 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ | ||
| 32 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ | ||
| 33 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ | ||
| 34 | { ___, ___, k32, k33, k34, k35, k36, k37, k38, k39, ___, ___ } \ | ||
| 35 | } | ||
| 36 | // clang-format on | ||
| 37 | |||
| 38 | void torn_set_led(uint8_t led, bool on); | 22 | void torn_set_led(uint8_t led, bool on); |
| 39 | 23 | ||
| 40 | void secondary_encoder_read(void); | 24 | void secondary_encoder_read(void); |
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 3365ea7cf5..78aaa10e72 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json | |||
| @@ -28,57 +28,57 @@ | |||
| 28 | "layouts": { | 28 | "layouts": { |
| 29 | "LAYOUT_split_3x6_4": { | 29 | "LAYOUT_split_3x6_4": { |
| 30 | "layout": [ | 30 | "layout": [ |
| 31 | {"label":"Tab", "x":0, "y":0.8}, | 31 | {"matrix": [0, 0], "x": 0, "y": 0.8}, |
| 32 | {"label":"Q", "x":1, "y":0.8}, | 32 | {"matrix": [0, 1], "x": 1, "y": 0.8}, |
| 33 | {"label":"W", "x":2, "y":0.1}, | 33 | {"matrix": [0, 2], "x": 2, "y": 0.1}, |
| 34 | {"label":"E", "x":3, "y":0}, | 34 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 35 | {"label":"R", "x":4, "y":0.1}, | 35 | {"matrix": [0, 4], "x": 4, "y": 0.1}, |
| 36 | {"label":"T", "x":5, "y":0.2}, | 36 | {"matrix": [0, 5], "x": 5, "y": 0.2}, |
| 37 | 37 | ||
| 38 | {"label":"Y", "x":9, "y":0.2}, | 38 | {"matrix": [0, 6], "x": 9, "y": 0.2}, |
| 39 | {"label":"U", "x":10, "y":0.1}, | 39 | {"matrix": [0, 7], "x": 10, "y": 0.1}, |
| 40 | {"label":"I", "x":11, "y":0}, | 40 | {"matrix": [0, 8], "x": 11, "y": 0}, |
| 41 | {"label":"O", "x":12, "y":0.1}, | 41 | {"matrix": [0, 9], "x": 12, "y": 0.1}, |
| 42 | {"label":"P", "x":13, "y":0.8}, | 42 | {"matrix": [0, 10], "x": 13, "y": 0.8}, |
| 43 | {"label":"Back Space", "x":14, "y":0.8}, | 43 | {"matrix": [0, 11], "x": 14, "y": 0.8}, |
| 44 | 44 | ||
| 45 | {"label":"Ctrl / Esc", "x":0, "y":1.8}, | 45 | {"matrix": [1, 0], "x": 0, "y": 1.8}, |
| 46 | {"label":"A", "x":1, "y":1.8}, | 46 | {"matrix": [1, 1], "x": 1, "y": 1.8}, |
| 47 | {"label":"S", "x":2, "y":1.1}, | 47 | {"matrix": [1, 2], "x": 2, "y": 1.1}, |
| 48 | {"label":"D", "x":3, "y":1}, | 48 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 49 | {"label":"F", "x":4, "y":1.1}, | 49 | {"matrix": [1, 4], "x": 4, "y": 1.1}, |
| 50 | {"label":"G", "x":5, "y":1.2}, | 50 | {"matrix": [1, 5], "x": 5, "y": 1.2}, |
| 51 | 51 | ||
| 52 | {"label":"H", "x":9, "y":1.2}, | 52 | {"matrix": [1, 6], "x": 9, "y": 1.2}, |
| 53 | {"label":"J", "x":10, "y":1.1}, | 53 | {"matrix": [1, 7], "x": 10, "y": 1.1}, |
| 54 | {"label":"K", "x":11, "y":1}, | 54 | {"matrix": [1, 8], "x": 11, "y": 1}, |
| 55 | {"label":"L", "x":12, "y":1.1}, | 55 | {"matrix": [1, 9], "x": 12, "y": 1.1}, |
| 56 | {"label":";", "x":13, "y":1.8}, | 56 | {"matrix": [1, 10], "x": 13, "y": 1.8}, |
| 57 | {"label":"'", "x":14, "y":1.8}, | 57 | {"matrix": [1, 11], "x": 14, "y": 1.8}, |
| 58 | 58 | ||
| 59 | {"label":"Shift", "x":0, "y":2.8}, | 59 | {"matrix": [2, 0], "x": 0, "y": 2.8}, |
| 60 | {"label":"Z", "x":1, "y":2.8}, | 60 | {"matrix": [2, 1], "x": 1, "y": 2.8}, |
| 61 | {"label":"X", "x":2, "y":2.1}, | 61 | {"matrix": [2, 2], "x": 2, "y": 2.1}, |
| 62 | {"label":"C", "x":3, "y":2}, | 62 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 63 | {"label":"V", "x":4, "y":2.1}, | 63 | {"matrix": [2, 4], "x": 4, "y": 2.1}, |
| 64 | {"label":"B", "x":5, "y":2.2}, | 64 | {"matrix": [2, 5], "x": 5, "y": 2.2}, |
| 65 | 65 | ||
| 66 | {"label":"N", "x":9, "y":2.2}, | 66 | {"matrix": [2, 6], "x": 9, "y": 2.2}, |
| 67 | {"label":"M", "x":10, "y":2.1}, | 67 | {"matrix": [2, 7], "x": 10, "y": 2.1}, |
| 68 | {"label":",", "x":11, "y":2}, | 68 | {"matrix": [2, 8], "x": 11, "y": 2}, |
| 69 | {"label":".", "x":12, "y":2.1}, | 69 | {"matrix": [2, 9], "x": 12, "y": 2.1}, |
| 70 | {"label":"/", "x":13, "y":2.8}, | 70 | {"matrix": [2, 10], "x": 13, "y": 2.8}, |
| 71 | {"label":"Shift / Enter", "x":14, "y":2.8}, | 71 | {"matrix": [2, 11], "x": 14, "y": 2.8}, |
| 72 | 72 | ||
| 73 | {"label":"Ctrl", "x":3, "y":3.7}, | 73 | {"matrix": [3, 2], "x": 3, "y": 3.7}, |
| 74 | {"label":"Alt", "x":4, "y":3.7}, | 74 | {"matrix": [3, 3], "x": 4, "y": 3.7}, |
| 75 | {"label":"Lower", "x":5, "y":3.7}, | 75 | {"matrix": [3, 4], "x": 5, "y": 3.7}, |
| 76 | {"label":"Enter", "x":6, "y":3.2, "h":1.5}, | 76 | {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, |
| 77 | 77 | ||
| 78 | {"label":"Backspace", "x":8, "y":3.2, "h":1.5}, | 78 | {"matrix": [3, 6], "x": 8, "y": 3.2, "h": 1.5}, |
| 79 | {"label":"Space", "x":9, "y":3.7}, | 79 | {"matrix": [3, 7], "x": 9, "y": 3.7}, |
| 80 | {"label":"Raise", "x":10, "y":3.7}, | 80 | {"matrix": [3, 8], "x": 10, "y": 3.7}, |
| 81 | {"label":"RGUI", "x":11, "y":3.7} | 81 | {"matrix": [3, 9], "x": 11, "y": 3.7} |
| 82 | ] | 82 | ] |
| 83 | } | 83 | } |
| 84 | } | 84 | } |
diff --git a/keyboards/yanghu/unicorne/unicorne.h b/keyboards/yanghu/unicorne/unicorne.h index f0b5685f1d..6f89e393a7 100644 --- a/keyboards/yanghu/unicorne/unicorne.h +++ b/keyboards/yanghu/unicorne/unicorne.h | |||
| @@ -23,28 +23,3 @@ void oled_render_capslock(bool caps_on); | |||
| 23 | void oled_render_mods(void); | 23 | void oled_render_mods(void); |
| 24 | void oled_render_keylog(void); | 24 | void oled_render_keylog(void); |
| 25 | #endif | 25 | #endif |
| 26 | /* This a shortcut to help you visually see your layout. | ||
| 27 | * | ||
| 28 | * The first section contains all of the arguments representing the physical | ||
| 29 | * layout of the board and position of the keys. | ||
| 30 | * | ||
| 31 | * The second converts the arguments into a two-dimensional array which | ||
| 32 | * represents the switch matrix. | ||
| 33 | */ | ||
| 34 | |||
| 35 | // clang-format off | ||
| 36 | #define LAYOUT_split_3x6_4( \ | ||
| 37 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ | ||
| 38 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ | ||
| 39 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ | ||
| 40 | K30, K31, K32, K33, K34, K35, K36, K37 \ | ||
| 41 | ) \ | ||
| 42 | { \ | ||
| 43 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ | ||
| 44 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ | ||
| 45 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ | ||
| 46 | { KC_NO, KC_NO, K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO} \ | ||
| 47 | } | ||
| 48 | // clang-format on | ||
| 49 | |||
| 50 | #define LAYOUT LAYOUT_split_3x6_4 | ||
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index d32b1490d1..ebd425050b 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json | |||
| @@ -21,50 +21,58 @@ | |||
| 21 | "layouts": { | 21 | "layouts": { |
| 22 | "LAYOUT_split_3x6_4": { | 22 | "LAYOUT_split_3x6_4": { |
| 23 | "layout": [ | 23 | "layout": [ |
| 24 | {"label":"L00", "x":0, "y":1.5}, | 24 | {"matrix": [0, 0], "x": 0, "y": 1.5}, |
| 25 | {"label":"L01", "x":1, "y":1.25}, | 25 | {"matrix": [0, 1], "x": 1, "y": 1.25}, |
| 26 | {"label":"L02", "x":2, "y":0.5}, | 26 | {"matrix": [0, 2], "x": 2, "y": 0.5}, |
| 27 | {"label":"L03", "x":3, "y":0}, | 27 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 28 | {"label":"L04", "x":4, "y":0.25}, | 28 | {"matrix": [0, 4], "x": 4, "y": 0.25}, |
| 29 | {"label":"L05", "x":5, "y":0.5}, | 29 | {"matrix": [0, 5], "x": 5, "y": 0.5}, |
| 30 | {"label":"R00", "x":8.75, "y":0.5}, | 30 | |
| 31 | {"label":"R01", "x":9.75, "y":0.25}, | 31 | {"matrix": [4, 5], "x": 8.75, "y": 0.5}, |
| 32 | {"label":"R02", "x":10.75, "y":0}, | 32 | {"matrix": [4, 4], "x": 9.75, "y": 0.25}, |
| 33 | {"label":"R03", "x":11.75, "y":0.5}, | 33 | {"matrix": [4, 3], "x": 10.75, "y": 0}, |
| 34 | {"label":"R04", "x":12.75, "y":1.25}, | 34 | {"matrix": [4, 2], "x": 11.75, "y": 0.5}, |
| 35 | {"label":"R05", "x":13.75, "y":1.5}, | 35 | {"matrix": [4, 1], "x": 12.75, "y": 1.25}, |
| 36 | {"label":"L10", "x":0, "y":2.5}, | 36 | {"matrix": [4, 0], "x": 13.75, "y": 1.5}, |
| 37 | {"label":"L11", "x":1, "y":2.25}, | 37 | |
| 38 | {"label":"L12", "x":2, "y":1.5}, | 38 | {"matrix": [1, 0], "x": 0, "y": 2.5}, |
| 39 | {"label":"L13", "x":3, "y":1}, | 39 | {"matrix": [1, 1], "x": 1, "y": 2.25}, |
| 40 | {"label":"L14", "x":4, "y":1.25}, | 40 | {"matrix": [1, 2], "x": 2, "y": 1.5}, |
| 41 | {"label":"L15", "x":5, "y":1.5}, | 41 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 42 | {"label":"R10", "x":8.75, "y":1.5}, | 42 | {"matrix": [1, 4], "x": 4, "y": 1.25}, |
| 43 | {"label":"R11", "x":9.75, "y":1.25}, | 43 | {"matrix": [1, 5], "x": 5, "y": 1.5}, |
| 44 | {"label":"R12", "x":10.75, "y":1}, | 44 | |
| 45 | {"label":"R13", "x":11.75, "y":1.5}, | 45 | {"matrix": [5, 5], "x": 8.75, "y": 1.5}, |
| 46 | {"label":"R14", "x":12.75, "y":2.25}, | 46 | {"matrix": [5, 4], "x": 9.75, "y": 1.25}, |
| 47 | {"label":"R15", "x":13.75, "y":2.5}, | 47 | {"matrix": [5, 3], "x": 10.75, "y": 1}, |
| 48 | {"label":"L20", "x":0, "y":3.5}, | 48 | {"matrix": [5, 2], "x": 11.75, "y": 1.5}, |
| 49 | {"label":"L21", "x":1, "y":3.25}, | 49 | {"matrix": [5, 1], "x": 12.75, "y": 2.25}, |
| 50 | {"label":"L22", "x":2, "y":2.5}, | 50 | {"matrix": [5, 0], "x": 13.75, "y": 2.5}, |
| 51 | {"label":"L23", "x":3, "y":2}, | 51 | |
| 52 | {"label":"L24", "x":4, "y":2.25}, | 52 | {"matrix": [2, 0], "x": 0, "y": 3.5}, |
| 53 | {"label":"L25", "x":5, "y":2.5}, | 53 | {"matrix": [2, 1], "x": 1, "y": 3.25}, |
| 54 | {"label":"R20", "x":8.75, "y":2.5}, | 54 | {"matrix": [2, 2], "x": 2, "y": 2.5}, |
| 55 | {"label":"R21", "x":9.75, "y":2.25}, | 55 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 56 | {"label":"R22", "x":10.75, "y":2}, | 56 | {"matrix": [2, 4], "x": 4, "y": 2.25}, |
| 57 | {"label":"R23", "x":11.75, "y":2.5}, | 57 | {"matrix": [2, 5], "x": 5, "y": 2.5}, |
| 58 | {"label":"R24", "x":12.75, "y":3.25}, | 58 | |
| 59 | {"label":"R25", "x":13.75, "y":3.5}, | 59 | {"matrix": [6, 5], "x": 8.75, "y": 2.5}, |
| 60 | {"label":"L30", "x":3, "y":4}, | 60 | {"matrix": [6, 4], "x": 9.75, "y": 2.25}, |
| 61 | {"label":"L31", "x":4, "y":3.75}, | 61 | {"matrix": [6, 3], "x": 10.75, "y": 2}, |
| 62 | {"label":"L32", "x":5, "y":3.75}, | 62 | {"matrix": [6, 2], "x": 11.75, "y": 2.5}, |
| 63 | {"label":"L33", "x":6, "y":4}, | 63 | {"matrix": [6, 1], "x": 12.75, "y": 3.25}, |
| 64 | {"label":"R30", "x":7.75, "y":4}, | 64 | {"matrix": [6, 0], "x": 13.75, "y": 3.5}, |
| 65 | {"label":"R31", "x":8.75, "y":3.75}, | 65 | |
| 66 | {"label":"R32", "x":9.75, "y":3.75}, | 66 | {"matrix": [3, 2], "x": 3, "y": 4}, |
| 67 | {"label":"R33", "x":10.75, "y":4}] | 67 | {"matrix": [3, 3], "x": 4, "y": 3.75}, |
| 68 | {"matrix": [3, 4], "x": 5, "y": 3.75}, | ||
| 69 | {"matrix": [3, 5], "x": 6, "y": 4}, | ||
| 70 | |||
| 71 | {"matrix": [7, 5], "x": 7.75, "y": 4}, | ||
| 72 | {"matrix": [7, 4], "x": 8.75, "y": 3.75}, | ||
| 73 | {"matrix": [7, 3], "x": 9.75, "y": 3.75}, | ||
| 74 | {"matrix": [7, 2], "x": 10.75, "y": 4} | ||
| 75 | ] | ||
| 68 | } | 76 | } |
| 69 | } | 77 | } |
| 70 | } | 78 | } |
diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h b/keyboards/yoichiro/lunakey_mini/lunakey_mini.h deleted file mode 100644 index bb649cc018..0000000000 --- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* Copyright 2020 Yoichiro Tanaka | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | #define LAYOUT_split_3x6_4( \ | ||
| 30 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 31 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 32 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 33 | L30, L31, L32, L33, R30, R31, R32, R33 \ | ||
| 34 | ) \ | ||
| 35 | { \ | ||
| 36 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 37 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 38 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 39 | { KC_NO, KC_NO, L30, L31, L32, L33 }, \ | ||
| 40 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 41 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 42 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 43 | { KC_NO, KC_NO, R33, R32, R31, R30 } \ | ||
| 44 | } | ||
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json index 3253eb7edc..e98e38a335 100644 --- a/keyboards/yoichiro/lunakey_pico/info.json +++ b/keyboards/yoichiro/lunakey_pico/info.json | |||
| @@ -59,50 +59,58 @@ | |||
| 59 | "layouts": { | 59 | "layouts": { |
| 60 | "LAYOUT_split_3x6_4": { | 60 | "LAYOUT_split_3x6_4": { |
| 61 | "layout": [ | 61 | "layout": [ |
| 62 | {"label":"L00", "x":0, "y":1.5}, | 62 | {"matrix": [0, 0], "x": 0, "y": 1.5}, |
| 63 | {"label":"L01", "x":1, "y":1.25}, | 63 | {"matrix": [0, 1], "x": 1, "y": 1.25}, |
| 64 | {"label":"L02", "x":2, "y":0.5}, | 64 | {"matrix": [0, 2], "x": 2, "y": 0.5}, |
| 65 | {"label":"L03", "x":3, "y":0}, | 65 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 66 | {"label":"L04", "x":4, "y":0.25}, | 66 | {"matrix": [0, 4], "x": 4, "y": 0.25}, |
| 67 | {"label":"L05", "x":5, "y":0.5}, | 67 | {"matrix": [0, 5], "x": 5, "y": 0.5}, |
| 68 | {"label":"R00", "x":8.75, "y":0.5}, | 68 | |
| 69 | {"label":"R01", "x":9.75, "y":0.25}, | 69 | {"matrix": [4, 5], "x": 8.75, "y": 0.5}, |
| 70 | {"label":"R02", "x":10.75, "y":0}, | 70 | {"matrix": [4, 4], "x": 9.75, "y": 0.25}, |
| 71 | {"label":"R03", "x":11.75, "y":0.5}, | 71 | {"matrix": [4, 3], "x": 10.75, "y": 0}, |
| 72 | {"label":"R04", "x":12.75, "y":1.25}, | 72 | {"matrix": [4, 2], "x": 11.75, "y": 0.5}, |
| 73 | {"label":"R05", "x":13.75, "y":1.5}, | 73 | {"matrix": [4, 1], "x": 12.75, "y": 1.25}, |
| 74 | {"label":"L10", "x":0, "y":2.5}, | 74 | {"matrix": [4, 0], "x": 13.75, "y": 1.5}, |
| 75 | {"label":"L11", "x":1, "y":2.25}, | 75 | |
| 76 | {"label":"L12", "x":2, "y":1.5}, | 76 | {"matrix": [1, 0], "x": 0, "y": 2.5}, |
| 77 | {"label":"L13", "x":3, "y":1}, | 77 | {"matrix": [1, 1], "x": 1, "y": 2.25}, |
| 78 | {"label":"L14", "x":4, "y":1.25}, | 78 | {"matrix": [1, 2], "x": 2, "y": 1.5}, |
| 79 | {"label":"L15", "x":5, "y":1.5}, | 79 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 80 | {"label":"R10", "x":8.75, "y":1.5}, | 80 | {"matrix": [1, 4], "x": 4, "y": 1.25}, |
| 81 | {"label":"R11", "x":9.75, "y":1.25}, | 81 | {"matrix": [1, 5], "x": 5, "y": 1.5}, |
| 82 | {"label":"R12", "x":10.75, "y":1}, | 82 | |
| 83 | {"label":"R13", "x":11.75, "y":1.5}, | 83 | {"matrix": [5, 5], "x": 8.75, "y": 1.5}, |
| 84 | {"label":"R14", "x":12.75, "y":2.25}, | 84 | {"matrix": [5, 4], "x": 9.75, "y": 1.25}, |
| 85 | {"label":"R15", "x":13.75, "y":2.5}, | 85 | {"matrix": [5, 3], "x": 10.75, "y": 1}, |
| 86 | {"label":"L20", "x":0, "y":3.5}, | 86 | {"matrix": [5, 2], "x": 11.75, "y": 1.5}, |
| 87 | {"label":"L21", "x":1, "y":3.25}, | 87 | {"matrix": [5, 1], "x": 12.75, "y": 2.25}, |
| 88 | {"label":"L22", "x":2, "y":2.5}, | 88 | {"matrix": [5, 0], "x": 13.75, "y": 2.5}, |
| 89 | {"label":"L23", "x":3, "y":2}, | 89 | |
| 90 | {"label":"L24", "x":4, "y":2.25}, | 90 | {"matrix": [2, 0], "x": 0, "y": 3.5}, |
| 91 | {"label":"L25", "x":5, "y":2.5}, | 91 | {"matrix": [2, 1], "x": 1, "y": 3.25}, |
| 92 | {"label":"R20", "x":8.75, "y":2.5}, | 92 | {"matrix": [2, 2], "x": 2, "y": 2.5}, |
| 93 | {"label":"R21", "x":9.75, "y":2.25}, | 93 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 94 | {"label":"R22", "x":10.75, "y":2}, | 94 | {"matrix": [2, 4], "x": 4, "y": 2.25}, |
| 95 | {"label":"R23", "x":11.75, "y":2.5}, | 95 | {"matrix": [2, 5], "x": 5, "y": 2.5}, |
| 96 | {"label":"R24", "x":12.75, "y":3.25}, | 96 | |
| 97 | {"label":"R25", "x":13.75, "y":3.5}, | 97 | {"matrix": [6, 5], "x": 8.75, "y": 2.5}, |
| 98 | {"label":"L30", "x":3, "y":4}, | 98 | {"matrix": [6, 4], "x": 9.75, "y": 2.25}, |
| 99 | {"label":"L31", "x":4, "y":3.75}, | 99 | {"matrix": [6, 3], "x": 10.75, "y": 2}, |
| 100 | {"label":"L32", "x":5, "y":3.75}, | 100 | {"matrix": [6, 2], "x": 11.75, "y": 2.5}, |
| 101 | {"label":"L33", "x":6, "y":4}, | 101 | {"matrix": [6, 1], "x": 12.75, "y": 3.25}, |
| 102 | {"label":"R30", "x":7.75, "y":4}, | 102 | {"matrix": [6, 0], "x": 13.75, "y": 3.5}, |
| 103 | {"label":"R31", "x":8.75, "y":3.75}, | 103 | |
| 104 | {"label":"R32", "x":9.75, "y":3.75}, | 104 | {"matrix": [3, 2], "x": 3, "y": 4}, |
| 105 | {"label":"R33", "x":10.75, "y":4}] | 105 | {"matrix": [3, 3], "x": 4, "y": 3.75}, |
| 106 | {"matrix": [3, 4], "x": 5, "y": 3.75}, | ||
| 107 | {"matrix": [3, 5], "x": 6, "y": 4}, | ||
| 108 | |||
| 109 | {"matrix": [7, 5], "x": 7.75, "y": 4}, | ||
| 110 | {"matrix": [7, 4], "x": 8.75, "y": 3.75}, | ||
| 111 | {"matrix": [7, 3], "x": 9.75, "y": 3.75}, | ||
| 112 | {"matrix": [7, 2], "x": 10.75, "y": 4} | ||
| 113 | ] | ||
| 106 | } | 114 | } |
| 107 | } | 115 | } |
| 108 | } | 116 | } |
diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h b/keyboards/yoichiro/lunakey_pico/lunakey_pico.h deleted file mode 100644 index 0725054f0f..0000000000 --- a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | // Copyright 2022 Yoichiro Tanaka (@yoichiro) | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "quantum.h" | ||
| 7 | |||
| 8 | #define LAYOUT_split_3x6_4( \ | ||
| 9 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
| 10 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
| 11 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
| 12 | L30, L31, L32, L33, R30, R31, R32, R33 \ | ||
| 13 | ) \ | ||
| 14 | { \ | ||
| 15 | { L00, L01, L02, L03, L04, L05 }, \ | ||
| 16 | { L10, L11, L12, L13, L14, L15 }, \ | ||
| 17 | { L20, L21, L22, L23, L24, L25 }, \ | ||
| 18 | { KC_NO, KC_NO, L30, L31, L32, L33 }, \ | ||
| 19 | { R05, R04, R03, R02, R01, R00 }, \ | ||
| 20 | { R15, R14, R13, R12, R11, R10 }, \ | ||
| 21 | { R25, R24, R23, R22, R21, R20 }, \ | ||
| 22 | { KC_NO, KC_NO, R33, R32, R31, R30 } \ | ||
| 23 | } | ||