Move keyboard USB IDs and strings to data driven: D (#17814)

6 files changed, 19 insertions, 24 deletions

diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index 7ce2de42b8..ec4dce5f54 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/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    0x4454 // DT
-#define PRODUCT_ID   0x4973 // Is
-#define DEVICE_VER   0x0002
-#define MANUFACTURER DTIsaac
-#define PRODUCT      CG108
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 11
diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json
index 0ecc1764f6..eb6189088c 100644
--- a/keyboards/dtisaac/cg108/info.json
+++ b/keyboards/dtisaac/cg108/info.json
@@ -1,9 +1,13 @@
 {
     "keyboard_name": "CG108",
+    "manufacturer": "DTIsaac",
     "url": "",
     "maintainer": "daotakisaac",
-    "width": 22.5,
-    "height": 6.5,
+    "usb": {
+        "vid": "0x4454",
+        "pid": "0x4973",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 8d61f61128..ccb3f74867 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/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    0x4454 // DT
-#define PRODUCT_ID   0x4973 // Is
-#define DEVICE_VER   0x0004
-#define MANUFACTURER DTIsaac
-#define PRODUCT      >_Dosa40
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 2feed40d42..d24975ca8b 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": ">_Dosa40rgb",
+    "keyboard_name": ">_Dosa40",
+    "manufacturer": "DTIsaac",
     "url": "",
     "maintainer": "DTIsaac",
+    "usb": {
+        "vid": "0x4454",
+        "pid": "0x4973",
+        "device_version": "0.0.4"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
index eb1ff71536..71b5baa093 100644
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ b/keyboards/dtisaac/dtisaac01/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    0x4454
-#define PRODUCT_ID   0x4973
-#define DEVICE_VER   0x0001
-#define MANUFACTURER DTIsaac
-#define PRODUCT      dtisaac01
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index eac22cda30..790648d64b 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "dtisaac01",
+    "manufacturer": "DTIsaac",
     "url": "",
     "maintainer": "DTIsaac",
+    "usb": {
+        "vid": "0x4454",
+        "pid": "0x4973",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [