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.json5
-rw-r--r--keyboards/malevolti/lyra/rev1/rev1.c19
-rw-r--r--keyboards/malevolti/lyra/rev1/rev1.h2
6 files changed, 7 insertions, 50 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..2cc916c7cf 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"
},
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
index 81b862c5c6..021350f106 100644
--- a/keyboards/malevolti/lyra/rev1/rev1.h
+++ b/keyboards/malevolti/lyra/rev1/rev1.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "lyra.h"
+#include "quantum.h"
#define LAYOUT( \