Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)

7 files changed, 25 insertions, 22 deletions

diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json
index 2189f6bd1c..682038c681 100644
--- a/keyboards/mechwild/bde/info.json
+++ b/keyboards/mechwild/bde/info.json
@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "MechWild BDE Rev2",
+    "manufacturer": "MechWild",
     "url": "mechwild.com",
     "maintainer": "kylemccreery",
+    "usb": {
+        "vid": "0x6D77"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mechwild/bde/lefty/config.h b/keyboards/mechwild/bde/lefty/config.h
index 082295ef7c..12ce331877 100644
--- a/keyboards/mechwild/bde/lefty/config.h
+++ b/keyboards/mechwild/bde/lefty/config.h
@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D77 // mw = "MechWild"
-#define PRODUCT_ID      0x1701
-#define DEVICE_VER      0x0203
-#define MANUFACTURER    MechWild
-#define PRODUCT         BDE Lefty
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 14
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json
new file mode 100644
index 0000000000..293df18387
--- /dev/null
+++ b/keyboards/mechwild/bde/lefty/info.json
@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDE Lefty",
+    "usb": {
+        "pid": "0x1701",
+        "device_version": "2.0.3"
+    }
+}
diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h
index 0f290ecc33..4c3f2b06ce 100644
--- a/keyboards/mechwild/bde/rev2/config.h
+++ b/keyboards/mechwild/bde/rev2/config.h
@@ -19,13 +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       0x6D77 // mw = "MechWild"
-#define PRODUCT_ID      0x170A
-#define DEVICE_VER      0x0101
-#define MANUFACTURER    MechWild
-#define PRODUCT         BDE Rev2
-
 /* Key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 7
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json
new file mode 100644
index 0000000000..9c9aa3e2c2
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDE Rev2",
+    "usb": {
+        "pid": "0x170A",
+        "device_version": "1.0.1"
+    }
+}
diff --git a/keyboards/mechwild/bde/righty/config.h b/keyboards/mechwild/bde/righty/config.h
index 1764520b13..12220ca9d4 100644
--- a/keyboards/mechwild/bde/righty/config.h
+++ b/keyboards/mechwild/bde/righty/config.h
@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D77 // mw = "MechWild"
-#define PRODUCT_ID      0x1702
-#define DEVICE_VER      0x0203
-#define MANUFACTURER    MechWild
-#define PRODUCT         BDE Righty
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 14
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json
new file mode 100644
index 0000000000..93161bfcec
--- /dev/null
+++ b/keyboards/mechwild/bde/righty/info.json
@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDE Righty",
+    "usb": {
+        "pid": "0x1702",
+        "device_version": "2.0.3"
+    }
+}