summaryrefslogtreecommitdiff
path: root/keyboards/malevolti/lyra
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/malevolti/lyra')
-rw-r--r--keyboards/malevolti/lyra/lyra.c2
-rw-r--r--keyboards/malevolti/lyra/lyra.h23
-rw-r--r--keyboards/malevolti/lyra/rev1/config.h6
-rw-r--r--keyboards/malevolti/lyra/rev1/info.json145
-rw-r--r--keyboards/malevolti/lyra/rev1/rev1.c19
-rw-r--r--keyboards/malevolti/lyra/rev1/rev1.h39
6 files changed, 76 insertions, 158 deletions
diff --git a/keyboards/malevolti/lyra/lyra.c b/keyboards/malevolti/lyra/lyra.c
index cd8d7c2e8b..0bc9b6b20f 100644
--- a/keyboards/malevolti/lyra/lyra.c
+++ b/keyboards/malevolti/lyra/lyra.c
@@ -13,7 +13,7 @@
* 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 "lyra.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
diff --git a/keyboards/malevolti/lyra/lyra.h b/keyboards/malevolti/lyra/lyra.h
deleted file mode 100644
index 941f292c93..0000000000
--- a/keyboards/malevolti/lyra/lyra.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_lyra_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
index 113174ff1e..38a1a09cd3 100644
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -15,10 +15,4 @@
*/
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 572e5c118d..2b7f8fbd71 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x4C43",
"device_version": "30.3.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -16,85 +21,85 @@
"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},
- {"x": 8, "y": 0.25},
- {"x": 9, "y": 0.1},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0.1},
- {"x": 12, "y": 0.3},
- {"x": 13, "y": 0.4},
- {"x": 14, "y": 0.3},
+ {"matrix": [5, 6], "x": 8, "y": 0.25},
+ {"matrix": [5, 5], "x": 9, "y": 0.1},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0.1},
+ {"matrix": [5, 2], "x": 12, "y": 0.3},
+ {"matrix": [5, 1], "x": 13, "y": 0.4},
+ {"matrix": [5, 0], "x": 14, "y": 0.3},
- {"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, 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": 8, "y": 1.25},
- {"x": 9, "y": 1.1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1.1},
- {"x": 12, "y": 1.3},
- {"x": 13, "y": 1.4},
- {"x": 14, "y": 1.3},
+ {"matrix": [6, 6], "x": 8, "y": 1.25},
+ {"matrix": [6, 5], "x": 9, "y": 1.1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1.1},
+ {"matrix": [6, 2], "x": 12, "y": 1.3},
+ {"matrix": [6, 1], "x": 13, "y": 1.4},
+ {"matrix": [6, 0], "x": 14, "y": 1.3},
- {"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, 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": 8, "y": 2.25},
- {"x": 9, "y": 2.1},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2.1},
- {"x": 12, "y": 2.3},
- {"x": 13, "y": 2.4},
- {"x": 14, "y": 2.3},
+ {"matrix": [7, 6], "x": 8, "y": 2.25},
+ {"matrix": [7, 5], "x": 9, "y": 2.1},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2.1},
+ {"matrix": [7, 2], "x": 12, "y": 2.3},
+ {"matrix": [7, 1], "x": 13, "y": 2.4},
+ {"matrix": [7, 0], "x": 14, "y": 2.3},
- {"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, 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": 8, "y": 3.25},
- {"x": 9, "y": 3.1},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3.1},
- {"x": 12, "y": 3.3},
- {"x": 13, "y": 3.4},
- {"x": 14, "y": 3.3},
+ {"matrix": [8, 6], "x": 8, "y": 3.25},
+ {"matrix": [8, 5], "x": 9, "y": 3.1},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3.1},
+ {"matrix": [8, 2], "x": 12, "y": 3.3},
+ {"matrix": [8, 1], "x": 13, "y": 3.4},
+ {"matrix": [8, 0], "x": 14, "y": 3.3},
- {"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},
+ {"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},
- {"x": 7.75, "y": 4.5},
- {"x": 9, "y": 4.1},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4.1},
- {"x": 12, "y": 4.3},
- {"x": 13, "y": 4.4},
- {"x": 14, "y": 4.3}
+ {"matrix": [9, 6], "x": 7.75, "y": 4.5},
+ {"matrix": [9, 5], "x": 9, "y": 4.1},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4.1},
+ {"matrix": [9, 2], "x": 12, "y": 4.3},
+ {"matrix": [9, 1], "x": 13, "y": 4.4},
+ {"matrix": [9, 0], "x": 14, "y": 4.3}
]
}
}
diff --git a/keyboards/malevolti/lyra/rev1/rev1.c b/keyboards/malevolti/lyra/rev1/rev1.c
deleted file mode 100644
index db31ea975c..0000000000
--- a/keyboards/malevolti/lyra/rev1/rev1.c
+++ /dev/null
@@ -1,19 +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/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h
deleted file mode 100644
index 81b862c5c6..0000000000
--- a/keyboards/malevolti/lyra/rev1/rev1.h
+++ /dev/null
@@ -1,39 +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 "lyra.h"
-
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, R40 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 22:56:25 +0000