diff options
Diffstat (limited to 'keyboards/aeboards/aegis')
| -rw-r--r-- | keyboards/aeboards/aegis/aegis.c | 17 | ||||
| -rw-r--r-- | keyboards/aeboards/aegis/aegis.h | 43 | ||||
| -rw-r--r-- | keyboards/aeboards/aegis/config.h | 8 | ||||
| -rw-r--r-- | keyboards/aeboards/aegis/info.json | 239 |
4 files changed, 122 insertions, 185 deletions
diff --git a/keyboards/aeboards/aegis/aegis.c b/keyboards/aeboards/aegis/aegis.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/aeboards/aegis/aegis.c +++ /dev/null @@ -1,17 +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 <http://www.gnu.org/licenses/>. - */ - -// Nothing to see here, move along... ;-) 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 <http://www.gnu.org/licenses/>. - */ - -#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/config.h b/keyboards/aeboards/aegis/config.h index edaef2f7b9..8606067a4c 100644 --- a/keyboards/aeboards/aegis/config.h +++ b/keyboards/aeboards/aegis/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 } -#define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json index b3817db452..5fe143318f 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/info.json @@ -8,128 +8,133 @@ "pid": "0x0807", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"], + "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "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} ] } } |