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

keyboards/yampad/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       0x5950 // YP
-#define PRODUCT_ID      0x8369
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mattia Dal Ben
-#define PRODUCT         Yampad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/yampad/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Yampad",
+    "manufacturer": "Mattia Dal Ben",
     "url": "",
     "maintainer": "mattdibi",
+    "usb": {
+        "vid": "0x5950",
+        "pid": "0x8369",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/yanghu/unicorne/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0204
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yanghu
-#define PRODUCT unicorne
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/yanghu/unicorne/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Unicorne",
+  "manufacturer": "yanghu",
   "url": "https://github.com/yanghu/unicorne",
   "maintainer": "yanghu",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0204",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_unicorne": {
       "layout": [

keyboards/yatara/drink_me/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5961 // "Ya" - Yatara
-#define PRODUCT_ID      0x1470
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yatara
-#define PRODUCT         Drink Me
-
 /* Key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 4

keyboards/yatara/drink_me/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Drink Me",
+  "manufacturer": "Yatara",
   "url": "https://github.com/yatara-cc",
   "maintainer": "yatara-cc",
+  "usb": {
+    "vid": "0x5961",
+    "pid": "0x1470",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/ydkb/chili/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       0x5945 // "YE"
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YDKB
-#define PRODUCT         Chili
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 10

keyboards/ydkb/grape/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5945 // "YE"
-#define PRODUCT_ID      0x6772 // "GR"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YDKB
-#define PRODUCT         Grape
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 18

keyboards/ydkb/grape/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Grape",
+    "manufacturer": "YDKB",
     "url": "https://item.taobao.com/item.htm?id=642205244150",
     "maintainer": "Gacathon",
+    "usb": {
+        "vid": "0x5945",
+        "pid": "0x6772",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/ydkb/just60/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 0x1960
-#define DEVICE_VER 0x0001
-#define MANUFACTURER YDKB
-#define PRODUCT Just60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/ydkb/just60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Just60",
+    "manufacturer": "YDKB",
     "url": "",
     "maintainer": "thinxer",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1960",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ydkb/yd68/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      0x0002
-#define MANUFACTURER    YANG
-#define PRODUCT         YD68v2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/yeehaw/config.h

@@ -17,14 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5351
-#define PRODUCT_ID      0x5458
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    squashkb
-#define PRODUCT         Yeehaw
-
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 14

keyboards/yeehaw/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Yeehaw", 
+  "manufacturer": "squashkb",
   "url": "https://squashkb.com/product/yeehaw", 
   "maintainer": "Tsquash", 
+  "usb": {
+    "vid": "0x5351",
+    "pid": "0x5458",
+    "device_version": "1.0.0"
+  },
   "layouts": {
       "LAYOUT": {
           "layout": [{"label":"VOLU", "x":1, "y":0}, {"label":"VOLD", "x":1, "y":1}, {"label":"M1", "x":2, "y":1.5}, {"label":"UP", "x":3, "y":1.5}, {"label":"MNXT", "x":1, "y":2}, {"label":"M2", "x":4, "y":2}, {"label":"LEFT", "x":2, "y":2.5}, {"label":"DOWN", "x":3, "y":2.5}, {"label":"MO(1)", "x":0, "y":2.75}, {"label":"MPRV", "x":1, "y":3}, {"label":"RIGHT", "x":4, "y":3}, {"label":"MPLY", "x":2, "y":3.5}, {"label":"CTL S", "x":3, "y":3.5}, {"label":"RGB TOG", "x":2.5, "y":4.5}]

keyboards/yiancardesigns/barleycorn/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       0x8968
-#define PRODUCT_ID      0x4749
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         Barleycorn
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18

keyboards/yiancardesigns/barleycorn/info.json

@@ -1,6 +1,12 @@
 {
     "keyboard_name": "Barleycorn",
+    "manufacturer": "Yiancar-Designs",
     "maintainer": "Yiancar",
+    "usb": {
+      "vid": "0x8968",
+      "pid": "0x4749",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_all": {
         "layout": [

keyboards/yiancardesigns/gingham/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       0x8968
-#define PRODUCT_ID      0x4748
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         Gingham
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/yiancardesigns/seigaiha/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       0x8968
-#define PRODUCT_ID      0x4750
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         Seigaiha
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/yiancardesigns/seigaiha/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Seigaiha",
+    "manufacturer": "Yiancar-Designs",
     "url": "www.yiancar-designs.com",
     "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4750",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [

keyboards/ymdk/bface/config.h

@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0x4266 // "Bf"
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    YMDK
-#define PRODUCT         B.face
-
 /* matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/ymdk/melody96/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594d // "YM"
-#define PRODUCT_ID      0x4D96 // "M" + 96
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YMDK
-#define PRODUCT         Melody96
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9

keyboards/ymdk/melody96/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "melody96",
+    "keyboard_name": "Melody96",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x4D96",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all",
         "LAYOUT_hotswap": "LAYOUT_96_ansi"

keyboards/ymdk/np21/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    0x594D // "YM"
-#define PRODUCT_ID   0x5021 // "P" 21
-#define DEVICE_VER   0x0200
-#define MANUFACTURER YMDK
-#define PRODUCT      NP21
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 6

keyboards/ymdk/np21/info.json

@@ -1,6 +1,12 @@
 {
-    "keyboard_name": "YMDK NP21",
+    "keyboard_name": "NP21",
+    "manufacturer": "YMDK",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x5021",
+        "device_version": "2.0.0"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [

keyboards/ymdk/np24/u4rgb6/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594D
-#define PRODUCT_ID      0x5024
-#define DEVICE_VER      0x0406
-#define MANUFACTURER    YMDK
-#define PRODUCT         NP24 U4 RGB6
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/ymdk/np24/u4rgb6/info.json

@@ -1,6 +1,12 @@
 {
-    "keyboard_name": "YMDK NP24 U4 RGB6",
+    "keyboard_name": "NP24 U4 RGB6",
+    "manufacturer": "YMDK",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x5024",
+        "device_version": "4.0.6"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [

keyboards/ymdk/sp64/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       0x594D
-#define PRODUCT_ID      0x5364
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    YMDK
-#define PRODUCT SP64
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 

keyboards/ymdk/sp64/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "YMDK_SP64",
+    "keyboard_name": "SP64",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "walston",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x5364",
+        "device_version": "2.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ymdk/wings/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0x2975 // "WING"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YMDK
-#define PRODUCT         WINGS
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/ymdk/wings/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "YMDK Wings",
+    "keyboard_name": "WINGS",
+    "manufacturer": "YMDK",
     "url": "http://ymdkey.com/",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x2975",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/ymdk/wingshs/config.h

@@ -15,13 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0x4975 // "WINGHS"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YMDK
-#define PRODUCT         WINGS HOTSWAP
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/ymdk/wingshs/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "YMDK Wings Hotswap",
+    "keyboard_name": "WINGS HOTSWAP",
+    "manufacturer": "YMDK",
     "url": "http://ymdkey.com/",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x4975",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/ymdk/yd60mq/config.h

@@ -2,12 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0x604D // 60 "M"
-#define MANUFACTURER    YMDK
-#define PRODUCT         YD60MQ
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/ymdk/yd60mq/info.json

@@ -1,7 +1,12 @@
 {
     "keyboard_name": "YD60MQ",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x604D"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/ymdk/ym68/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0xD896
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YMDK
-#define PRODUCT         YM68
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/ymdk/ym68/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "YM68",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0xD896",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/ymdk/ymd09/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 0x594D // "YM"
-#define PRODUCT_ID 0x4409 // "D" + 09
-#define DEVICE_VER 0x0001
-#define MANUFACTURER YMDK
-#define PRODUCT YMD09
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/ymdk/ymd09/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "YMD09",
+    "manufacturer": "YMDK",
     "url": "https://www.aliexpress.com/item/4000510880374.html",
     "maintainer": "kaeltis",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x4409",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ymdk/ymd21/v2/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x45D4
-#define PRODUCT_ID      0x0110
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YMDK
-#define PRODUCT         YMD21 v2
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/ymdk/ymd21/v2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "YMD21 v2",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x45D4",
+        "pid": "0x0110",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [

keyboards/ymdk/ymd40/v2/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0x4440 // "D" + 40
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    YMDK
-#define PRODUCT         YMD40 v2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/ymdk/ymd40/v2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ymd40v2",
+    "keyboard_name": "YMD40 v2",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x4440",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [

keyboards/ymdk/ymd67/config.h

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

keyboards/ymdk/ymd67/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ymd67",
+    "keyboard_name": "YMD67",
+    "manufacturer": "YMDK",
     "url": "https://www.aliexpress.com/item/4000311811121.html",
     "maintainer": "SwiftLawnGnome",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ymdk/ymd75/config.h

@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422D
-
-#define MANUFACTURER    YMDK
-#define PRODUCT         YMD75 / MT84
-
 #define BACKLIGHT_LEVELS 12
 
 #define LED_CAPS_LOCK_PIN D1

keyboards/ymdk/ymd75/info.json

@@ -1,7 +1,12 @@
 {
-    "keyboard_name": "ymd75",
+    "keyboard_name": "YMD75 / MT84",
+    "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x20A0",
+        "pid": "0x422D"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ymdk/ymd96/config.h

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

keyboards/yncognito/batpad/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       0x7979
-#define PRODUCT_ID      0x6602
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yncognito
-#define PRODUCT         Batpad
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4

keyboards/yncognito/batpad/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "batpad",
+    "keyboard_name": "Batpad",
+    "manufacturer": "Yncognito",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x7979",
+        "pid": "0x6602",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [

keyboards/yoichiro/lunakey_macro/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    0x5954  // "YT" - Yoichiro Tanaka
-#define PRODUCT_ID   0x0002
-#define DEVICE_VER   0x0001
-#define MANUFACTURER yoichiro
-#define PRODUCT      Lunakey Macro
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 4

keyboards/yoichiro/lunakey_macro/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Lunakey Macro",
+    "manufacturer": "yoichiro",
     "url": "",
     "maintainer": "Yoichiro Tanaka",
+    "usb": {
+        "vid": "0x5954",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/yoichiro/lunakey_mini/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    0x5954  // "YT" - Yoichiro Tanaka
-#define PRODUCT_ID   0x0001
-#define DEVICE_VER   0x0001
-#define MANUFACTURER yoichiro
-#define PRODUCT      Lunakey Mini
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/yoichiro/lunakey_mini/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Lunakey Mini",
+    "manufacturer": "yoichiro",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5954",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x6_4": {
             "layout": [

keyboards/yugo_m/model_m_101/config.h

@@ -20,12 +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      0x8E81  // Yugo-M
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IBM
-#define PRODUCT         Yugo-M (Model M replacement controller)
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 16

keyboards/yushakobo/quick17/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    0x3265
-#define PRODUCT_ID   0x0006
-#define DEVICE_VER   0x0001
-#define MANUFACTURER yushakobo
-#define PRODUCT      quick17
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 6

keyboards/yushakobo/quick17/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "quick17",
+    "manufacturer": "yushakobo",
     "url": "https://shop.yushakobo.jp/products/quick17",
     "maintainer": "yushakobo",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/yushakobo/quick7/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 0x3265
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yushakobo
-#define PRODUCT quick7
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/yushakobo/quick7/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "quick7",
+    "manufacturer": "yushakobo",
     "url": "",
     "maintainer": "yushakobo",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/yynmt/dozen0/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      0xEA4F
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    yynmt
-#define PRODUCT         Dozen0
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 12

keyboards/yynmt/dozen0/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Dozen0",
+  "manufacturer": "yynmt",
   "url": "http://yynmt.com",
   "maintainer": "yynmt",
+  "usb": {
+    "vid": "0x04D8",
+    "pid": "0xEA4F",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/yynmt/kagamidget/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    yynmt
-#define PRODUCT         KagaMidget
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/yynmt/kagamidget/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "KagaMidget",
+  "manufacturer": "yynmt",
   "url": "http://yynmt.com",
   "maintainer": "yynmt",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [