Merge remote-tracking branch 'origin/master' into develop

keyboards/h0oni/deskpad/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D53 
-#define PRODUCT_ID      0x4450 //hD
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Hydrogen
-#define PRODUCT         Deskpad
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/h0oni/deskpad/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Deskpad", 
+    "manufacturer": "Hydrogen",
     "url": "", 
     "maintainer": "Hydrogen BD", 
+    "usb": {
+        "vid": "0x4D53",
+        "pid": "0x4450",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"k1", "x":0, "y":0}, 

keyboards/h0oni/hotduck/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D53 
-#define PRODUCT_ID      0x6844 //hD
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    h0oni
-#define PRODUCT         hotDuck
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 10

keyboards/h0oni/hotduck/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "hotDuck", 
+    "manufacturer": "h0oni",
     "url": "", 
     "maintainer": "h0oni", 
+    "usb": {
+        "vid": "0x4D53",
+        "pid": "0x6844",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"Esc", "x":0, "y":0}, 

keyboards/halfcliff/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    0x0335
-#define PRODUCT_ID   0x0021
-#define DEVICE_VER   0x0001
-#define MANUFACTURER n2
-#define PRODUCT      halfcliff
-
 /* key matrix size */
 #define MATRIX_ROWS 20
 #define MATRIX_COLS 5

keyboards/halfcliff/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "halfcliff", 
+    "manufacturer": "n2",
     "url": "https://github.com/N2-Sumikko", 
     "maintainer": "n2", 
+    "usb": {
+        "vid": "0x0335",
+        "pid": "0x0021",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/halokeys/elemental75/config.h

@@ -16,14 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xEA0B
-#define PRODUCT_ID 0xEA75
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Halokeys
-#define PRODUCT Elemental75
-
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/halokeys/elemental75/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Elemental 75",
+    "keyboard_name": "Elemental75",
+    "manufacturer": "Halokeys",
     "url": "",
     "maintainer": "shamit05",
+    "usb": {
+        "vid": "0xEA0B",
+        "pid": "0xEA75",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/han60/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    0x4842
-#define PRODUCT_ID   0xFB60
-#define DEVICE_VER   0x0001
-#define MANUFACTURER HanBoards
-#define PRODUCT      han60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/han60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "han60",
+    "manufacturer": "HanBoards",
     "maintainer": "qmk",
     "url": "hanboards.com",
+    "usb": {
+        "vid": "0x4842",
+        "pid": "0xFB60",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hand88/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       0x8968
-#define PRODUCT_ID      0x3838
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         Hand 88
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/hand88/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Hand 88",
+    "manufacturer": "Yiancar-Designs",
     "url": "https://yiancar-designs.com",
     "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x3838",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]

keyboards/hardlineworks/otd_plus/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x484C  // "HL"
-#define PRODUCT_ID      0x0087  // "TKL"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Hardlineworks
-#define PRODUCT         OTD-PLUS
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9

keyboards/hardlineworks/otd_plus/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "OTD-PLUS",
+    "manufacturer": "Hardlineworks",
     "url": "",
     "maintainer": "Hardlineworks",
+    "usb": {
+        "vid": "0x484C",
+        "pid": "0x0087",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [

keyboards/heliar/wm1_hotswap/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xD070
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Heliar 
-#define PRODUCT         wm1 hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/heliar/wm1_hotswap/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "wm1",
+    "keyboard_name": "wm1 hotswap",
+    "manufacturer": "Heliar",
     "url": "",
     "maintainer": "heliar",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xD070",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/helix/pico/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3265
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Yushakobo
-#define PRODUCT         HelixPico
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 

keyboards/helix/pico/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "HelixPico",
+    "manufacturer": "Yushakobo",
     "url": "https://github.com/MakotoKurauchi/helix",
     "maintainer": "MakotoKurauchi",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0001",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/helix/rev2/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3265
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yushakobo
-#define PRODUCT         Helix Beta
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 

keyboards/helix/rev2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Helix rev. 2",
+    "keyboard_name": "Helix Beta",
+    "manufacturer": "Yushakobo",
     "url": "https://github.com/MakotoKurauchi/helix",
     "maintainer": "MakotoKurauchi",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/helix/rev3_4rows/config.h

@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include <stdio.h>
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x3265 //yushakobo
-#define PRODUCT_ID 0x0004 //Helix rev3 4rows
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yushakobo
-#define PRODUCT Helix rev3 4rows
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 7

keyboards/helix/rev3_4rows/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Helix rev3 4rows",
+  "manufacturer": "yushakobo",
   "url": "",
   "maintainer": "yushakobo",
+  "usb": {
+    "vid": "0x3265",
+    "pid": "0x0004",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/helix/rev3_5rows/config.h

@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include <stdio.h>
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x3265 //yushakobo
-#define PRODUCT_ID 0x0003 //Helix rev3 5rows
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yushakobo
-#define PRODUCT Helix rev3 5rows
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

keyboards/helix/rev3_5rows/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Helix rev3 5rows",
+  "manufacturer": "yushakobo",
   "url": "",
   "maintainer": "yushakobo",
+  "usb": {
+    "vid": "0x3265",
+    "pid": "0x0003",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/hhkb/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       0x4848 // HH = happy hacking
-#define PRODUCT_ID      0x0001 // ANSI HHKB
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    q.m.k
-#define PRODUCT         HHKB mod
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/hhkb/ansi/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "HHKB",
+  "keyboard_name": "ANSI",
+  "manufacturer": "HHKB",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0001",
+    "device_version": "1.0.4"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/hhkb/jp/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       0x4848 // HH = happy hacking
-#define PRODUCT_ID      0x0002 // HHKB JP
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    q.m.k
-#define PRODUCT         HHKB mod
-
 /* key matrix size */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 8

keyboards/hhkb/jp/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "HHKB JP",
+  "keyboard_name": "JP",
+  "manufacturer": "HHKB",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0002",
+    "device_version": "1.0.4"
+  },
   "layouts": {
     "LAYOUT_jp": {
       "layout": [

keyboards/hhkb/yang/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 0x4848   // HH = happy hacking
-#define PRODUCT_ID 0x0001  // ANSI HHKB
-#define DEVICE_VER 0x0104
-#define MANUFACTURER YANG
-#define PRODUCT HHKB BLE Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/hhkb/yang/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "YANG HHKB BLE",
+  "keyboard_name": "HHKB BLE",
+  "manufacturer": "YANG",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0001",
+    "device_version": "1.0.4"
+  },
   "layouts": {
     "LAYOUT_60_hhkb": {
       "layout": [

keyboards/hhkb_lite_2/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x88B2
-#define PRODUCT_ID      0x88B2
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    PFU
-#define PRODUCT         HHKB Lite 2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 14

keyboards/hhkb_lite_2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "HHKB Lite 2",
+    "manufacturer": "PFU",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x88B2",
+        "pid": "0x88B2",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/hidtech/bastyl/config.h

@@ -18,11 +18,6 @@
 
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID 0xA8F7
-#define PRODUCT_ID 0x1827
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HID Technologies
-#define PRODUCT Bastyl
 
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6

keyboards/hidtech/bastyl/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Bastyl",
+    "manufacturer": "HID Technologies",
     "url": "https://www.hidtech.ca/?product=bastyl-black",
     "maintainer": "HID-Technologies",
+    "usb": {
+        "vid": "0xA8F7",
+        "pid": "0x1827",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/hifumi/config.h

@@ -18,13 +18,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      0x0001
-#define MANUFACTURER    riconken
-#define PRODUCT         hifumi
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/hifumi/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "hifumi",
+  "manufacturer": "riconken",
   "url": "https://github.com/zk-phi/1x2x3-keyboard",
   "maintainer": "riconken",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
         "layout": [{"label":"F5", "x":0, "y":0}, {"label":"Up", "x":1, "y":0}, {"label":"PrSc", "x":2, "y":0}, {"label":"Left", "x":0, "y":1}, {"label":"Down", "x":1, "y":1}, {"label":"Right", "x":2, "y":1}]

keyboards/hineybush/h08_ocelot/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   0xE8E9
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Hiney LLC
-#define PRODUCT      h08
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4

keyboards/hineybush/h08_ocelot/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "h08",
+    "manufacturer": "Hiney LLC",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8E9",
+        "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]

keyboards/hineybush/h10/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 0xEBD8
-#define DEVICE_VER 0x0001
-#define MANUFACTURER hineybush
-#define PRODUCT h10
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/hineybush/h10/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "h10",
+    "manufacturer": "hineybush",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEBD8",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [

keyboards/hineybush/h60/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 0xEBBE
-#define DEVICE_VER 0x0001
-#define MANUFACTURER hineybush keyboards
-#define PRODUCT h60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/hineybush/h60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "h60",
+    "manufacturer": "hineybush",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEBBE",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [

keyboards/hineybush/h65/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   0xE9E4
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Hiney LLC
-#define PRODUCT      h65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/hineybush/h65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "h65",
+    "manufacturer": "Hiney LLC",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE9E4",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hineybush/h65_hotswap/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   0xE8B7
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Hiney LLC
-#define PRODUCT      h65 hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/hineybush/h65_hotswap/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "h65 hotswap",
+    "manufacturer": "Hiney LLC",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8B7",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },

keyboards/hineybush/h660s/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   0xEB1B
-#define DEVICE_VER   0x0001
-#define MANUFACTURER hineybush keyboards
-#define PRODUCT      h660s
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/hineybush/h660s/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "h660-s",
+    "keyboard_name": "h660s",
+    "manufacturer": "hineybush",
     "url": "",
     "maintainer": "Josh Hinnebusch",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB1B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_66_ansi": {
             "layout": [

keyboards/hineybush/h75_singa/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 0xEC9A
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Singa Keyboards
-#define PRODUCT h75_singa
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/hineybush/h87a/config.h

@@ -15,13 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xECE9
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    hineybush keyboards
-#define PRODUCT         h87a
-
 #define CONFIG_H
 
 #include "config_common.h"

keyboards/hineybush/h88/config.h

@@ -19,15 +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      0xECA2
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    hineybush keyboards
-#define PRODUCT         h88
-
-
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9

keyboards/hineybush/hbcp/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      0xECE8
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    hineybush keyboards
-#define PRODUCT         hbcp
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18

keyboards/hineybush/hbcp/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "hbcp",
+    "manufacturer": "hineybush",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xECE8",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hineybush/hineyg80/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    hineybush
-#define PRODUCT         hineyG80
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9

keyboards/hineybush/physix/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 0xEC81
-#define DEVICE_VER 0x0001
-#define MANUFACTURER LZ
-#define PRODUCT PhysiX
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/hineybush/physix/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "physix",
+    "keyboard_name": "PhysiX",
+    "manufacturer": "LZ",
     "url": "",
     "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEC81",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hineybush/sm68/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 0xEC9F
-#define DEVICE_VER 0x0001
-#define MANUFACTURER hineybush keyboards
-#define PRODUCT sm68
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/hnahkb/freyr/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   0x1895
-#define DEVICE_VER   0x0002
-#define MANUFACTURER HnahKB
-#define PRODUCT      Freyr
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 10

keyboards/hnahkb/freyr/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "freyr",
+    "keyboard_name": "Freyr",
+    "manufacturer": "HnahKB",
     "url": "",
     "maintainer": "vuhopkep",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1895",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hnahkb/stella/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   0x0AB7
-#define DEVICE_VER   0x0001
-#define MANUFACTURER HnahKB
-#define PRODUCT      Stella
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 10

keyboards/hnahkb/stella/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Stella",
+    "manufacturer": "HnahKB",
     "url": "",
     "maintainer": "VGS",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0AB7",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hnahkb/vn66/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   0xCA2C
-#define DEVICE_VER   0x0001
-#define MANUFACTURER HnahKB
-#define PRODUCT      VN66
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/hnahkb/vn66/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "vn66",
+    "keyboard_name": "VN66",
+    "manufacturer": "HnahKB",
     "url": "fb.com/groups/VietNamMechKey/",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA2C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/holyswitch/southpaw75/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       0x484F // "HO" short for Holy Switch
-#define PRODUCT_ID      0x5350 // "SP" short for Southpaw
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    drewguy
-#define PRODUCT         southpaw default
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 9

keyboards/holyswitch/southpaw75/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Southpaw75",
+    "keyboard_name": "southpaw default",
+    "manufacturer": "drewguy",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x484F",
+        "pid": "0x5350",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/horizon/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 Steven Karrmann
-#define PRODUCT      Horizon
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14

keyboards/horizon/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Horizon",
+  "manufacturer": "Steven Karrmann",
   "url": "https://github.com/skarrmann/horizon",
   "maintainer": "Steven Karrmann",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/horrortroll/chinese_pcb/black_e65/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516
-#define PRODUCT_ID      0x6003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    HorrorTroll
-#define PRODUCT         Black E6.5
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/horrortroll/chinese_pcb/black_e65/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Devil68 Pro",
+    "keyboard_name": "Black E6.5",
+    "manufacturer": "HorrorTroll",
     "url": "",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x6003",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/horrortroll/chinese_pcb/devil68_pro/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516
-#define PRODUCT_ID      0x6001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    HorrorTroll
-#define PRODUCT         Devil68 Pro
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/horrortroll/chinese_pcb/devil68_pro/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Devil68 Pro",
+    "manufacturer": "HorrorTroll",
     "url": "",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x6001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [

keyboards/horrortroll/handwired_k552/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516
-#define PRODUCT_ID      0x5104
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    HorrorTroll
-#define PRODUCT         K552 Kumara
-
 /* Key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/horrortroll/handwired_k552/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Handwired K552 Kumara",
+    "keyboard_name": "K552 Kumara",
+    "manufacturer": "HorrorTroll",
     "url": "",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x5104",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [

keyboards/horrortroll/lemon40/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516
-#define PRODUCT_ID      0x2434
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    HorrorTroll
-#define PRODUCT         Lemon40
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 7

keyboards/horrortroll/lemon40/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Lemon40",
+    "manufacturer": "HorrorTroll",
     "url": "",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x2434",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/horrortroll/paws60/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    HorrorTroll
-#define PRODUCT         Paws 60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/horrortroll/paws60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Paws 60",
+    "manufacturer": "HorrorTroll",
     "url": "https://github.com/HorrorTroll/KeebProj/tree/default/paws60/pcb/Hotswap",
     "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [

keyboards/hotdox/config.h

@@ -2,15 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-
-#define VENDOR_ID       0x414B // 'AK' for Alpaca Keyboards
-#define PRODUCT_ID      0x0001 // sequentially numbered
-
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alpaca Keyboards
-#define PRODUCT         ErgoDox 76 "HotDox"
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14

keyboards/hotdox/info.json

@@ -1,6 +1,12 @@
 {
-    "keyboard_name": "HotDox",
+    "keyboard_name": "Ergodox 76 \"HotDox\"",
+    "manufacturer": "Alpaca Keyboards",
     "maintainer": "layne001365",
+    "usb": {
+      "vid": "0x414B",
+      "pid": "0x0001",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_ergodox": {
 

keyboards/hp69/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       0x416B
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0011
-#define MANUFACTURER    Desiboards
-#define PRODUCT         hp69
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/hp69/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "hp69",
+    "manufacturer": "Desiboards",
     "url": "",
     "maintainer": "Ananya Kirti",
+    "usb": {
+        "vid": "0x416B",
+        "pid": "0x0001",
+        "device_version": "0.1.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/hs60/v1/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      0x0257
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         HS60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/hs60/v2/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       0x8968
-#define PRODUCT_ID      0x4854
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         HS60 V2
-
 #define HS60_ANSI
 
 /* key matrix size */

keyboards/hs60/v2/ansi/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "HS60v2",
-  "maintainer": "yiancar",
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
   "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4854",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT_60_ansi": {
       "layout": [

keyboards/hs60/v2/hhkb/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       0x8968
-#define PRODUCT_ID      0x4855
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         HS60 V2
-
 #define HS60_HHKB
 
 /* key matrix size */

keyboards/hs60/v2/hhkb/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "HS60v2",
-  "maintainer": "yiancar",
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
   "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4855",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT_60_hhkb": {
         "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":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":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":0, "y":3, "w":2.25}, {"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":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]

keyboards/hs60/v2/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       0x8968
-#define PRODUCT_ID      0x4853
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         HS60 V2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/hs60/v2/iso/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "HS60v2",
-  "maintainer": "yiancar",
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
   "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4853",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT_60_iso": {
       "layout": [

keyboards/hub16/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 0x6A6A
-#define PRODUCT_ID 0x4810
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Josh Johnson
-#define PRODUCT Hub16
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/hub16/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Hub16",
+    "manufacturer": "Josh Johnson",
     "url": "https://joshajohnson.com/hub16-keyboard/",
     "maintainer": "Josh Johnson",
+    "usb": {
+        "vid": "0x6A6A",
+        "pid": "0x4810",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/hub20/config.h

@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6A6A  // JJ
-#define PRODUCT_ID      0x4414  // H20
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Josh Johnson
-#define PRODUCT         Hub20
-
 /* key matrix */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/hub20/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Hub20",
+    "manufacturer": "Josh Johnson",
     "url": "https://github.com/joshajohnson/hub20",
     "maintainer": "joshajohnson",
+    "usb": {
+      "vid": "0x6A6A",
+      "pid": "0x4414",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_all": {
         "layout": [