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/meletrix/zoom65/config.h       | 7 -------
 keyboards/meletrix/zoom65/info.json      | 6 ++++++
 keyboards/meletrix/zoom65_lite/config.h  | 7 -------
 keyboards/meletrix/zoom65_lite/info.json | 6 ++++++
 keyboards/meletrix/zoom87/config.h       | 7 -------
 keyboards/meletrix/zoom87/info.json      | 6 ++++++
 6 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'keyboards/meletrix')

diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h
index 6d6f6d18eb..d3a0a2f3b0 100644
--- a/keyboards/meletrix/zoom65/config.h
+++ b/keyboards/meletrix/zoom65/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x806B
-#define PRODUCT_ID      0x0004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    meletrix
-#define PRODUCT         zoom65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json
index 8cc7dce8c3..ea128402e9 100644
--- a/keyboards/meletrix/zoom65/info.json
+++ b/keyboards/meletrix/zoom65/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "zoom65",
+    "manufacturer": "meletrix",
     "url": "https://zoom65.com/",
     "maintainer": "spbgzh",
+    "usb": {
+        "vid": "0x806B",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h
index 1f98a4dfda..d3a0a2f3b0 100644
--- a/keyboards/meletrix/zoom65_lite/config.h
+++ b/keyboards/meletrix/zoom65_lite/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x806C
-#define PRODUCT_ID      0x0005
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    meletrix
-#define PRODUCT         zoom65_lite
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json
index 5bfddbd095..aa2c141139 100644
--- a/keyboards/meletrix/zoom65_lite/info.json
+++ b/keyboards/meletrix/zoom65_lite/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "zoom65_lite",
+    "manufacturer": "meletrix",
     "url": "https://zoom65.com/",
     "maintainer": "spbgzh",
+    "usb": {
+        "vid": "0x806C",
+        "pid": "0x0005",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index a59bbe1788..89e8cf5611 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x906F
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    meletrix
-#define PRODUCT         zoom87
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json
index f1a41625c3..5d37e84c01 100644
--- a/keyboards/meletrix/zoom87/info.json
+++ b/keyboards/meletrix/zoom87/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "zoom87",
+    "manufacturer": "meletrix",
     "url": "https://zoom65.com/",
     "maintainer": "spbgzh",
+    "usb": {
+        "vid": "0x906F",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_87": "LAYOUT_tkl_f13",
         "LAYOUT_87_split_bs": "LAYOUT_tkl_f13_split_bs",
-- 
cgit v1.2.1