Merge remote-tracking branch 'origin/master' into develop

5 files changed, 231 insertions, 0 deletions

diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
new file mode 100644
index 0000000000..65c41392fa
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/config.h
@@ -0,0 +1,44 @@
+ /* 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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4443  //DC
+#define PRODUCT_ID      0x4C53  //LS
+#define DEVICE_VER      0x3031  //01
+#define MANUFACTURER    Dom
+#define PRODUCT         SuperLyra
+
+/* 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 }
+
+#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
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
new file mode 100644
index 0000000000..c7dce70de5
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "superlyra",
+    "url": "",
+    "maintainer": "malevolti",
+    "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 },				
+
+                { "x": 8, "y": 0.25 },
+                { "x": 9, "y": 0.25 },
+                { "x": 10, "y": 0.25 },
+                { "x": 11, "y": 0.25 },
+
+                { "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 },
+
+                { "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 },
+
+                { "x": 8, "y": 1.25 },
+                { "x": 9, "y": 1.25 },
+                { "x": 10, "y": 1.25 },
+                { "x": 11, "y": 1.25 },
+
+                { "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 },
+
+                { "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 },
+
+                { "x": 8, "y": 2.25 },
+                { "x": 9, "y": 2.25 },
+                { "x": 10, "y": 2.25 },
+                { "x": 11, "y": 2.25 },
+
+                { "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 },
+
+                { "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 },
+
+                { "x": 8, "y": 3.25 },
+                { "x": 9, "y": 3.25 },
+                { "x": 10, "y": 3.25 },
+                { "x": 11, "y": 3.25 },	
+
+                { "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 },
+
+                { "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 },
+
+                { "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 }
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.c b/keyboards/malevolti/superlyra/rev1/rev1.c
new file mode 100644
index 0000000000..35b44aed16
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/rev1.c
@@ -0,0 +1,17 @@
+ /* 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
new file mode 100644
index 0000000000..8bc17d1173
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/rev1.h
@@ -0,0 +1,34 @@
+/* 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/rev1/rules.mk b/keyboards/malevolti/superlyra/rev1/rules.mk
new file mode 100644
index 0000000000..e3012714c8
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LTO_ENABLE = yes