summaryrefslogtreecommitdiff
path: root/keyboards/malevolti
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/malevolti')
-rw-r--r--keyboards/malevolti/lyra/config.h19
-rw-r--r--keyboards/malevolti/lyra/keymaps/default/config.h2
-rw-r--r--keyboards/malevolti/lyra/keymaps/via/config.h2
-rw-r--r--keyboards/malevolti/lyra/rev1/config.h14
-rw-r--r--keyboards/malevolti/lyra/rev1/info.json5
-rw-r--r--keyboards/malevolti/lyra/rev1/rules.mk6
-rw-r--r--keyboards/malevolti/superlyra/config.h19
-rw-r--r--keyboards/malevolti/superlyra/keymaps/default/config.h2
-rw-r--r--keyboards/malevolti/superlyra/keymaps/via/config.h2
-rw-r--r--keyboards/malevolti/superlyra/rev1/config.h10
-rw-r--r--keyboards/malevolti/superlyra/rev1/info.json2
-rw-r--r--keyboards/malevolti/superlyra/rev1/rules.mk6
12 files changed, 11 insertions, 78 deletions
diff --git a/keyboards/malevolti/lyra/config.h b/keyboards/malevolti/lyra/config.h
deleted file mode 100644
index a4606507ce..0000000000
--- a/keyboards/malevolti/lyra/config.h
+++ /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/>.
- */
-#pragma once
-
-#include "config_common.h"
-
diff --git a/keyboards/malevolti/lyra/keymaps/default/config.h b/keyboards/malevolti/lyra/keymaps/default/config.h
index 9c4bacd36d..3e8db641e1 100644
--- a/keyboards/malevolti/lyra/keymaps/default/config.h
+++ b/keyboards/malevolti/lyra/keymaps/default/config.h
@@ -26,5 +26,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
// #define EE_HANDS
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/keymaps/via/config.h b/keyboards/malevolti/lyra/keymaps/via/config.h
index 9c4bacd36d..3e8db641e1 100644
--- a/keyboards/malevolti/lyra/keymaps/via/config.h
+++ b/keyboards/malevolti/lyra/keymaps/via/config.h
@@ -26,5 +26,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
// #define EE_HANDS
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
index 5e4e98d1ff..113174ff1e 100644
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -15,11 +15,6 @@
*/
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
@@ -27,12 +22,3 @@
#define DIODE_DIRECTION COL2ROW
#define TAPPING_TERM 100
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* communication between sides */
-#define SOFT_SERIAL_PIN D2
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 02c1a2421b..572e5c118d 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"
},
+ "split": {
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk
index 87f331ab6c..78e2bfea04 100644
--- a/keyboards/malevolti/lyra/rev1/rules.mk
+++ b/keyboards/malevolti/lyra/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/malevolti/superlyra/config.h b/keyboards/malevolti/superlyra/config.h
deleted file mode 100644
index a4606507ce..0000000000
--- a/keyboards/malevolti/superlyra/config.h
+++ /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/>.
- */
-#pragma once
-
-#include "config_common.h"
-
diff --git a/keyboards/malevolti/superlyra/keymaps/default/config.h b/keyboards/malevolti/superlyra/keymaps/default/config.h
index bbdf47463f..7f20fea8be 100644
--- a/keyboards/malevolti/superlyra/keymaps/default/config.h
+++ b/keyboards/malevolti/superlyra/keymaps/default/config.h
@@ -22,5 +22,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/superlyra/keymaps/via/config.h b/keyboards/malevolti/superlyra/keymaps/via/config.h
index bbdf47463f..7f20fea8be 100644
--- a/keyboards/malevolti/superlyra/keymaps/via/config.h
+++ b/keyboards/malevolti/superlyra/keymaps/via/config.h
@@ -22,5 +22,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
index 6aebaf28b1..4a56b96808 100644
--- a/keyboards/malevolti/superlyra/rev1/config.h
+++ b/keyboards/malevolti/superlyra/rev1/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 18
-
// 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 }
@@ -26,9 +22,3 @@
#define DIODE_DIRECTION COL2ROW
#define TAPPING_TERM 100
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
index 5baf958117..c45b496c54 100644
--- a/keyboards/malevolti/superlyra/rev1/info.json
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -8,6 +8,8 @@
"pid": "0x4C53",
"device_version": "30.3.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/malevolti/superlyra/rev1/rules.mk b/keyboards/malevolti/superlyra/rev1/rules.mk
index e3012714c8..7087b97cf1 100644
--- a/keyboards/malevolti/superlyra/rev1/rules.mk
+++ b/keyboards/malevolti/superlyra/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#