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

keyboards/salicylic_acid3/7splus/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       0x04D8
-#define PRODUCT_ID      0xEAE7
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         7splus
-
 /* key matrix size */
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 8

keyboards/salicylic_acid3/7splus/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "7splus", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEAE7",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/salicylic_acid3/ajisai74/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       0x04D8
-#define PRODUCT_ID      0xEB54
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         ajisai74
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 9

keyboards/salicylic_acid3/ajisai74/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ajisai74", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB54",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/salicylic_acid3/ergoarrows/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       0x04D8
-#define PRODUCT_ID      0xEA54
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         ergoarrows
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 7

keyboards/salicylic_acid3/ergoarrows/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ergoarrows", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEA54",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/salicylic_acid3/nafuda/config.h

@@ -20,13 +20,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      0x3060
-#define DEVICE_VER      0x0012
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         nafuda
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/salicylic_acid3/nafuda/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "nafuda", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.1.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/salicylic_acid3/nknl7en/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       0x04D8
-#define PRODUCT_ID      0xEA56
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         nknl7en
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 9

keyboards/salicylic_acid3/nknl7en/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "nknl7en", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEA56",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/salicylic_acid3/nknl7jp/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       0x04D8
-#define PRODUCT_ID      0xEA55
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         nknl7jp
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 9

keyboards/salicylic_acid3/nknl7jp/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "nknl7jp", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEA55",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sam/s80/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x534D
-#define PRODUCT_ID      0x3830
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sam
-#define PRODUCT         s80
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 9

keyboards/sam/s80/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "s80 wkl",
+    "keyboard_name": "s8",
+    "manufacturer": "Sam",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x534D",
+        "pid": "0x3830",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sam/sg81m/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x534D //SM
-#define PRODUCT_ID      0x3831 //81
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sam
-#define PRODUCT         SG81M
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14

keyboards/sam/sg81m/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "sam sg81m",
+    "keyboard_name": "SG81M",
+    "manufacturer": "Sam",
     "url": "",
     "maintainer": "CMMS-Freather",
+    "usb": {
+        "vid": "0x534D",
+        "pid": "0x3831",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_7u_space": {
             "layout": [

keyboards/sanctified/dystopia/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5357 // "SW"
-#define PRODUCT_ID      0x0001 // First public keyboard
-#define DEVICE_VER      0x0001 // Version 1
-#define MANUFACTURER    Sanctified.Works
-#define PRODUCT         Dystopia
-
 /* Key Matrix Size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/sanctified/dystopia/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Dystopia",
+    "manufacturer": "Sanctified.Works",
     "url": "",
     "maintainer": "Sanctified",
+    "usb": {
+        "vid": "0x5357",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_bs": {
             "layout": [

keyboards/sandwich/keeb68/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 sandwich
-#define PRODUCT      Keeb68 (Patron Saint Edition)
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/sandwich/keeb68/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Keeb68 (PSE)",
+    "keyboard_name": "Keeb68 (Patron Saint Edition)",
+    "manufacturer": "sandwich",
     "url": "",
     "maintainer": "SandwichRising",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [

keyboards/satt/comet46/config.h

@@ -19,14 +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    SatT
-#define PRODUCT         Comet46
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 10

keyboards/satt/comet46/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Comet46",
+    "manufacturer": "SatT",
     "url": "",
     "maintainer": "SatT",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/satt/vision/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       0x5454
-#define PRODUCT_ID      0x5649
-#define DEVICE_VER      0x0001
-#define MANUFACTURER SatT
-#define PRODUCT Vision
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14

keyboards/satt/vision/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Vision",
+    "manufacturer": "SatT",
     "url": "",
     "maintainer": "SatT",
+    "usb": {
+        "vid": "0x5454",
+        "pid": "0x5649",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"PgUp", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"Q", "x":2.25, "y":0}, {"label":"W", "x":3.25, "y":0}, {"label":"E", "x":4.25, "y":0}, {"label":"R", "x":5.25, "y":0}, {"label":"T", "x":6.25, "y":0}, {"label":"Y", "x":9, "y":0}, {"label":"U", "x":10, "y":0}, {"label":"I", "x":11, "y":0}, {"label":"O", "x":12, "y":0}, {"label":"P", "x":13, "y":0}, {"label":"Back", "x":14, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"PgDn", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.25}, {"label":"A", "x":2.5, "y":1}, {"label":"S", "x":3.5, "y":1}, {"label":"D", "x":4.5, "y":1}, {"label":"F", "x":5.5, "y":1}, {"label":"G", "x":6.5, "y":1}, {"label":"H", "x":9.25, "y":1}, {"label":"J", "x":10.25, "y":1}, {"label":"K", "x":11.25, "y":1}, {"label":"L", "x":12.25, "y":1}, {"label":":", "x":13.25, "y":1}, {"label":"\"", "x":14.25, "y":1, "w":1.75}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.75, "y":2}, {"label":"N", "x":9.75, "y":2}, {"label":"M", "x":10.75, "y":2}, {"label":"<", "x":11.75, "y":2}, {"label":">", "x":12.75, "y":2}, {"label":"?", "x":13.75, "y":2, "w":1.25}, {"label":"Adjust", "x":15, "y":2}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":3.75, "y":3, "w":1.5}, {"label":"Lower", "x":5.25, "y":3, "w":2}, {"x":7.25, "y":3}, {"label":"Raise", "x":8.75, "y":3, "w":1.75}, {"label":"Enter", "x":10.5, "y":3}, {"label":"Alt", "x":11.5, "y":3, "w":1.5}, {"label":"Ctrl", "x":14.5, "y":3, "w":1.5}]

keyboards/sauce/mild/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x8367 // "SC"
-#define PRODUCT_ID      0x7783 // "MS"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sauce
-#define PRODUCT         Mild
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/sauce/mild/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Sauce - Mild",
+  "keyboard_name": "Mild",
+  "manufacturer": "Sauce",
   "url": "",
   "maintainer": "Sauce",
+  "usb": {
+    "vid": "0x8367",
+    "pid": "0x7783",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_all": {
       "layout": [

keyboards/sawnsprojects/amber80/solder/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5350
-#define PRODUCT_ID      0xA801
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SawnsProjects X Yuutsu X Zlane
-#define PRODUCT         Amber80 Solder
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9

keyboards/sawnsprojects/amber80/solder/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Amber80 SOLDER",
+    "keyboard_name": "Amber80 Solder",
+    "manufacturer": "SawnsProjects X Yuutsu X Zlane",
     "url": "",
     "maintainer": "SawnsProjects",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0xA801",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/sawnsprojects/krush/krush60/solder/config.h

@@ -17,13 +17,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5350
-#define PRODUCT_ID      0x6B32
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SawnsProjects
-#define PRODUCT         Krush60 - Solder
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/sawnsprojects/krush/krush60/solder/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Krush60 Solder",
+    "keyboard_name": "Krush60 - Solder",
+    "manufacturer": "SawnsProjects",
     "url": "",
     "maintainer": "MaiTheSan",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x6B32",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs",
         "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan"

keyboards/sawnsprojects/krush/krush65/hotswap/config.h

@@ -17,13 +17,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5350
-#define PRODUCT_ID      0x5B31
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SawnsProjects
-#define PRODUCT         Krush65 - Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/sawnsprojects/krush/krush65/hotswap/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Krush65 Hotswap",
+    "keyboard_name": "Krush65 - Hotswap",
+    "manufacturer": "SawnsProjects",
     "url": "",
     "maintainer": "MaiTheSan",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x5B31",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/sawnsprojects/krush/krush65/solder/config.h

@@ -17,13 +17,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5350
-#define PRODUCT_ID      0x6B31
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SawnsProjects
-#define PRODUCT         Krush65 - Solder
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/sawnsprojects/krush/krush65/solder/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Krush65 Solder",
+    "keyboard_name": "Krush65 - Solder",
+    "manufacturer": "SawnsProjects",
     "url": "",
     "maintainer": "MaiTheSan",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x6B31",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs_sp"
     },

keyboards/sawnsprojects/satxri6key/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5350
-#define PRODUCT_ID      0x0727
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MaiTheSan
-#define PRODUCT         Satxri6key
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/sawnsprojects/satxri6key/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Satxri6key",
+    "manufacturer": "MaiTheSan",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x0727",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sawnsprojects/vcl65/solder/config.h

@@ -17,13 +17,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5350
-#define PRODUCT_ID      0x1727
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    VCL x SawnsProjects
-#define PRODUCT         VCL65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/sawnsprojects/vcl65/solder/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "VCL65 Solder",
+    "keyboard_name": "VCL65",
+    "manufacturer": "VCL x SawnsProjects",
     "url": "",
     "maintainer": "MaiTheSan",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x1727",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/scatter42/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   0x3B47
-#define DEVICE_VER   0x0001
-#define MANUFACTURER bbrfkr
-#define PRODUCT      scatter42
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/scatter42/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "scatter42",
+    "manufacturer": "bbrfkr",
     "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
     "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3B47",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sck/gtm/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6090
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    SpaceCityKeyboards
-#define PRODUCT         GTM Pad
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 6

keyboards/sck/gtm/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Grand Theft Macro Pad",
+    "keyboard_name": "GTM Pad",
+    "manufacturer": "SpaceCityKeyboards",
     "url": "",
     "maintainer": "jrfhoutx",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6090",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sck/m0116b/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    jrfhoutx
-#define PRODUCT         Golden Delicious
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18

keyboards/sck/m0116b/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Golden Delicious - M0116B",
+  "manufacturer": "jrfhoutx",
   "url": "https://github.com/jrfhoutx",
   "maintainer": "jrfhoutx",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_m0116_ansi": {
       "layout": [

keyboards/sck/neiso/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 Space City Keyboards
-#define PRODUCT NEISO
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 5

keyboards/sck/neiso/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "NEISO",
+    "manufacturer": "Space City Keyboards",
     "url": "",
     "maintainer": "jrfhoutx",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}]

keyboards/sck/osa/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       0x5343 // "SC"
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Space City Keyboards
-#define PRODUCT         OSA
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/sekigon/grs_70ec/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   0x70EC
-#define DEVICE_VER   0x0001
-#define MANUFACTURER sekigon-gonnoc
-#define PRODUCT      GRS-70EC
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/sekigon/grs_70ec/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "grs_70ec",
+    "keyboard_name": "GRS-70EC",
+    "manufacturer": "sekigon-gonnoc",
     "url": "https://github.com/sekigon-gonnoc/GRS-70EC-doc/",
     "maintainer": "sekigon-gonnoc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x70EC",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sendyyeah/75pixels/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5359
-#define PRODUCT_ID      0x3735
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    sendyyeah
-#define PRODUCT         75 Pixels
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/sendyyeah/75pixels/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "beVi",
+    "keyboard_name": "75 Pixels",
+    "manufacturer": "sendyyeah",
     "url": "https://github.com/sendyyeah/bevi",
     "maintainer": "sendyyeah",
+    "usb": {
+        "vid": "0x5359",
+        "pid": "0x3735",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [

keyboards/sendyyeah/bevi/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5359
-#define PRODUCT_ID      0x4256
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    sendyyeah
-#define PRODUCT         beVi
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/sendyyeah/bevi/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "beVi",
+    "manufacturer": "sendyyeah",
     "url": "https://github.com/sendyyeah/bevi",
     "maintainer": "sendyyeah",
+    "usb": {
+        "vid": "0x5359",
+        "pid": "0x4256",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sendyyeah/pix/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5359
-#define PRODUCT_ID      0x4e34
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    sendyyeah
-#define PRODUCT         Pix
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 5

keyboards/sendyyeah/pix/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Pix",
+    "manufacturer": "sendyyeah",
     "url": "https://github.com/sendz/pix",
     "maintainer": "sendz",
+    "usb": {
+        "vid": "0x5359",
+        "pid": "0x4E34",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/senselessclay/ck60/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    0x4849 // HI
-#define PRODUCT_ID   0x0601 // 60rgb (1)
-#define DEVICE_VER   0x0000 // rev0
-#define MANUFACTURER senselessclay
-#define PRODUCT      ck60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/senselessclay/ck60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "CK60",
+    "manufacturer": "senselessclay",
     "url": "https://candykeys.com",
     "maintainer": "had-i",
+    "usb": {
+        "vid": "0x4849",
+        "pid": "0x0601",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60_iso"
     },

keyboards/senselessclay/ck65/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    0x4849 // HI
-#define PRODUCT_ID   0x0651 // 65rgb (1)
-#define DEVICE_VER   0x0000 // rev0
-#define MANUFACTURER senselessclay
-#define PRODUCT      ck65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/senselessclay/ck65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "CK65",
+    "manufacturer": "senselessclay",
     "url": "https://candykeys.com",
     "maintainer": "had-i",
+    "usb": {
+        "vid": "0x4849",
+        "pid": "0x0651",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_iso"
     },

keyboards/senselessclay/gos65/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    0x4849 // HI
-#define PRODUCT_ID   0x0650 // 65rgb (0)
-#define DEVICE_VER   0x0001 // rev1
-#define MANUFACTURER senselessclay
-#define PRODUCT      gos65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/senselessclay/gos65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "gos65",
+    "manufacturer": "senselessclay",
     "url": "https://senselessclay.com/",
     "maintainer": "hadi",
+    "usb": {
+      "vid": "0x4849",
+      "pid": "0x0650",
+      "device_version": "0.0.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":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, "w":2.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":6.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/senselessclay/had60/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    0x4849 // HI
-#define PRODUCT_ID   0x060F // 60flex
-#define DEVICE_VER   0x0001 // rev1
-#define MANUFACTURER senselessclay
-#define PRODUCT      had60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/senselessclay/had60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "had60",
+    "manufacturer": "senselessclay",
     "url": "https://senselessclay.com/",
     "maintainer": "hadi",
+    "usb": {
+      "vid": "0x4849",
+      "pid": "0x060F",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_all": {
           "layout": [

keyboards/sentraq/number_pad/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    Sentraq
-#define PRODUCT         Sentraq Number Pad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/sentraq/number_pad/info.json

@@ -1,6 +1,12 @@
 {
-  "keyboard_name": "Sentraq Number Pad",
+  "keyboard_name": "Number Pad",
+  "manufacturer": "Sentraq",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "url": "https://sentraq.com/collections/kits/products/number-pad-rgb-kit",
   "layouts": {
     "LAYOUT_numpad_5x4": {

keyboards/sentraq/s65_plus/config.h

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

keyboards/sentraq/s65_plus/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "S65-Plus",
+  "manufacturer": "Sentraq",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [

keyboards/sentraq/s65_x/config.h

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

keyboards/sentraq/s65_x/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "S65-X PCB",
+  "manufacturer": "Sentraq",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_65_ansi": {
       "layout": [

keyboards/sergiopoverony/creator_pro/config.h

@@ -17,14 +17,6 @@
 #pragma once
 #include "config_common.h"
 
-/* vid pid  */
-#define VENDOR_ID       0x8B1E 
-#define PRODUCT_ID      0x0C00
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SergioPoverony
-#define PRODUCT         Creator Pro
-
-	
 /* key matrix size pins */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 9

keyboards/sergiopoverony/creator_pro/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Creator Pro",
+  "manufacturer": "SergioPoverony",
   "url": "https://github.com/sergiopoverony",
   "maintainer": "SergioPoverony",
+  "usb": {
+    "vid": "0x8B1E",
+    "pid": "0x0C00",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/sets3n/kk980/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x404A
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sets3n
-#define PRODUCT         kk980
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/sets3n/kk980/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "kk980",
+    "manufacturer": "Sets3n",
     "url": "https://i.imgur.com/MQA6FXb.jpg",
     "maintainer": "Sets3n",
+    "usb": {
+        "vid": "0x404A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/shambles/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x4F42
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    OsciX
-#define PRODUCT         Shambles TKL
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

keyboards/shambles/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Shambles TKL",
+  "manufacturer": "OsciX",
   "url": "",
   "maintainer": "OsciX",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0F42",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1.5, "y":0}, {"label":"K02", "x":2.5, "y":0}, {"label":"K03", "x":3.5, "y":0}, {"label":"K04", "x":4.75, "y":0}, {"label":"K05", "x":5.75, "y":0}, {"label":"K06", "x":6.75, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"K08", "x":9, "y":0}, {"label":"K09", "x":10.25, "y":0}, {"label":"K10", "x":11.25, "y":0}, {"label":"K11", "x":12.25, "y":0}, {"label":"K12", "x":0, "y":1.5}, {"label":"K13", "x":1, "y":1.5}, {"label":"K14", "x":2, "y":1.5}, {"label":"K15", "x":3, "y":1.5}, {"label":"K16", "x":4, "y":1.5}, {"label":"K17", "x":5, "y":1.5}, {"label":"K18", "x":6, "y":1.5}, {"label":"K19", "x":7, "y":1.5}, {"label":"K20", "x":8, "y":1.5}, {"label":"K21", "x":9, "y":1.5}, {"label":"K22", "x":10.25, "y":1.25}, {"label":"K23", "x":11.25, "y":1.25}, {"label":"K24", "x":12.25, "y":1.25}, {"label":"K25", "x":0, "y":2.5}, {"label":"K26", "x":1, "y":2.5}, {"label":"K27", "x":2, "y":2.5}, {"label":"K28", "x":3, "y":2.5}, {"label":"K29", "x":4, "y":2.5}, {"label":"K30", "x":5, "y":2.5}, {"label":"K31", "x":6, "y":2.5}, {"label":"K32", "x":7, "y":2.5}, {"label":"K33", "x":8, "y":2.5}, {"label":"K34", "x":9, "y":2.5}, {"label":"K35", "x":11.25, "y":2.5}, {"label":"K36", "x":0.5, "y":3.5}, {"label":"K37", "x":1.5, "y":3.5}, {"label":"K38", "x":2.5, "y":3.5}, {"label":"K39", "x":3.5, "y":3.5}, {"label":"K40", "x":4.5, "y":3.5, "w":2}, {"label":"K41", "x":6.5, "y":3.5}, {"label":"K42", "x":7.5, "y":3.5}, {"label":"K43", "x":8.5, "y":3.5}, {"label":"K44", "x":10.25, "y":3.5}, {"label":"K45", "x":11.25, "y":3.5}, {"label":"K43", "x":12.25, "y":3.5}]

keyboards/shapeshifter4060/config.h

@@ -19,14 +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       0x1209 // pid.codes Vendor ID
-#define PRODUCT_ID      0xA1F1 // Shapeshifter 4060: https://pid.codes/1209/A1F1/
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Vosechu
-#define PRODUCT         Shapeshifter 4060
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/shapeshifter4060/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Shapeshifter 4060",
+    "manufacturer": "Vosechu",
     "url": "kitsunekeyboards.com",
     "maintainer": "vosechu",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA1F1",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/shiro/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    T.Shinohara
-#define PRODUCT         Shiro
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 3

keyboards/shiro/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Shiro",
+  "manufacturer": "T.Shinohara",
   "url": "https://github.com/ShinoharaTa/keyboards/blob/master/Shiro/manual/build_guide_ja.md",
   "maintainer": "T.Shinohara",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/shk9/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    0x5348
-#define PRODUCT_ID   0x4B39
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Superhuman
-#define PRODUCT      SHK9
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/shk9/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "SHK9",
+    "manufacturer": "Superhuman",
     "url": "http://superhuman.website",
     "maintainer": "Sam Hudson",
+    "usb": {
+      "vid": "0x5348",
+      "pid": "0x4B39",
+      "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_3x3": {
           "layout": [

keyboards/sidderskb/majbritt/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       0x534B // SB
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SiddersKB
-#define PRODUCT         Majbritt
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/sidderskb/majbritt/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Majbritt",
+    "keyboard_name": "Majbritt Rev1",
+    "manufacturer": "SiddersKb",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x534B",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sidderskb/majbritt/rev2/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       0x534B // SB
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    SiddersKb
-#define PRODUCT         Majbritt
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/sidderskb/majbritt/rev2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Majbritt Rev2",
-    "maintainer": "Sleepdealr",
+    "manufacturer": "SiddersKb",
     "url": "https://sidderskb.co.uk/",
+    "maintainer": "Sleepdealr",
+    "usb": {
+        "vid": "0x534B",
+        "pid": "0x0001",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/signum/3_0/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Troy Fletcher
-#define PRODUCT Signum30
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/signum/3_0/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Signum 3.0",
+    "manufacturer": "Troy Fletcher",
     "url": "http://troyfletcher.net/",
     "maintainer": "jceb",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"
     },

keyboards/silverbullet44/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       0x16C0
-#define PRODUCT_ID      0x27DB
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    SwanMatch
-#define PRODUCT         SilverBullet44
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/silverbullet44/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "SilverBullet44",
+    "manufacturer": "SwanMatch",
     "url": "https://swanmatch.booth.pm/items/1561270",
     "maintainer": "swanmatch",
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/singa/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       0x736B  // SK
-#define PRODUCT_ID      0x7575
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Singa Keyboards
-#define PRODUCT         Singa
-
 #define RGBLED_NUM 18
 
 #define MATRIX_ROWS 7

keyboards/sirius/uni660/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    0x5352 // "SR"
-#define PRODUCT_ID   0x0201 // Second Product First Version
-#define DEVICE_VER   0x1912 // 2019.12
-#define MANUFACTURER SiRius
-#define PRODUCT      Uni660
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/sirius/uni660/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Uni660",
+    "manufacturer": "SiRius",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5352",
+        "pid": "0x0201",
+        "device_version": "19.1.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/sirius/uni660/rev2/ansi/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    0x5352 // "SR"
-#define PRODUCT_ID   0x0202 // Second Product Second Version
-#define DEVICE_VER   0x2004 // 2020.12
-#define MANUFACTURER SiRius
-#define PRODUCT      Uni660 V2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/sirius/uni660/rev2/ansi/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Uni660",
+    "keyboard_name": "Uni660 V2 ANSI",
+    "manufacturer": "SiRius",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5352",
+        "pid": "0x0202",
+        "device_version": "20.0.4"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [

keyboards/sirius/uni660/rev2/iso/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    0x5352 // "SR"
-#define PRODUCT_ID   0x0203 // Second Product Third Version
-#define DEVICE_VER   0x2004 // 2020.12
-#define MANUFACTURER SiRius
-#define PRODUCT      Uni660 V2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/sirius/uni660/rev2/iso/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Uni660",
+    "keyboard_name": "Uni660 V2 ISO",
+    "manufacturer": "SiRius",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5352",
+        "pid": "0x0203",
+        "device_version": "20.0.4"
+    },
     "layouts": {
         "LAYOUT_iso": {
             "layout": [

keyboards/sirius/unigo66/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       0xFEED
-#define PRODUCT_ID      0x1001
-#define DEVICE_VER      0x1901
-#define MANUFACTURER    Sirius
-#define PRODUCT         UniGo66
-
 /* size of virtual matrix */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 16

keyboards/sirius/unigo66/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "UniGo66",
+    "manufacturer": "Sirius",
     "url": "https://discord.gg/GJ8bdM",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1001",
+        "device_version": "19.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [