Move keyboard USB IDs and strings to data driven: T (#17899)

8 files changed, 28 insertions, 36 deletions

diff --git a/keyboards/tkc/candybar/lefty/config.h b/keyboards/tkc/candybar/lefty/config.h
index 104ead511a..8762bdf515 100644
--- a/keyboards/tkc/candybar/lefty/config.h
+++ b/keyboards/tkc/candybar/lefty/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x544B //TK
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0006
-#define MANUFACTURER    The Key Company
-#define PRODUCT         Candybar
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 17
diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json
index 553ce6d021..c902c78cee 100644
--- a/keyboards/tkc/candybar/lefty/info.json
+++ b/keyboards/tkc/candybar/lefty/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TKC Candybar",
+    "keyboard_name": "Candybar",
+    "manufacturer": "The Key Company",
     "url": "",
     "maintainer": "terrymathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0003",
+        "device_version": "0.0.6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/tkc/candybar/lefty_r3/config.h b/keyboards/tkc/candybar/lefty_r3/config.h
index 9ce16dd731..ccf635a7ce 100644
--- a/keyboards/tkc/candybar/lefty_r3/config.h
+++ b/keyboards/tkc/candybar/lefty_r3/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x544B //TK
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0006
-#define MANUFACTURER    The Key Company
-#define PRODUCT         Candybar
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 17
diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json
index 1ef3dcd54a..c902c78cee 100644
--- a/keyboards/tkc/candybar/lefty_r3/info.json
+++ b/keyboards/tkc/candybar/lefty_r3/info.json
@@ -1,9 +1,13 @@
 {
-    "keyboard_name": "TKC Candybar",
+    "keyboard_name": "Candybar",
+    "manufacturer": "The Key Company",
     "url": "",
     "maintainer": "terrymathews",
-    "width": 17,
-    "height": 4,
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0003",
+        "device_version": "0.0.6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/tkc/candybar/righty/config.h b/keyboards/tkc/candybar/righty/config.h
index dcbe840c8e..8762bdf515 100644
--- a/keyboards/tkc/candybar/righty/config.h
+++ b/keyboards/tkc/candybar/righty/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x544B //TK
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0006
-#define MANUFACTURER    The Key Company
-#define PRODUCT         Candybar
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 17
diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json
index 8e54afb431..4dde92d27f 100644
--- a/keyboards/tkc/candybar/righty/info.json
+++ b/keyboards/tkc/candybar/righty/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TKC Candybar",
+    "keyboard_name": "Candybar",
+    "manufacturer": "The Key Company",
     "url": "",
     "maintainer": "terrymathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0002",
+        "device_version": "0.0.6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/tkc/candybar/righty_r3/config.h b/keyboards/tkc/candybar/righty_r3/config.h
index 0c8604a9ac..fd922f0881 100644
--- a/keyboards/tkc/candybar/righty_r3/config.h
+++ b/keyboards/tkc/candybar/righty_r3/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x544B //TK
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0006
-#define MANUFACTURER    The Key Company
-#define PRODUCT         Candybar
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 17
diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json
index 81dc4f8ec5..4dde92d27f 100644
--- a/keyboards/tkc/candybar/righty_r3/info.json
+++ b/keyboards/tkc/candybar/righty_r3/info.json
@@ -1,9 +1,13 @@
 {
-    "keyboard_name": "TKC Candybar",
+    "keyboard_name": "Candybar",
+    "manufacturer": "The Key Company",
     "url": "",
     "maintainer": "terrymathews",
-    "width": 17,
-    "height": 4,
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0002",
+        "device_version": "0.0.6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [