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

keyboards/tada68/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       0x5441
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    TADA
-#define PRODUCT         TADA68
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/tada68/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Tada68",
+    "keyboard_name": "TADA68",
+    "manufacturer": "TADA",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5441",
+        "pid": "0x0001",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [

keyboards/takashicompany/center_enter/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0012
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      Center x Enter
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 12

keyboards/takashicompany/center_enter/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Center x Enter",
+    "manufacturer": "takashicompany",
     "url": "",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0012",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/compacx/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0014
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      Compacx
-
 /* key matrix size */
 #define MATRIX_ROWS 5 * 2
 #define MATRIX_COLS 7

keyboards/takashicompany/compacx/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Compacx",
+    "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/compacx",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0014",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/dogtag/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0018
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      DogTag
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 5

keyboards/takashicompany/dogtag/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "DogTag",
+    "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/dogtag",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0018",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/endzone34/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0006
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      EndZone34
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10

keyboards/takashicompany/endzone34/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "EndZone34",
+    "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/endzone34",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/heavy_left/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0015
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      Heavy Left
-
 /* key matrix size */
 #define MATRIX_ROWS 5 * 2
 #define MATRIX_COLS 10

keyboards/takashicompany/heavy_left/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "heavy_left",
+    "keyboard_name": "Heavy Left",
+    "manufacturer": "takashicompany",
     "url": "",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0015",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/minizone/config.h

@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0021
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      miniZone
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 7

keyboards/takashicompany/minizone/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "miniZone",
+    "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/minizone",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0021",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/qoolee/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0013
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      QooLee
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 12

keyboards/takashicompany/qoolee/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "QooLee",
+    "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/qoolee",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0013",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashicompany/radialex/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    0x7463 // tc = takashicompany
-#define PRODUCT_ID   0x0019
-#define DEVICE_VER   0x0001
-#define MANUFACTURER takashicompany
-#define PRODUCT      Radialex
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 7

keyboards/takashicompany/radialex/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Radialex",
+    "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/radialex",
     "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0019",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/takashiski/hecomi/alpha/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    takashiski
-#define PRODUCT         hecomi_alpha
-
 /* key matrix size */
 //#define MATRIX_ROWS 5
 #define MATRIX_ROWS 10

keyboards/takashiski/hecomi/alpha/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "hecomi/alpha",
+  "keyboard_name": "hecomi_alpha",
+  "manufacturer": "takashiski",
   "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
   "maintainer": "takashiski",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/takashiski/otaku_split/rev0/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    takashiski
-#define PRODUCT         otaku_split
-
 /* key matrix size */
 #define MATRIX_ROWS 10 
 #define MATRIX_COLS 8

keyboards/takashiski/otaku_split/rev1/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    takashiski
-#define PRODUCT         otaku_split
-
 /* key matrix size */
 #define MATRIX_ROWS 10 
 #define MATRIX_COLS 8

keyboards/taleguers/taleguers75/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x8476
-#define PRODUCT_ID      0x0075
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Taleguers
-#define PRODUCT         Taleguers75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14

keyboards/taleguers/taleguers75/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Taleguers75",
+    "manufacturer": "Taleguers",
     "url": "",
     "maintainer": "borlopjim",
+    "usb": {
+        "vid": "0x8476",
+        "pid": "0x0075",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{

keyboards/tanuki/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      0x6464
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Seth
-#define PRODUCT         Tanuki PCB version
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11

keyboards/tanuki/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Tanuki",
+  "manufacturer": "Seth",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6464",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Game", "x":11.25, "y":1}, {"label":"Shift", "x":0.25, "y":2, "w":1.5}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"\"", "x":8.75, "y":2}, {"label":"?", "x":9.75, "y":2}, {"label":"Enter", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3}, {"label":"<", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2}, {"label":">", "x":8.5, "y":3}, {"label":"GUI", "x":9.5, "y":3, "w":1.25}]

keyboards/team0110/p1800fl/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 0x3EAE
-#define DEVICE_VER 0x0001
-#define MANUFACTURER team0110
-#define PRODUCT p1800fl
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/team0110/p1800fl/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "p1800fl", 
+    "manufacturer": "team0110",
     "url": "http://team0110.store/", 
     "maintainer": "team0110", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3EAE",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/technika/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x8484 // TT for TealTechnik
-#define PRODUCT_ID      0x6049 // 60i
-#define DEVICE_VER      0x0001 // Revision pre-Alpha
-#define MANUFACTURER    TealTechnik
-#define PRODUCT         Technika
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14

keyboards/technika/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Technika",
+    "manufacturer": "TealTechnik",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8484",
+        "pid": "0x6049",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/teleport/numpad/config.h

@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x7470      //"tp"
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    tlprt
-#define PRODUCT         NumPad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/teleport/numpad/info.json

@@ -1,6 +1,12 @@
 {
-  "keyboard_name": "tlprt_NumPad",
+  "keyboard_name": "NumPad",
+  "manufacturer": "tlprt",
   "maintainer": "ebastler",
+  "usb": {
+    "vid": "0x7470",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_numpad_5x4": {
       "layout": [

keyboards/telophase/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   0x6060
-#define DEVICE_VER   0x0001
-#define MANUFACTURER unknown
-#define PRODUCT      Telophase
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/telophase/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Telophase",
+    "manufacturer": "Unknown",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [

keyboards/tempo_turtle/bradpad/config.h

@@ -1,19 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/*usb descriptor setup and keyboard setup (rows and cols) are located in info.json*/

keyboards/tempo_turtle/bradpad/info.json

@@ -1,5 +1,6 @@
 {
     "keyboard_name": "bradpad",
+    "manufacturer": "tempo_turtle",
     "url": "https://tempoturtle.com",
     "maintainer": "wxyangf",
     "diode_direction": "ROW2COL",

keyboards/tender/macrowo_pad/config.h

@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xE936
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Tender
-#define PRODUCT         Macrowo Pad
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 10

keyboards/tender/macrowo_pad/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Macrowo_Pad", 
+    "keyboard_name": "Macrowo Pad", 
+    "manufacturer": "Tender",
     "url": "https//www.github.com/swiftrax", 
     "maintainer": "swiftrax", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE936",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}]

keyboards/tenki/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5058 // "PX"
-#define PRODUCT_ID      0x5445 // "TE"
-#define DEVICE_VER      0x1001
-#define MANUFACTURER    Pixlup
-#define PRODUCT         TENKI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/tenki/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "TENKI", 
+    "manufacturer": "Pixlup",
     "url": "https://tokopedia.com/pixlup", 
     "maintainer": "eriqadams", 
+    "usb": {
+        "vid": "0x5058",
+        "pid": "0x5445",
+        "device_version": "10.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x4": { 
 			"layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Bspc", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"=", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"PrtScr", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}]

keyboards/terrazzo/config.h

@@ -17,14 +17,6 @@
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4d4d // MM
-#define PRODUCT_ID      0x545a // TZ
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    MsMustard
-#define PRODUCT         Terrazzo
-
 /* key matrix size */
 
 // SWAP FOR PRO MICRO

keyboards/terrazzo/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Terrazzo", 
+    "manufacturer": "MsMustard",
     "url": "", 
     "maintainer": "MsMustard", 
+    "usb": {
+        "vid": "0x4D4D",
+        "pid": "0x545A",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/tetris/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Fengz
-#define PRODUCT         Tetris
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12

keyboards/tetris/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Tetris",
+  "manufacturer": "Fengz",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]

keyboards/tg4x/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 0x4D4D // "MM"
-#define PRODUCT_ID 0x0458 // 4 "X"
-#define DEVICE_VER 0x0021
-#define MANUFACTURER MythosMann
-#define PRODUCT TG4x
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 7

keyboards/tg4x/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "TG4x", 
+    "manufacturer": "MythosMann",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x4D4D",
+        "pid": "0x0458",
+        "device_version": "0.2.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3, "w":1.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]

keyboards/tgr/910/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x5447  //TG
-#define PRODUCT_ID 0x9100 //910
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Quadcube
-#define PRODUCT TGR-910
-
 #define RGBLED_NUM 19
 
 #define MATRIX_ROWS 7

keyboards/tgr/910/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "TGR-910",
+    "manufacturer": "Quadcube",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5447",
+        "pid": "0x9100",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

keyboards/tgr/910ce/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x5447 // TG
-#define PRODUCT_ID 0x910C
-#define DEVICE_VER 0x0001
-#define MANUFACTURER TGR
-#define PRODUCT 910CE
-
 #define RGBLED_NUM 18
 
 #define MATRIX_ROWS 6

keyboards/tgr/910ce/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TGR 910 CE", 
+    "keyboard_name": "910CE", 
+    "manufacturer": "TGR",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x5447",
+        "pid": "0x910C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

keyboards/tgr/alice/config.h

@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422E
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    TGR
-#define PRODUCT         Alice
-
 /* matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/tgr/alice/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "TGR Alice",
+  "keyboard_name": "Alice",
+  "manufacturer": "TGR",
   "url": "",
   "maintainer": "Felipe Coury",
+  "usb": {
+    "vid": "0x20A0",
+    "pid": "0x422E",
+    "device_version": "2.0.0"
+  },
   "layouts": {
     "LAYOUT_alice_split_bs": {
       "layout": [

keyboards/tgr/jane/v2/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x5447 // TG
-#define PRODUCT_ID      0x4A4E // JN
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    TGR
-#define PRODUCT         Jane
-
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 15
 

keyboards/tgr/jane/v2ce/config.h

@@ -18,12 +18,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x5447 // TG
-#define PRODUCT_ID      0x4A43 // JC
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    TGR
-#define PRODUCT         Jane
-
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 15
 

keyboards/tgr/tris/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x5447  //TG
-#define PRODUCT_ID 0x5452 //TR
-#define DEVICE_VER 0x0001
-#define MANUFACTURER TGR
-#define PRODUCT Tris
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
 

keyboards/tgr/tris/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TGR Tris",
+    "keyboard_name": "Tris",
+    "manufacturer": "TGR",
     "url": "",
     "maintainer": "halfenergized",
+    "usb": {
+        "vid": "0x5447",
+        "pid": "0x5452",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}]

keyboards/the_royal/liminal/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B4B
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TheRoyalSweatshirt
-#define PRODUCT         Liminal
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14

keyboards/the_royal/liminal/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "liminal",
+  "keyboard_name": "Liminal",
+  "manufacturer": "TheRoyalSweatshirt",
   "url": "",
   "maintainer": "TheRoyalSweatshirt",
+  "usb": {
+    "vid": "0x4B4B",
+    "pid": "0x0003",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_base_kit_all": {
       "layout": [

keyboards/the_royal/schwann/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x3521
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TheRoyalSweatshirt
-#define PRODUCT         The Schwann PCB
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/the_royal/schwann/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Schwann's PCB",
+  "keyboard_name": "The Schwann PCB",
+  "manufacturer": "TheRoyalSweatshirt",
   "url": "https://github.com/TheRoyalSweatshirt/The_Royal_Projects/tree/schwann/PCBs/Schwann_PCB",
   "maintainer": "TheRoyalSweatshirt",
+  "usb": {
+      "vid": "0xFEED",
+      "pid": "0x3521",
+      "device_version": "0.0.1"
+  },
   "layouts": {
    "LAYOUT_mit": {
       "layout": [

keyboards/themadnoodle/ncc1701kb/v2/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      0x1701
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    The Mad Noodle
-#define PRODUCT         NCC1701KB v2
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/themadnoodle/ncc1701kb/v2/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "NCC-1701-KB v2",
+  "manufacturer": "The Mad Noodle",
   "url": "instagram.com/the_mad_noodle",
   "maintainer": "The-Mad-Noodle",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1701",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [

keyboards/themadnoodle/noodlepad/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      0x1701
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    The Mad Noodle
-#define PRODUCT         Noodle Pad v1
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/themadnoodle/noodlepad/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "NoodlePad",
+  "keyboard_name": "Noodle Pad v1",
+  "manufacturer": "The Mad Noodle",
   "url": "instagram.com/the_mad_noodle",
   "maintainer": "The-Mad-Noodle",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1701",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [

keyboards/thevankeyboards/bananasplit/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       0xFEAE
-#define PRODUCT_ID      0x8870
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TheVan Keyboards
-#define PRODUCT         BananaSplit 60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/thevankeyboards/caravan/config.h

@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEAE
-#define PRODUCT_ID      0x8844
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TheVan Keyboards
-#define PRODUCT         Caravan
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/thevankeyboards/caravan/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TheVanKeyboards Caravan",
+    "keyboard_name": "Caravan",
+    "manufacturer": "TheVan Keyboards",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEAE",
+        "pid": "0x8844",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/thevankeyboards/minivan/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       0xFEAE
-#define PRODUCT_ID      0x8844
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Evan Sailer
-#define PRODUCT         Minivan
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/thevankeyboards/minivan/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "tv44",
+  "keyboard_name": "Minivan",
+  "manufacturer": "Evan Sailer",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEAE",
+    "pid": "0x8844",
+    "device_version": "0.0.2"
+  },
   "layouts": {
       "LAYOUT": {
           "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Win", "x":9.5, "y":3, "w":1.5}, {"label":"Menu", "x":11, "y":3, "w":1.75}]

keyboards/thevankeyboards/roadkit/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       0xFEAE
-#define PRODUCT_ID      0x8846
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TheVan Keyboards
-#define PRODUCT         Roadkit Micro
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

keyboards/thevankeyboards/roadkit/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Roadkit",
+  "keyboard_name": "Roadkit Micro",
+  "manufacturer": "TheVan Keyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEAE",
+    "pid": "0x8846",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_numpad_4x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}]

keyboards/tkc/california/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       0x544B //TK
-#define PRODUCT_ID      0x0009
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TKC
-#define PRODUCT         California
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 10

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

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": [

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

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": [

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

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": [

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

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": [

keyboards/tkc/godspeed75/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x544B //TK
-#define PRODUCT_ID      0x0006 //GodSpeed75
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    The Key Company
-#define PRODUCT         GodSpeed75
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8

keyboards/tkc/m0lly/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       0x544B // "TK"
-#define PRODUCT_ID      0x0004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    The Key Company
-#define PRODUCT         M0lly
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 19

keyboards/tkc/m0lly/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TKC M0LLY",
+    "keyboard_name": "M0lly",
+    "manufacturer": "The Key Company",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/tkc/osav2/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       0x544B //TK
-#define PRODUCT_ID      0x0005 //Alice
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    The Key Company
-#define PRODUCT         OSA v2
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/tkc/portico/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       0x544B //TK
-#define PRODUCT_ID      0x0008
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TKC
-#define PRODUCT         Portico
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/tkc/portico/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TKC Portico",
+    "keyboard_name": "Portico",
+    "manufacturer": "TKC",
     "url": "",
     "maintainer": "TerryMathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0008",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_65_ansi_blocker"
     },

keyboards/tkc/portico68v2/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       0x544B //TK
-#define PRODUCT_ID      0x0012 //Portico68v2
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TKC
-#define PRODUCT         Portico68v2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/tkc/portico68v2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "TKC Portico68 v2",
+    "keyboard_name": "Portico68 v2",
+    "manufacturer": "TKC",
     "url": "",
     "maintainer": "TerryMathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0012",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [

keyboards/tkc/portico75/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       0x544B // TK
-#define PRODUCT_ID      0x0011
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TKC
-#define PRODUCT         Portico75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/tkc/tkc1800/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       0x544B // "TK"
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    The Key Company
-#define PRODUCT         TKC1800
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 19

keyboards/tkc/tkc1800/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "TKC1800",
+  "manufacturer": "The Key Company",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x544B",
+    "pid": "0x0001",
+    "device_version": "0.0.3"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [