From 17176daf26ae17b8ae54312217555f1bfed782c1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 4 Aug 2022 11:35:08 +1000
Subject: Move keyboard USB IDs and strings to data driven: T (#17899)

---
 keyboards/treasure/type9/config.h    | 7 -------
 keyboards/treasure/type9/info.json   | 6 ++++++
 keyboards/treasure/type9s2/config.h  | 7 -------
 keyboards/treasure/type9s2/info.json | 8 +++++++-
 4 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'keyboards/treasure')

diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h
index 86734a7fd8..99e0148114 100644
--- a/keyboards/treasure/type9/config.h
+++ b/keyboards/treasure/type9/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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Treasure
-#define PRODUCT         Type 9
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json
index 2f8b7c82b2..4f97080c00 100644
--- a/keyboards/treasure/type9/info.json
+++ b/keyboards/treasure/type9/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Type-9",
+  "manufacturer": "Treasure",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
diff --git a/keyboards/treasure/type9s2/config.h b/keyboards/treasure/type9s2/config.h
index a9d73f961f..ae68a415ea 100644
--- a/keyboards/treasure/type9s2/config.h
+++ b/keyboards/treasure/type9s2/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5452
-#define PRODUCT_ID      0x5492
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TREASURE
-#define PRODUCT         TYPE-9 Series II
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json
index 68b47f46ef..388b202af0 100644
--- a/keyboards/treasure/type9s2/info.json
+++ b/keyboards/treasure/type9s2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Treasure TYPE-9 Series II",
+    "keyboard_name": "Type-9 Series II",
+    "manufacturer": "Treasure",
     "url": "http://treasuretypes.com",
     "maintainer": "Treasure",
+    "usb": {
+        "vid": "0x5452",
+        "pid": "0x5492",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
-- 
cgit v1.2.3