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/matthewdias/m3n3van/config.h  | 8 --------
 keyboards/matthewdias/m3n3van/info.json | 6 ++++++
 keyboards/matthewdias/minim/config.h    | 8 --------
 keyboards/matthewdias/minim/info.json   | 6 ++++++
 keyboards/matthewdias/model_v/config.h  | 8 --------
 keyboards/matthewdias/model_v/info.json | 6 ++++++
 keyboards/matthewdias/txuu/config.h     | 8 --------
 keyboards/matthewdias/txuu/info.json    | 6 ++++++
 8 files changed, 24 insertions(+), 32 deletions(-)

(limited to 'keyboards/matthewdias')

diff --git a/keyboards/matthewdias/m3n3van/config.h b/keyboards/matthewdias/m3n3van/config.h
index cef9d8d70a..2d0d1ffc4c 100644
--- a/keyboards/matthewdias/m3n3van/config.h
+++ b/keyboards/matthewdias/m3n3van/config.h
@@ -19,14 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D64
-#define PRODUCT_ID      0x2323
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         m3n3van
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json
index 240c203c29..347868cffb 100644
--- a/keyboards/matthewdias/m3n3van/info.json
+++ b/keyboards/matthewdias/m3n3van/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "m3n3van",
+    "manufacturer": "Matthew Dias",
     "url": "https://github.com/matthewdias/m3n3van/tree/main/rev2",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x2323",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/matthewdias/minim/config.h b/keyboards/matthewdias/minim/config.h
index 9f31ba31cf..db837e3990 100644
--- a/keyboards/matthewdias/minim/config.h
+++ b/keyboards/matthewdias/minim/config.h
@@ -19,14 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xAAAA
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         minim
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14
diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/info.json
index 0ac146b9a2..58d2066bd4 100644
--- a/keyboards/matthewdias/minim/info.json
+++ b/keyboards/matthewdias/minim/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "minim",
+    "manufacturer": "Matthew Dias",
     "url": "https://github.com/matthewdias/minim",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xAAAA",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/matthewdias/model_v/config.h b/keyboards/matthewdias/model_v/config.h
index d1c5dcd81d..a111faa315 100644
--- a/keyboards/matthewdias/model_v/config.h
+++ b/keyboards/matthewdias/model_v/config.h
@@ -19,14 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D64
-#define PRODUCT_ID      0x6D76
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         model-v
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/matthewdias/model_v/info.json b/keyboards/matthewdias/model_v/info.json
index cdb0efd951..0e279d5df4 100644
--- a/keyboards/matthewdias/model_v/info.json
+++ b/keyboards/matthewdias/model_v/info.json
@@ -1,6 +1,12 @@
 {
     "keyboard_name": "model-v",
+    "manufacturer": "Matthew Dias",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x6D76",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split": {
             "layout": [
diff --git a/keyboards/matthewdias/txuu/config.h b/keyboards/matthewdias/txuu/config.h
index f81c300a13..1bc4f33d6d 100644
--- a/keyboards/matthewdias/txuu/config.h
+++ b/keyboards/matthewdias/txuu/config.h
@@ -19,14 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D64
-#define PRODUCT_ID      0x2809
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         txuu
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/matthewdias/txuu/info.json b/keyboards/matthewdias/txuu/info.json
index 20efca6978..c5606388de 100644
--- a/keyboards/matthewdias/txuu/info.json
+++ b/keyboards/matthewdias/txuu/info.json
@@ -1,6 +1,12 @@
 {
     "keyboard_name": "Txuu", 
+    "manufacturer": "Matthew Dias",
     "maintainer": "matthewdias", 
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x2809",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs"
     },
-- 
cgit v1.2.3