diff options
Diffstat (limited to 'keyboards/malevolti/superlyra')
-rw-r--r-- | keyboards/malevolti/superlyra/rev1/config.h | 6 | ||||
-rw-r--r-- | keyboards/malevolti/superlyra/rev1/info.json | 187 | ||||
-rw-r--r-- | keyboards/malevolti/superlyra/rev1/rev1.c | 17 | ||||
-rw-r--r-- | keyboards/malevolti/superlyra/rev1/rev1.h | 34 | ||||
-rw-r--r-- | keyboards/malevolti/superlyra/superlyra.c | 17 | ||||
-rw-r--r-- | keyboards/malevolti/superlyra/superlyra.h | 23 |
6 files changed, 96 insertions, 188 deletions
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h index 4a56b96808..cffc2e9ff2 100644 --- a/keyboards/malevolti/superlyra/rev1/config.h +++ b/keyboards/malevolti/superlyra/rev1/config.h @@ -15,10 +15,4 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json index c45b496c54..59cd50af42 100644 --- a/keyboards/malevolti/superlyra/rev1/info.json +++ b/keyboards/malevolti/superlyra/rev1/info.json @@ -8,116 +8,121 @@ "pid": "0x4C53", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0.3 }, - { "x": 1, "y": 0.4 }, - { "x": 2, "y": 0.3 }, - { "x": 3, "y": 0.1 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0.1 }, - { "x": 6, "y": 0.25 }, + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.3}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, + + {"matrix": [0, 7], "x": 8, "y": 0.25}, + {"matrix": [0, 8], "x": 9, "y": 0.25}, + {"matrix": [0, 9], "x": 10, "y": 0.25}, + {"matrix": [0, 10], "x": 11, "y": 0.25}, - { "x": 8, "y": 0.25 }, - { "x": 9, "y": 0.25 }, - { "x": 10, "y": 0.25 }, - { "x": 11, "y": 0.25 }, + {"matrix": [0, 11], "x": 13, "y": 0.25}, + {"matrix": [0, 12], "x": 14, "y": 0.1}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0.1}, + {"matrix": [0, 15], "x": 17, "y": 0.3}, + {"matrix": [0, 16], "x": 18, "y": 0.4}, + {"matrix": [0, 17], "x": 19, "y": 0.3}, - { "x": 13, "y": 0.25 }, - { "x": 14, "y": 0.1 }, - { "x": 15, "y": 0 }, - { "x": 16, "y": 0.1 }, - { "x": 17, "y": 0.3 }, - { "x": 18, "y": 0.4 }, - { "x": 19, "y": 0.3 }, + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.3}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, - { "x": 0, "y": 1.3 }, - { "x": 1, "y": 1.4 }, - { "x": 2, "y": 1.3 }, - { "x": 3, "y": 1.1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1.1 }, - { "x": 6, "y": 1.25 }, + {"matrix": [1, 7], "x": 8, "y": 1.25}, + {"matrix": [1, 8], "x": 9, "y": 1.25}, + {"matrix": [1, 9], "x": 10, "y": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 1.25}, - { "x": 8, "y": 1.25 }, - { "x": 9, "y": 1.25 }, - { "x": 10, "y": 1.25 }, - { "x": 11, "y": 1.25 }, + {"matrix": [1, 11], "x": 13, "y": 1.25}, + {"matrix": [1, 12], "x": 14, "y": 1.1}, + {"matrix": [1, 13], "x": 15, "y": 1}, + {"matrix": [1, 14], "x": 16, "y": 1.1}, + {"matrix": [1, 15], "x": 17, "y": 1.3}, + {"matrix": [1, 16], "x": 18, "y": 1.4}, + {"matrix": [1, 17], "x": 19, "y": 1.3}, - { "x": 13, "y": 1.25 }, - { "x": 14, "y": 1.1 }, - { "x": 15, "y": 1 }, - { "x": 16, "y": 1.1 }, - { "x": 17, "y": 1.3 }, - { "x": 18, "y": 1.4 }, - { "x": 19, "y": 1.3 }, + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.3}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, - { "x": 0, "y": 2.3 }, - { "x": 1, "y": 2.4 }, - { "x": 2, "y": 2.3 }, - { "x": 3, "y": 2.1 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2.1 }, - { "x": 6, "y": 2.25 }, + {"matrix": [2, 7], "x": 8, "y": 2.25}, + {"matrix": [2, 8], "x": 9, "y": 2.25}, + {"matrix": [2, 9], "x": 10, "y": 2.25}, + {"matrix": [2, 10], "x": 11, "y": 2.25}, - { "x": 8, "y": 2.25 }, - { "x": 9, "y": 2.25 }, - { "x": 10, "y": 2.25 }, - { "x": 11, "y": 2.25 }, + {"matrix": [2, 11], "x": 13, "y": 2.25}, + {"matrix": [2, 12], "x": 14, "y": 2.1}, + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [2, 14], "x": 16, "y": 2.1}, + {"matrix": [2, 15], "x": 17, "y": 2.3}, + {"matrix": [2, 16], "x": 18, "y": 2.4}, + {"matrix": [2, 17], "x": 19, "y": 2.3}, - { "x": 13, "y": 2.25 }, - { "x": 14, "y": 2.1 }, - { "x": 15, "y": 2 }, - { "x": 16, "y": 2.1 }, - { "x": 17, "y": 2.3 }, - { "x": 18, "y": 2.4 }, - { "x": 19, "y": 2.3 }, + {"matrix": [3, 0], "x": 0, "y": 3.3}, + {"matrix": [3, 1], "x": 1, "y": 3.4}, + {"matrix": [3, 2], "x": 2, "y": 3.3}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.25}, - { "x": 0, "y": 3.3 }, - { "x": 1, "y": 3.4 }, - { "x": 2, "y": 3.3 }, - { "x": 3, "y": 3.1 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3.1 }, - { "x": 6, "y": 3.25 }, + {"matrix": [3, 7], "x": 8, "y": 3.25}, + {"matrix": [3, 8], "x": 9, "y": 3.25}, + {"matrix": [3, 9], "x": 10, "y": 3.25}, + {"matrix": [3, 10], "x": 11, "y": 3.25}, - { "x": 8, "y": 3.25 }, - { "x": 9, "y": 3.25 }, - { "x": 10, "y": 3.25 }, - { "x": 11, "y": 3.25 }, + {"matrix": [3, 11], "x": 13, "y": 3.25}, + {"matrix": [3, 12], "x": 14, "y": 3.1}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [3, 14], "x": 16, "y": 3.1}, + {"matrix": [3, 15], "x": 17, "y": 3.3}, + {"matrix": [3, 16], "x": 18, "y": 3.4}, + {"matrix": [3, 17], "x": 19, "y": 3.3}, - { "x": 13, "y": 3.25 }, - { "x": 14, "y": 3.1 }, - { "x": 15, "y": 3 }, - { "x": 16, "y": 3.1 }, - { "x": 17, "y": 3.3 }, - { "x": 18, "y": 3.4 }, - { "x": 19, "y": 3.3 }, + {"matrix": [4, 0], "x": 0, "y": 4.3}, + {"matrix": [4, 1], "x": 1, "y": 4.4}, + {"matrix": [4, 2], "x": 2, "y": 4.3}, + {"matrix": [4, 3], "x": 3, "y": 4.1}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1.5}, - { "x": 0, "y": 4.3 }, - { "x": 1, "y": 4.4 }, - { "x": 2, "y": 4.3 }, - { "x": 3, "y": 4.1 }, - { "x": 4, "y": 4 }, - { "x": 5, "y": 4.1 }, - { "x": 6.25, "y": 4.5, "w": 1.5 }, + {"matrix": [4, 7], "x": 8, "y": 4.25}, + {"matrix": [4, 8], "x": 9, "y": 4.25}, + {"matrix": [4, 9], "x": 10, "y": 4.25}, + {"matrix": [4, 10], "x": 11, "y": 4.25}, - { "x": 8, "y": 4.25 }, - { "x": 9, "y": 4.25 }, - { "x": 10, "y": 4.25 }, - { "x": 11, "y": 4.25 }, - - { "x": 12.25, "y": 4.5, "w": 1.5 }, - { "x": 14, "y": 4.1 }, - { "x": 15, "y": 4 }, - { "x": 16, "y": 4.1 }, - { "x": 17, "y": 4.3 }, - { "x": 18, "y": 4.4 }, - { "x": 19, "y": 4.3 } + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.5}, + {"matrix": [4, 12], "x": 14, "y": 4.1}, + {"matrix": [4, 13], "x": 15, "y": 4}, + {"matrix": [4, 14], "x": 16, "y": 4.1}, + {"matrix": [4, 15], "x": 17, "y": 4.3}, + {"matrix": [4, 16], "x": 18, "y": 4.4}, + {"matrix": [4, 17], "x": 19, "y": 4.3} ] } } diff --git a/keyboards/malevolti/superlyra/rev1/rev1.c b/keyboards/malevolti/superlyra/rev1/rev1.c deleted file mode 100644 index 35b44aed16..0000000000 --- a/keyboards/malevolti/superlyra/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 Domanic Calleja - * - * 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/>. - */ - -#include "rev1.h" diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h deleted file mode 100644 index 8bc17d1173..0000000000 --- a/keyboards/malevolti/superlyra/rev1/rev1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Domanic Calleja - * - * 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 "superlyra.h" - - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17, \ - K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \ - K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, \ - K54, K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71, \ - K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35 }, \ - { K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53 }, \ - { K54, K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71 }, \ - { K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 } \ - } diff --git a/keyboards/malevolti/superlyra/superlyra.c b/keyboards/malevolti/superlyra/superlyra.c deleted file mode 100644 index 045ec9a097..0000000000 --- a/keyboards/malevolti/superlyra/superlyra.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 Domanic Calleja - * - * 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/>. - */ -#include "superlyra.h" - diff --git a/keyboards/malevolti/superlyra/superlyra.h b/keyboards/malevolti/superlyra/superlyra.h deleted file mode 100644 index b3c0f16daf..0000000000 --- a/keyboards/malevolti/superlyra/superlyra.h +++ /dev/null @@ -1,23 +0,0 @@ - /* Copyright 2021 Domanic Calleja - * - * 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" - - -#ifdef KEYBOARD_malevolti_superlyra_rev1 - #include "rev1.h" -#endif |