From 3da6575e2480d46399be01c21270c57420e0f16d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 3 Aug 2022 17:15:43 +1000
Subject: Move keyboard USB IDs and strings to data driven: M (#17859)

---
 keyboards/malevolti/lyra/rev1/config.h       | 7 -------
 keyboards/malevolti/lyra/rev1/info.json      | 8 +++++++-
 keyboards/malevolti/superlyra/rev1/config.h  | 7 -------
 keyboards/malevolti/superlyra/rev1/info.json | 8 +++++++-
 4 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'keyboards/malevolti')

diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
index 18563f8270..1e0628c6d3 100644
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -15,13 +15,6 @@
   */ 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4443  //DC
-#define PRODUCT_ID      0x4C43  //LC
-#define DEVICE_VER      0x3031  //01
-#define MANUFACTURER    Dom
-#define PRODUCT         Lyra
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 82dd811fd5..02c1a2421b 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "lyra",
+    "keyboard_name": "Lyra",
+    "manufacturer": "Dom",
     "url": "",
     "maintainer": "malevolti",
+    "usb": {
+        "vid": "0x4443",
+        "pid": "0x4C43",
+        "device_version": "30.3.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
index 62c005ff9d..6aebaf28b1 100644
--- a/keyboards/malevolti/superlyra/rev1/config.h
+++ b/keyboards/malevolti/superlyra/rev1/config.h
@@ -15,13 +15,6 @@
   */ 
 #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
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
index c7dce70de5..5baf958117 100644
--- a/keyboards/malevolti/superlyra/rev1/info.json
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "superlyra",
+    "keyboard_name": "SuperLyra",
+    "manufacturer": "Dom",
     "url": "",
     "maintainer": "malevolti",
+    "usb": {
+        "vid": "0x4443",
+        "pid": "0x4C53",
+        "device_version": "30.3.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-- 
cgit v1.2.3