From 394cf7c41e24f966d38b9c8cc9bbc2faca905e2a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 29 Jul 2022 22:49:01 +1000
Subject: Move keyboard USB IDs and strings to data driven: J (#17837)

---
 keyboards/jacky_studio/s7_elephant/rev1/config.h  | 7 -------
 keyboards/jacky_studio/s7_elephant/rev1/info.json | 8 +++++++-
 keyboards/jacky_studio/s7_elephant/rev2/config.h  | 7 -------
 keyboards/jacky_studio/s7_elephant/rev2/info.json | 6 ++++++
 4 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'keyboards/jacky_studio/s7_elephant')

diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index 76c4c7d406..96f8d57ede 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    jacky
-#define PRODUCT         S7 Elephant
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index b47f326456..b1621eecd7 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "S7 Elephant",
+    "keyboard_name": "S7 Elephant Rev1",
+    "manufacturer": "Jacky",
     "url": "https://geekhack.org/index.php?topic=96434.0",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xA13B",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 246479dd37..41a8c77f9d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID      0x0008 // 8 for S7++
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Jacky
-#define PRODUCT         Jacky S7 Elephant Rev 2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index e3be4afe38..c9f45edca9 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "S7 Elephant Rev2",
+    "manufacturer": "Jacky",
     "url": "https://geekhack.org/index.php?topic=103148.0",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xA13B",
+        "pid": "0x0008",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-- 
cgit v1.2.3