From 1b92c204c10594fce6a715710c277a748a4fdc68 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 3 Aug 2022 17:03:47 +1000
Subject: Move keyboard USB IDs and strings to data driven: K (#17846)

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/kprepublic/bm60hsrgb/rev1/config.h  | 7 -------
 keyboards/kprepublic/bm60hsrgb/rev1/info.json | 6 ++++++
 keyboards/kprepublic/bm60hsrgb/rev2/config.h  | 7 -------
 keyboards/kprepublic/bm60hsrgb/rev2/info.json | 8 +++++++-
 4 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'keyboards/kprepublic/bm60hsrgb')

diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index b8f002dca6..f1a160730c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/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       0x4B50 // "KP"
-#define PRODUCT_ID      0xEF8C
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KP Republic
-#define PRODUCT         BM60HSRGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index a5fb20a008..4c1db804bd 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "BM60HSRGB",
+    "manufacturer": "KP Republic",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B50",
+        "pid": "0xEF8C",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
       "LAYOUT": "LAYOUT_60_ansi_arrow"
     },
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index d8e7501b22..7a1b051f83 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B50
-#define PRODUCT_ID      0x1121
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    KP Republic
-#define PRODUCT         BM60V2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 7cbd7fb4f7..af88dc88b6 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "bm60v2",
+    "keyboard_name": "BM60V2",
+    "manufacturer": "KP Republic",
     "url": "",
     "maintainer": "bdtc123",
+    "usb": {
+        "vid": "0x4B50",
+        "pid": "0x1121",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_60_ansi_arrow": {
             "layout": [
-- 
cgit v1.2.3