From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/aeboards/aegis/aegis.h | 43 --- keyboards/aeboards/aegis/info.json | 234 +++++++-------- keyboards/aeboards/ext65/rev1/info.json | 177 +++++------ keyboards/aeboards/ext65/rev1/rev1.c | 2 +- keyboards/aeboards/ext65/rev1/rev1.h | 40 --- keyboards/aeboards/ext65/rev2/info.json | 177 +++++------ keyboards/aeboards/ext65/rev2/rev2.c | 2 +- keyboards/aeboards/ext65/rev2/rev2.h | 40 --- keyboards/aeboards/ext65/rev3/info.json | 512 ++++++-------------------------- keyboards/aeboards/ext65/rev3/rev3.c | 2 +- keyboards/aeboards/ext65/rev3/rev3.h | 40 --- 11 files changed, 391 insertions(+), 878 deletions(-) delete mode 100644 keyboards/aeboards/aegis/aegis.h delete mode 100644 keyboards/aeboards/ext65/rev1/rev1.h delete mode 100644 keyboards/aeboards/ext65/rev2/rev2.h delete mode 100644 keyboards/aeboards/ext65/rev3/rev3.h (limited to 'keyboards/aeboards') diff --git a/keyboards/aeboards/aegis/aegis.h b/keyboards/aeboards/aegis/aegis.h deleted file mode 100644 index 95ffb73dde..0000000000 --- a/keyboards/aeboards/aegis/aegis.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define _____ KC_NO - -#define LAYOUT_aegis( \ - K0000, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, \ - K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0108, \ - K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, \ - K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0606, K0706, K0607, K0707, K0608, \ - K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0905, K0806, K0906, K0807, K0907, K0808, K0908, \ - K1000, K1100, K1001, K1101, K1002, K1102, K1003, K1103, K1105, K1107, K1008, K1108 \ -) { \ - { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008 }, \ - { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108 }, \ - { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208 }, \ - { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308 }, \ - { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408 }, \ - { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508 }, \ - { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608 }, \ - { K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, _____ }, \ - { K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, K0808 }, \ - { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908 }, \ - { K1000, K1001, K1002, K1003, _____, _____, _____, _____, K1008 }, \ - { K1100, K1101, K1102, K1103, _____, K1105, _____, K1107, K1108 } \ -} diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json index 63b9ea551e..5fe143318f 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/info.json @@ -18,123 +18,123 @@ "layouts": { "LAYOUT_aegis": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 4.5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - {"x": 17.5, "y": 0}, - {"x": 18.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - - {"x": 4.5, "y": 1.5}, - {"x": 5.5, "y": 1.5}, - {"x": 6.5, "y": 1.5}, - {"x": 7.5, "y": 1.5}, - {"x": 8.5, "y": 1.5}, - {"x": 9.5, "y": 1.5}, - {"x": 10.5, "y": 1.5}, - {"x": 11.5, "y": 1.5}, - {"x": 12.5, "y": 1.5}, - {"x": 13.5, "y": 1.5}, - {"x": 14.5, "y": 1.5}, - {"x": 15.5, "y": 1.5}, - {"x": 16.5, "y": 1.5}, - {"x": 17.5, "y": 1.5}, - {"x": 18.5, "y": 1.5}, - - {"x": 0, "y": 2.5}, - {"x": 1, "y": 2.5}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2.5}, - - {"x": 4.5, "y": 2.5, "w": 1.5}, - {"x": 6, "y": 2.5}, - {"x": 7, "y": 2.5}, - {"x": 8, "y": 2.5}, - {"x": 9, "y": 2.5}, - {"x": 10, "y": 2.5}, - {"x": 11, "y": 2.5}, - {"x": 12, "y": 2.5}, - {"x": 13, "y": 2.5}, - {"x": 14, "y": 2.5}, - {"x": 15, "y": 2.5}, - {"x": 16, "y": 2.5}, - {"x": 17, "y": 2.5}, - {"x": 18, "y": 2.5, "w": 1.5}, - - {"x": 0, "y": 3.5}, - {"x": 1, "y": 3.5}, - {"x": 2, "y": 3.5}, - {"x": 3, "y": 3.5}, - - {"x": 4.5, "y": 3.5, "w": 1.75}, - {"x": 6.25, "y": 3.5}, - {"x": 7.25, "y": 3.5}, - {"x": 8.25, "y": 3.5}, - {"x": 9.25, "y": 3.5}, - {"x": 10.25, "y": 3.5}, - {"x": 11.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.5}, - {"x": 14.25, "y": 3.5}, - {"x": 15.25, "y": 3.5}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, - - {"x": 0, "y": 4.5}, - {"x": 1, "y": 4.5}, - {"x": 2, "y": 4.5}, - {"x": 3, "y": 4.5}, - - {"x": 4.25, "y": 4.75}, - - {"x": 5.5, "y": 4.5, "w": 1.25}, - {"x": 6.75, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 8.75, "y": 4.5}, - {"x": 9.75, "y": 4.5}, - {"x": 10.75, "y": 4.5}, - {"x": 11.75, "y": 4.5}, - {"x": 12.75, "y": 4.5}, - {"x": 13.75, "y": 4.5}, - {"x": 14.75, "y": 4.5}, - {"x": 15.75, "y": 4.5}, - {"x": 16.75, "y": 4.5, "w": 1.75}, - {"x": 18.5, "y": 4.5}, - - {"x": 0, "y": 5.5}, - {"x": 1, "y": 5.5}, - {"x": 2, "y": 5.5}, - - {"x": 3.25, "y": 5.75}, - {"x": 4.25, "y": 5.75}, - {"x": 5.25, "y": 5.75}, - - {"x": 6.5, "y": 5.5, "w": 1.25}, - {"x": 7.75, "y": 5.5, "w": 1.25}, - {"x": 9, "y": 5.5, "w": 6.25}, - {"x": 15.25, "y": 5.5, "w": 1.5}, - {"x": 16.75, "y": 5.5, "w": 1.25}, - {"x": 18, "y": 5.5, "w": 1.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + + {"matrix": [0, 2], "x": 4.5, "y": 0}, + + {"matrix": [1, 2], "x": 6.5, "y": 0}, + {"matrix": [0, 3], "x": 7.5, "y": 0}, + {"matrix": [1, 3], "x": 8.5, "y": 0}, + {"matrix": [0, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 4], "x": 11, "y": 0}, + {"matrix": [0, 5], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 15.5, "y": 0}, + {"matrix": [0, 7], "x": 16.5, "y": 0}, + {"matrix": [1, 7], "x": 17.5, "y": 0}, + {"matrix": [0, 8], "x": 18.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + + {"matrix": [2, 2], "x": 4.5, "y": 1.5}, + {"matrix": [3, 2], "x": 5.5, "y": 1.5}, + {"matrix": [2, 3], "x": 6.5, "y": 1.5}, + {"matrix": [3, 3], "x": 7.5, "y": 1.5}, + {"matrix": [2, 4], "x": 8.5, "y": 1.5}, + {"matrix": [3, 4], "x": 9.5, "y": 1.5}, + {"matrix": [2, 5], "x": 10.5, "y": 1.5}, + {"matrix": [3, 5], "x": 11.5, "y": 1.5}, + {"matrix": [2, 6], "x": 12.5, "y": 1.5}, + {"matrix": [3, 6], "x": 13.5, "y": 1.5}, + {"matrix": [2, 7], "x": 14.5, "y": 1.5}, + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + {"matrix": [2, 8], "x": 16.5, "y": 1.5}, + {"matrix": [3, 8], "x": 17.5, "y": 1.5}, + {"matrix": [1, 8], "x": 18.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [5, 0], "x": 1, "y": 2.5}, + {"matrix": [4, 1], "x": 2, "y": 2.5}, + {"matrix": [5, 1], "x": 3, "y": 2.5}, + + {"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5}, + {"matrix": [5, 2], "x": 6, "y": 2.5}, + {"matrix": [4, 3], "x": 7, "y": 2.5}, + {"matrix": [5, 3], "x": 8, "y": 2.5}, + {"matrix": [4, 4], "x": 9, "y": 2.5}, + {"matrix": [5, 4], "x": 10, "y": 2.5}, + {"matrix": [4, 5], "x": 11, "y": 2.5}, + {"matrix": [5, 5], "x": 12, "y": 2.5}, + {"matrix": [4, 6], "x": 13, "y": 2.5}, + {"matrix": [5, 6], "x": 14, "y": 2.5}, + {"matrix": [4, 7], "x": 15, "y": 2.5}, + {"matrix": [5, 7], "x": 16, "y": 2.5}, + {"matrix": [4, 8], "x": 17, "y": 2.5}, + {"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5}, + {"matrix": [7, 0], "x": 1, "y": 3.5}, + {"matrix": [6, 1], "x": 2, "y": 3.5}, + {"matrix": [7, 1], "x": 3, "y": 3.5}, + + {"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75}, + {"matrix": [7, 2], "x": 6.25, "y": 3.5}, + {"matrix": [6, 3], "x": 7.25, "y": 3.5}, + {"matrix": [7, 3], "x": 8.25, "y": 3.5}, + {"matrix": [6, 4], "x": 9.25, "y": 3.5}, + {"matrix": [7, 4], "x": 10.25, "y": 3.5}, + {"matrix": [6, 5], "x": 11.25, "y": 3.5}, + {"matrix": [7, 5], "x": 12.25, "y": 3.5}, + {"matrix": [6, 6], "x": 13.25, "y": 3.5}, + {"matrix": [7, 6], "x": 14.25, "y": 3.5}, + {"matrix": [6, 7], "x": 15.25, "y": 3.5}, + {"matrix": [7, 7], "x": 16.25, "y": 3.5}, + {"matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.5}, + {"matrix": [9, 0], "x": 1, "y": 4.5}, + {"matrix": [8, 1], "x": 2, "y": 4.5}, + {"matrix": [9, 1], "x": 3, "y": 4.5}, + + {"matrix": [8, 2], "x": 4.25, "y": 4.75}, + + {"matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25}, + {"matrix": [8, 3], "x": 6.75, "y": 4.5}, + {"matrix": [9, 3], "x": 7.75, "y": 4.5}, + {"matrix": [8, 4], "x": 8.75, "y": 4.5}, + {"matrix": [9, 4], "x": 9.75, "y": 4.5}, + {"matrix": [8, 5], "x": 10.75, "y": 4.5}, + {"matrix": [9, 5], "x": 11.75, "y": 4.5}, + {"matrix": [8, 6], "x": 12.75, "y": 4.5}, + {"matrix": [9, 6], "x": 13.75, "y": 4.5}, + {"matrix": [8, 7], "x": 14.75, "y": 4.5}, + {"matrix": [9, 7], "x": 15.75, "y": 4.5}, + {"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75}, + {"matrix": [9, 8], "x": 18.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5}, + {"matrix": [11, 0], "x": 1, "y": 5.5}, + {"matrix": [10, 1], "x": 2, "y": 5.5}, + + {"matrix": [11, 1], "x": 3.25, "y": 5.75}, + {"matrix": [10, 2], "x": 4.25, "y": 5.75}, + {"matrix": [11, 2], "x": 5.25, "y": 5.75}, + + {"matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25}, + {"matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5}, + {"matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5} ] } } diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json index d56d3902c2..ffe8d2443e 100644 --- a/keyboards/aeboards/ext65/rev1/info.json +++ b/keyboards/aeboards/ext65/rev1/info.json @@ -17,103 +17,104 @@ "layouts": { "LAYOUT_ext65": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - {"x": 17.5, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0}, + {"matrix": [1, 7], "x": 15.5, "y": 0}, + {"matrix": [0, 8], "x": 16.5, "y": 0}, + {"matrix": [1, 8], "x": 17.5, "y": 0}, + {"matrix": [5, 8], "x": 18.5, "y": 0}, + {"matrix": [0, 9], "x": 19.5, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, - {"x": 4.5, "y": 1, "w": 1.5}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "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}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1, "w": 1.5}, - {"x": 19.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [2, 5], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12, "y": 1}, + {"matrix": [2, 6], "x": 13, "y": 1}, + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [2, 7], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [2, 8], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, - {"x": 4.5, "y": 2, "w": 1.75}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "y": 2}, - {"x": 8.25, "y": 2}, - {"x": 9.25, "y": 2}, - {"x": 10.25, "y": 2}, - {"x": 11.25, "y": 2}, - {"x": 12.25, "y": 2}, - {"x": 13.25, "y": 2}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2}, - {"x": 16.25, "y": 2}, - {"x": 17.25, "y": 2, "w": 2.25}, - {"x": 19.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2}, + {"matrix": [5, 6], "x": 14.25, "y": 2}, + {"matrix": [4, 7], "x": 15.25, "y": 2}, + {"matrix": [5, 7], "x": 16.25, "y": 2}, + {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25}, + {"matrix": [4, 9], "x": 19.5, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, - {"x": 4.5, "y": 3, "w": 2.25}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 3}, - {"x": 14.75, "y": 3}, - {"x": 15.75, "y": 3}, - {"x": 16.75, "y": 3, "w": 1.75}, - {"x": 18.5, "y": 3}, - {"x": 19.5, "y": 3}, + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [7, 2], "x": 6.75, "y": 3}, + {"matrix": [6, 3], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [6, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 3}, + {"matrix": [6, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 5], "x": 12.75, "y": 3}, + {"matrix": [6, 6], "x": 13.75, "y": 3}, + {"matrix": [7, 6], "x": 14.75, "y": 3}, + {"matrix": [6, 7], "x": 15.75, "y": 3}, + {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75}, + {"matrix": [6, 8], "x": 18.5, "y": 3}, + {"matrix": [7, 9], "x": 19.5, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4.5, "y": 4, "w": 1.5}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4, "w": 1.5}, - {"x": 8.5, "y": 4, "w": 6.25}, - {"x": 14.75, "y": 4, "w": 1.25}, - {"x": 16, "y": 4}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [8, 1], "x": 2, "y": 4}, + {"matrix": [9, 1], "x": 3, "y": 4}, - {"x": 17.5, "y": 4}, - {"x": 18.5, "y": 4}, - {"x": 19.5, "y": 4} + {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 6, "y": 4}, + {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5}, + {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25}, + {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 4}, + + {"matrix": [9, 8], "x": 17.5, "y": 4}, + {"matrix": [8, 8], "x": 18.5, "y": 4}, + {"matrix": [9, 9], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/aeboards/ext65/rev1/rev1.c b/keyboards/aeboards/ext65/rev1/rev1.c index c1e81204db..adbae94816 100644 --- a/keyboards/aeboards/ext65/rev1/rev1.c +++ b/keyboards/aeboards/ext65/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" void keyboard_pre_init_user(void) { // Call the keyboard pre init code. diff --git a/keyboards/aeboards/ext65/rev1/rev1.h b/keyboards/aeboards/ext65/rev1/rev1.h deleted file mode 100644 index fadfef6ddc..0000000000 --- a/keyboards/aeboards/ext65/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define ____ KC_NO - -#define LAYOUT_ext65( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K508, K009, \ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \ - K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \ - K800, K900, K801, K901, K802, K902, K803, K805, K906, K807, K908, K808, K909 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, ____ }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \ - { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \ - { K800, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \ - { K900, K901, K902, ____, ____, ____, K906, ____, K908, K909 } \ -} diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json index 159f8e8787..bfdcae090e 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -26,103 +26,104 @@ "layouts": { "LAYOUT_ext65": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - {"x": 17.5, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0}, + {"matrix": [1, 7], "x": 15.5, "y": 0}, + {"matrix": [0, 8], "x": 16.5, "y": 0}, + {"matrix": [1, 8], "x": 17.5, "y": 0}, + {"matrix": [5, 8], "x": 18.5, "y": 0}, + {"matrix": [0, 9], "x": 19.5, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, - {"x": 4.5, "y": 1, "w": 1.5}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "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}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1, "w": 1.5}, - {"x": 19.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [2, 5], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12, "y": 1}, + {"matrix": [2, 6], "x": 13, "y": 1}, + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [2, 7], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [2, 8], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, - {"x": 4.5, "y": 2, "w": 1.75}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "y": 2}, - {"x": 8.25, "y": 2}, - {"x": 9.25, "y": 2}, - {"x": 10.25, "y": 2}, - {"x": 11.25, "y": 2}, - {"x": 12.25, "y": 2}, - {"x": 13.25, "y": 2}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2}, - {"x": 16.25, "y": 2}, - {"x": 17.25, "y": 2, "w": 2.25}, - {"x": 19.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2}, + {"matrix": [5, 6], "x": 14.25, "y": 2}, + {"matrix": [4, 7], "x": 15.25, "y": 2}, + {"matrix": [5, 7], "x": 16.25, "y": 2}, + {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25}, + {"matrix": [4, 9], "x": 19.5, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, - {"x": 4.5, "y": 3, "w": 2.25}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 3}, - {"x": 14.75, "y": 3}, - {"x": 15.75, "y": 3}, - {"x": 16.75, "y": 3, "w": 1.75}, - {"x": 18.5, "y": 3}, - {"x": 19.5, "y": 3}, + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [7, 2], "x": 6.75, "y": 3}, + {"matrix": [6, 3], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [6, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 3}, + {"matrix": [6, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 5], "x": 12.75, "y": 3}, + {"matrix": [6, 6], "x": 13.75, "y": 3}, + {"matrix": [7, 6], "x": 14.75, "y": 3}, + {"matrix": [6, 7], "x": 15.75, "y": 3}, + {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75}, + {"matrix": [6, 8], "x": 18.5, "y": 3}, + {"matrix": [7, 9], "x": 19.5, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4.5, "y": 4, "w": 1.5}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4, "w": 1.5}, - {"x": 8.5, "y": 4, "w": 6.25}, - {"x": 14.75, "y": 4, "w": 1.25}, - {"x": 16, "y": 4}, + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [8, 1], "x": 2, "y": 4}, + {"matrix": [9, 1], "x": 3, "y": 4}, - {"x": 17.5, "y": 4}, - {"x": 18.5, "y": 4}, - {"x": 19.5, "y": 4} + {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 6, "y": 4}, + {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5}, + {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25}, + {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 4}, + + {"matrix": [9, 8], "x": 17.5, "y": 4}, + {"matrix": [8, 8], "x": 18.5, "y": 4}, + {"matrix": [9, 9], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c index 998a91ccfc..6fe2d469dc 100644 --- a/keyboards/aeboards/ext65/rev2/rev2.c +++ b/keyboards/aeboards/ext65/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev2.h" +#include "quantum.h" // Tested and verified working on ext65rev2 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } diff --git a/keyboards/aeboards/ext65/rev2/rev2.h b/keyboards/aeboards/ext65/rev2/rev2.h deleted file mode 100644 index fadfef6ddc..0000000000 --- a/keyboards/aeboards/ext65/rev2/rev2.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define ____ KC_NO - -#define LAYOUT_ext65( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K508, K009, \ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \ - K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \ - K800, K900, K801, K901, K802, K902, K803, K805, K906, K807, K908, K808, K909 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, ____ }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \ - { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \ - { K800, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \ - { K900, K901, K902, ____, ____, ____, K906, ____, K908, K909 } \ -} diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json index 90d59a943c..bb507545a0 100644 --- a/keyboards/aeboards/ext65/rev3/info.json +++ b/keyboards/aeboards/ext65/rev3/info.json @@ -22,425 +22,99 @@ "layouts": { "LAYOUT_ext65_hotswap": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "label": "Esc", - "x": 4.5, - "y": 0 - }, - { - "label": "!", - "x": 5.5, - "y": 0 - }, - { - "label": "@", - "x": 6.5, - "y": 0 - }, - { - "label": "#", - "x": 7.5, - "y": 0 - }, - { - "label": "$", - "x": 8.5, - "y": 0 - }, - { - "label": "%", - "x": 9.5, - "y": 0 - }, - { - "label": "^", - "x": 10.5, - "y": 0 - }, - { - "label": "&", - "x": 11.5, - "y": 0 - }, - { - "label": "*", - "x": 12.5, - "y": 0 - }, - { - "label": "(", - "x": 13.5, - "y": 0 - }, - { - "label": ")", - "x": 14.5, - "y": 0 - }, - { - "label": "_", - "x": 15.5, - "y": 0 - }, - { - "label": "+", - "x": 16.5, - "y": 0 - }, - { - "label": "Backspace", - "x": 17.5, - "y": 0, - "w": 2 - }, - { - "label": "Home", - "x": 19.5, - "y": 0 - }, - { - "x": 0, - "y": 1, - "h": 2 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "label": "Tab", - "x": 4.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 6, - "y": 1 - }, - { - "label": "W", - "x": 7, - "y": 1 - }, - { - "label": "E", - "x": 8, - "y": 1 - }, - { - "label": "R", - "x": 9, - "y": 1 - }, - { - "label": "T", - "x": 10, - "y": 1 - }, - { - "label": "Y", - "x": 11, - "y": 1 - }, - { - "label": "U", - "x": 12, - "y": 1 - }, - { - "label": "I", - "x": 13, - "y": 1 - }, - { - "label": "O", - "x": 14, - "y": 1 - }, - { - "label": "P", - "x": 15, - "y": 1 - }, - { - "label": "{", - "x": 16, - "y": 1 - }, - { - "label": "}", - "x": 17, - "y": 1 - }, - { - "label": "|", - "x": 18, - "y": 1, - "w": 1.5 - }, - { - "label": "PgUp", - "x": 19.5, - "y": 1 - }, - { - "x": 1, - "y": 2 - }, - { - "x": 2, - "y": 2 - }, - { - "x": 3, - "y": 2 - }, - { - "label": "Caps Lock", - "x": 4.5, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 6.25, - "y": 2 - }, - { - "label": "S", - "x": 7.25, - "y": 2 - }, - { - "label": "D", - "x": 8.25, - "y": 2 - }, - { - "label": "F", - "x": 9.25, - "y": 2 - }, - { - "label": "G", - "x": 10.25, - "y": 2 - }, - { - "label": "H", - "x": 11.25, - "y": 2 - }, - { - "label": "J", - "x": 12.25, - "y": 2 - }, - { - "label": "K", - "x": 13.25, - "y": 2 - }, - { - "label": "L", - "x": 14.25, - "y": 2 - }, - { - "label": ":", - "x": 15.25, - "y": 2 - }, - { - "label": "\"", - "x": 16.25, - "y": 2 - }, - { - "label": "Enter", - "x": 17.25, - "y": 2, - "w": 2.25 - }, - { - "label": "PgDn", - "x": 19.5, - "y": 2 - }, - { - "x": 0, - "y": 3, - "h": 2 - }, - { - "x": 1, - "y": 3 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "label": "Shift", - "x": 4.5, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 6.75, - "y": 3 - }, - { - "label": "X", - "x": 7.75, - "y": 3 - }, - { - "label": "C", - "x": 8.75, - "y": 3 - }, - { - "label": "V", - "x": 9.75, - "y": 3 - }, - { - "label": "B", - "x": 10.75, - "y": 3 - }, - { - "label": "N", - "x": 11.75, - "y": 3 - }, - { - "label": "M", - "x": 12.75, - "y": 3 - }, - { - "label": "<", - "x": 13.75, - "y": 3 - }, - { - "label": ">", - "x": 14.75, - "y": 3 - }, - { - "label": "?", - "x": 15.75, - "y": 3 - }, - { - "label": "Shift", - "x": 16.75, - "y": 3, - "w": 1.75 - }, - { - "label": "\u2191", - "x": 18.5, - "y": 3 - }, - { - "label": "End", - "x": 19.5, - "y": 3 - }, - { - "x": 1, - "y": 4 - }, - { - "x": 2, - "y": 4, - "w": 2 - }, - { - "label": "Ctrl", - "x": 4.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 5.75, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 7, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "x": 8.25, - "y": 4, - "w": 6.25 - }, - { - "label": "Alt", - "x": 14.5, - "y": 4, - "w": 1.5 - }, - { - "label": "Fn", - "x": 16, - "y": 4, - "w": 1.5 - }, - { - "label": "\u2190", - "x": 17.5, - "y": 4 - }, - { - "label": "\u2193", - "x": 18.5, - "y": 4 - }, - { - "label": "\u2192", - "x": 19.5, - "y": 4 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0}, + {"matrix": [1, 7], "x": 15.5, "y": 0}, + {"matrix": [0, 8], "x": 16.5, "y": 0}, + {"matrix": [1, 8], "x": 17.5, "y": 0, "w": 2}, + {"matrix": [0, 9], "x": 19.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "h": 2}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + + {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [2, 5], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12, "y": 1}, + {"matrix": [2, 6], "x": 13, "y": 1}, + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [2, 7], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [2, 8], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1}, + + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + + {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2}, + {"matrix": [5, 6], "x": 14.25, "y": 2}, + {"matrix": [4, 7], "x": 15.25, "y": 2}, + {"matrix": [5, 7], "x": 16.25, "y": 2}, + {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25}, + {"matrix": [4, 9], "x": 19.5, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "h": 2}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, + + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [7, 2], "x": 6.75, "y": 3}, + {"matrix": [6, 3], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [6, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 3}, + {"matrix": [6, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 5], "x": 12.75, "y": 3}, + {"matrix": [6, 6], "x": 13.75, "y": 3}, + {"matrix": [7, 6], "x": 14.75, "y": 3}, + {"matrix": [6, 7], "x": 15.75, "y": 3}, + {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75}, + {"matrix": [6, 8], "x": 18.5, "y": 3}, + {"matrix": [7, 9], "x": 19.5, "y": 3}, + + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [8, 1], "x": 2, "y": 4, "w": 2}, + + {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 5.75, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 8.25, "y": 4, "w": 6.25}, + {"matrix": [9, 6], "x": 14.5, "y": 4, "w": 1.5}, + {"matrix": [8, 7], "x": 16, "y": 4, "w": 1.5}, + {"matrix": [9, 8], "x": 17.5, "y": 4}, + {"matrix": [8, 8], "x": 18.5, "y": 4}, + {"matrix": [9, 9], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/aeboards/ext65/rev3/rev3.c b/keyboards/aeboards/ext65/rev3/rev3.c index 14523afe35..b5e27756ec 100644 --- a/keyboards/aeboards/ext65/rev3/rev3.c +++ b/keyboards/aeboards/ext65/rev3/rev3.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev3.h" +#include "quantum.h" // Tested and verified working on EXT65 Rev3 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } diff --git a/keyboards/aeboards/ext65/rev3/rev3.h b/keyboards/aeboards/ext65/rev3/rev3.h deleted file mode 100644 index 7f1525bb40..0000000000 --- a/keyboards/aeboards/ext65/rev3/rev3.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define ____ KC_NO - -#define LAYOUT_ext65_hotswap( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009, \ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \ - K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \ - K900, K801, K802, K902, K803, K805, K906, K807, K908, K808, K909 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \ - { ____, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, ____, ____ }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \ - { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \ - { ____, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \ - { K900, ____, K902, ____, ____, ____, K906, ____, K908, K909 } \ -} -- cgit v1.2.3