diff options
| author | Ryan <fauxpark@gmail.com> | 2023-04-12 13:42:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 13:42:51 +1000 |
| commit | 5bd68e3695a82ff504c358c33445b4530c2a327f (patch) | |
| tree | 10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/compound | |
| parent | 941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff) | |
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/compound')
| -rw-r--r-- | keyboards/compound/compound.h | 38 | ||||
| -rw-r--r-- | keyboards/compound/info.json | 124 |
2 files changed, 62 insertions, 100 deletions
diff --git a/keyboards/compound/compound.h b/keyboards/compound/compound.h deleted file mode 100644 index 697ca3d0f8..0000000000 --- a/keyboards/compound/compound.h +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2021 Rafael Yumagulov | ||
| 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 | // Improve readability | ||
| 23 | #define XXX KC_NO | ||
| 24 | |||
| 25 | #define LAYOUT( \ | ||
| 26 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ | ||
| 27 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ | ||
| 28 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ | ||
| 29 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ | ||
| 30 | k40, k41, k42, k46, k4a, k4b, k4c \ | ||
| 31 | ) \ | ||
| 32 | { \ | ||
| 33 | {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ | ||
| 34 | {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ | ||
| 35 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, XXX}, \ | ||
| 36 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \ | ||
| 37 | {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, XXX, XXX} \ | ||
| 38 | } | ||
diff --git a/keyboards/compound/info.json b/keyboards/compound/info.json index f3b95cec42..9f31c7efc1 100644 --- a/keyboards/compound/info.json +++ b/keyboards/compound/info.json | |||
| @@ -18,72 +18,72 @@ | |||
| 18 | "layouts": { | 18 | "layouts": { |
| 19 | "LAYOUT": { | 19 | "LAYOUT": { |
| 20 | "layout": [ | 20 | "layout": [ |
| 21 | {"x": 0, "y": 0}, | 21 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 22 | {"x": 1, "y": 0}, | 22 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 23 | {"x": 2, "y": 0}, | 23 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 24 | {"x": 3, "y": 0}, | 24 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 25 | {"x": 4, "y": 0}, | 25 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 26 | {"x": 5, "y": 0}, | 26 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 27 | {"x": 6, "y": 0}, | 27 | {"matrix": [0, 6], "x": 6, "y": 0}, |
| 28 | {"x": 7, "y": 0}, | 28 | {"matrix": [0, 7], "x": 7, "y": 0}, |
| 29 | {"x": 8, "y": 0}, | 29 | {"matrix": [0, 8], "x": 8, "y": 0}, |
| 30 | {"x": 9, "y": 0}, | 30 | {"matrix": [0, 9], "x": 9, "y": 0}, |
| 31 | {"x": 10, "y": 0}, | 31 | {"matrix": [0, 10], "x": 10, "y": 0}, |
| 32 | {"x": 11, "y": 0}, | 32 | {"matrix": [0, 11], "x": 11, "y": 0}, |
| 33 | {"x": 12, "y": 0}, | 33 | {"matrix": [0, 12], "x": 12, "y": 0}, |
| 34 | {"x": 13, "y": 0}, | 34 | {"matrix": [0, 13], "x": 13, "y": 0}, |
| 35 | {"x": 14, "y": 0}, | 35 | {"matrix": [0, 14], "x": 14, "y": 0}, |
| 36 | 36 | ||
| 37 | {"x": 0, "y": 1, "w": 1.5}, | 37 | {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, |
| 38 | {"x": 1.5, "y": 1}, | 38 | {"matrix": [1, 1], "x": 1.5, "y": 1}, |
| 39 | {"x": 2.5, "y": 1}, | 39 | {"matrix": [1, 2], "x": 2.5, "y": 1}, |
| 40 | {"x": 3.5, "y": 1}, | 40 | {"matrix": [1, 3], "x": 3.5, "y": 1}, |
| 41 | {"x": 4.5, "y": 1}, | 41 | {"matrix": [1, 4], "x": 4.5, "y": 1}, |
| 42 | {"x": 5.5, "y": 1}, | 42 | {"matrix": [1, 5], "x": 5.5, "y": 1}, |
| 43 | {"x": 6.5, "y": 1}, | 43 | {"matrix": [1, 6], "x": 6.5, "y": 1}, |
| 44 | {"x": 7.5, "y": 1}, | 44 | {"matrix": [1, 7], "x": 7.5, "y": 1}, |
| 45 | {"x": 8.5, "y": 1}, | 45 | {"matrix": [1, 8], "x": 8.5, "y": 1}, |
| 46 | {"x": 9.5, "y": 1}, | 46 | {"matrix": [1, 9], "x": 9.5, "y": 1}, |
| 47 | {"x": 10.5, "y": 1}, | 47 | {"matrix": [1, 10], "x": 10.5, "y": 1}, |
| 48 | {"x": 11.5, "y": 1}, | 48 | {"matrix": [1, 11], "x": 11.5, "y": 1}, |
| 49 | {"x": 12.5, "y": 1}, | 49 | {"matrix": [1, 12], "x": 12.5, "y": 1}, |
| 50 | {"x": 13.5, "y": 1, "w": 1.5}, | 50 | {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, |
| 51 | 51 | ||
| 52 | {"x": 0, "y": 2, "w": 1.75}, | 52 | {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, |
| 53 | {"x": 1.75, "y": 2}, | 53 | {"matrix": [2, 1], "x": 1.75, "y": 2}, |
| 54 | {"x": 2.75, "y": 2}, | 54 | {"matrix": [2, 2], "x": 2.75, "y": 2}, |
| 55 | {"x": 3.75, "y": 2}, | 55 | {"matrix": [2, 3], "x": 3.75, "y": 2}, |
| 56 | {"x": 4.75, "y": 2}, | 56 | {"matrix": [2, 4], "x": 4.75, "y": 2}, |
| 57 | {"x": 5.75, "y": 2}, | 57 | {"matrix": [2, 5], "x": 5.75, "y": 2}, |
| 58 | {"x": 6.75, "y": 2}, | 58 | {"matrix": [2, 6], "x": 6.75, "y": 2}, |
| 59 | {"x": 7.75, "y": 2}, | 59 | {"matrix": [2, 7], "x": 7.75, "y": 2}, |
| 60 | {"x": 8.75, "y": 2}, | 60 | {"matrix": [2, 8], "x": 8.75, "y": 2}, |
| 61 | {"x": 9.75, "y": 2}, | 61 | {"matrix": [2, 9], "x": 9.75, "y": 2}, |
| 62 | {"x": 10.75, "y": 2}, | 62 | {"matrix": [2, 10], "x": 10.75, "y": 2}, |
| 63 | {"x": 11.75, "y": 2}, | 63 | {"matrix": [2, 11], "x": 11.75, "y": 2}, |
| 64 | {"x": 12.75, "y": 2, "w": 2.25}, | 64 | {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, |
| 65 | 65 | ||
| 66 | {"x": 0, "y": 3, "w": 2.25}, | 66 | {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, |
| 67 | {"x": 2.25, "y": 3}, | 67 | {"matrix": [3, 1], "x": 2.25, "y": 3}, |
| 68 | {"x": 3.25, "y": 3}, | 68 | {"matrix": [3, 2], "x": 3.25, "y": 3}, |
| 69 | {"x": 4.25, "y": 3}, | 69 | {"matrix": [3, 3], "x": 4.25, "y": 3}, |
| 70 | {"x": 5.25, "y": 3}, | 70 | {"matrix": [3, 4], "x": 5.25, "y": 3}, |
| 71 | {"x": 6.25, "y": 3}, | 71 | {"matrix": [3, 5], "x": 6.25, "y": 3}, |
| 72 | {"x": 7.25, "y": 3}, | 72 | {"matrix": [3, 6], "x": 7.25, "y": 3}, |
| 73 | {"x": 8.25, "y": 3}, | 73 | {"matrix": [3, 7], "x": 8.25, "y": 3}, |
| 74 | {"x": 9.25, "y": 3}, | 74 | {"matrix": [3, 8], "x": 9.25, "y": 3}, |
| 75 | {"x": 10.25, "y": 3}, | 75 | {"matrix": [3, 9], "x": 10.25, "y": 3}, |
| 76 | {"x": 11.25, "y": 3}, | 76 | {"matrix": [3, 10], "x": 11.25, "y": 3}, |
| 77 | {"x": 12.25, "y": 3, "w": 1.75}, | 77 | {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, |
| 78 | {"x": 14, "y": 3}, | 78 | {"matrix": [3, 12], "x": 14, "y": 3}, |
| 79 | 79 | ||
| 80 | {"x": 0, "y": 4, "w": 1.5}, | 80 | {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, |
| 81 | {"x": 1.5, "y": 4}, | 81 | {"matrix": [4, 1], "x": 1.5, "y": 4}, |
| 82 | {"x": 2.5, "y": 4, "w": 1.5}, | 82 | {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, |
| 83 | {"x": 4, "y": 4, "w": 7}, | 83 | {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, |
| 84 | {"x": 11, "y": 4, "w": 1.5}, | 84 | {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, |
| 85 | {"x": 12.5, "y": 4}, | 85 | {"matrix": [4, 11], "x": 12.5, "y": 4}, |
| 86 | {"x": 13.5, "y": 4, "w": 1.5} | 86 | {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} |
| 87 | ] | 87 | ] |
| 88 | } | 88 | } |
| 89 | } | 89 | } |
