Move keyboard USB IDs and strings to data driven: S (#17889)

6 files changed, 18 insertions, 21 deletions

diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index afb8bb858f..07ac871795 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/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       0x7C10
-#define PRODUCT_ID      0x7501
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Studio Kestra
-#define PRODUCT         Bourgeau
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 
diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index a2170cabf6..6b9169ba0a 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Bourgeau",
+    "manufacturer": "Studio Kestra",
     "url": "https://studiokestra.ca/bourgeau/",
     "maintainer": "studiokestra",
+    "usb": {
+        "vid": "0x7C10",
+        "pid": "0x7501",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_75_ansi_rwkl"
     },
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index 1ef4c21e50..beb88e69ab 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/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       0x7C10
-#define PRODUCT_ID      0x6001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Studio Kestra
-#define PRODUCT         Cascade
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 
diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json
index 5bbc25f1e5..eb5e9b5ffb 100644
--- a/keyboards/studiokestra/cascade/info.json
+++ b/keyboards/studiokestra/cascade/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Cascade",
+    "manufacturer": "Studio Kestra",
     "url": "https://studiokestra.ca/cascade/",
     "maintainer": "Studio Kestra",
+    "usb": {
+        "vid": "0x7C10",
+        "pid": "0x6001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h
index dc4aee20aa..1e9f715a6e 100644
--- a/keyboards/studiokestra/nue/config.h
+++ b/keyboards/studiokestra/nue/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       0x7C10
-#define PRODUCT_ID      0x0701
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Studio Kestra
-#define PRODUCT         Nue
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 
diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json
index 9abe8f3e5c..874f827546 100644
--- a/keyboards/studiokestra/nue/info.json
+++ b/keyboards/studiokestra/nue/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Nue",
+    "manufacturer": "Studio Kestra",
     "url": "https://studiokestra.ca/nue",
     "maintainer": "Studio Kestra",
+    "usb": {
+        "vid": "0x7C10",
+        "pid": "0x0701",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all":  {
             "layout": [