Move keyboard USB IDs and strings to data driven: K (#17846)

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

keyboards/k34/config.h

@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
-#define DEVICE_VER   0x0001
-#define MANUFACTURER jp_smasher
-#define PRODUCT      k34
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10

keyboards/k34/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "k34", 
+    "manufacturer": "jp_smasher",
     "url": "https://github.com/wongjingping/k34", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kabedon/kabedon78s/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       0x4B44 //KD
-#define PRODUCT_ID      0x3738 //78
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Kabe_Don
-#define PRODUCT         78S
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18

keyboards/kabedon/kabedon78s/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "KabeDon78s", 
+    "keyboard_name": "78S", 
+    "manufacturer": "Kabe_Don",
     "url": "", 
     "maintainer": "370490639", 
+    "usb": {
+    	"vid": "0x4B44",
+    	"pid": "0x3738",
+    	"device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kabedon/kabedon980/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       0x4B44 //KD
-#define PRODUCT_ID      0x3938 //98
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Kabe_Don
-#define PRODUCT         980
-
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 13

keyboards/kabedon/kabedon980/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "KabeDon980", 
+    "keyboard_name": "980", 
+    "manufacturer": "Kabe_Don",
     "url": "https://kabedon.taobao.com", 
     "maintainer": "370490639", 
+    "usb": {
+    	"vid": "0x4B44",
+    	"pid": "0x3938",
+    	"device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kabedon/kabedon98e/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID      0x4B44
-#define PRODUCT_ID     0x3935
-#define DEVICE_VER     0x0002
-#define MANUFACTURER   Kabe_Don
-#define PRODUCT        98e
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 11

keyboards/kabedon/kabedon98e/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "KabeDon98E",
+    "keyboard_name": "98e",
+    "manufacturer": "Kabe_Don",
     "url": "",
     "maintainer": "370490639",
+    "usb": {
+        "vid": "0x4B44",
+        "pid": "0x3935",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kagizaraya/chidori/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 0x3942
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Kagizaraya
-#define PRODUCT Chidori
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6

keyboards/kagizaraya/chidori/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Chidori",
+    "manufacturer": "Kagizaraya",
     "url": "",
     "maintainer": "ka2hiro",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3942",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kagizaraya/halberd/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      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Kagizaraya
-#define PRODUCT         Halberd
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11

keyboards/kagizaraya/halberd/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Halberd", 
+    "manufacturer": "Kagizaraya",
     "url": "", 
     "maintainer": "ka2hiro", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"!", "x":0, "y":0}, {"label":"@", "x":1, "y":0}, {"label":"#", "x":2, "y":0}, {"label":"$", "x":3, "y":0}, {"label":"%", "x":4, "y":0}, {"label":"Tab", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"_", "x":1, "y":1}, {"label":"+", "x":2, "y":1}, {"label":"|", "x":3, "y":1}, {"label":"~", "x":4, "y":1}, {"label":"BkSp", "x":5, "y":1}, {"label":":", "x":6, "y":1}, {"label":"\"", "x":7, "y":1}, {"label":">", "x":8, "y":1}, {"label":"{", "x":9, "y":1}, {"label":"}", "x":10, "y":1}, {"label":"Caps", "x":0, "y":2}, {"label":"-", "x":1, "y":2}, {"label":"=", "x":2, "y":2}, {"label":"\\", "x":3, "y":2}, {"label":"`", "x":4, "y":2}, {"label":"Enter", "x":5, "y":2}, {"label":";", "x":6, "y":2}, {"label":"'", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":"[", "x":9, "y":2}, {"label":"]", "x":10, "y":2}, {"label":"GUI", "x":2, "y":3}, {"label":"Lower", "x":3, "y":3}, {"label":"Esc", "x":4, "y":3}, {"x":5, "y":3}, {"label":"Shift", "x":6, "y":3}, {"label":"Raise", "x":7, "y":3}, {"label":"Alt", "x":8, "y":3}]

keyboards/kagizaraya/scythe/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      0x3941
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Kagizaraya
-#define PRODUCT         Scythe
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

keyboards/kakunpc/angel64/alpha/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0A64
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    kakunpc
-#define PRODUCT         angel64
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6

keyboards/kakunpc/angel64/rev1/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0A64
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    kakunpc
-#define PRODUCT         angel64
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6

keyboards/kakunpc/business_card/alpha/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    kakunpc
-#define PRODUCT         business_card
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/kakunpc/business_card/alpha/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "business_card alpha",
+    "manufacturer": "kakunpc",
     "url": "",
     "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kakunpc/business_card/beta/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    kakunpc
-#define PRODUCT         business_card
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 2

keyboards/kakunpc/business_card/beta/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "business_card beta",
+    "manufacturer": "kakunpc",
     "url": "",
     "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kakunpc/choc_taro/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
-   VID & PID are lisenced from microchip sublisence program, Don't use other project! */
-#define VENDOR_ID 0x04D8
-#define PRODUCT_ID 0xEB60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kakunpc
-#define PRODUCT choc_taro
-
 /* key matrix size */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 5

keyboards/kakunpc/choc_taro/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "choc_taro",
+    "manufacturer": "kakunpc",
     "url": "https://kakunpc.booth.pm/",
     "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB60",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/kakunpc/rabbit_capture_plan/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
-   VID & PID are lisenced from microchip sublisence program, Don't use other project! */
-#define VENDOR_ID    0x04D8
-#define PRODUCT_ID   0xEB59
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kakunpc
-#define PRODUCT      rabbit_capture_plan
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/kakunpc/rabbit_capture_plan/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rabbit_capture_plan",
+    "manufacturer": "kakunpc",
     "url": "https://kakunpc.booth.pm/",
     "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB59",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/kakunpc/suihankey/alpha/config.h

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

keyboards/kakunpc/suihankey/alpha/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "suihankey",
+    "keyboard_name": "Suihankey",
+    "manufacturer": "kakunpc",
     "url": "https://kakunpc.booth.pm/",
     "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kakunpc/suihankey/rev1/config.h

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

keyboards/kakunpc/suihankey/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "suihankey",
+    "keyboard_name": "Suihankey",
+    "manufacturer": "kakunpc",
     "url": "https://kakunpc.booth.pm/",
     "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kakunpc/thedogkeyboard/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 kakunpc
-#define PRODUCT thedogkeyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 20
 #define MATRIX_COLS 6

keyboards/kapcave/arya/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       0x4B43
-#define PRODUCT_ID      0x4152
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KapCave
-#define PRODUCT         Arya
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 8

keyboards/kapcave/arya/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Arya", 
+    "manufacturer": "KapCave",
     "url": "https://kapcave.com/products/arya", 
     "maintainer": "nachie", 
+    "usb": {
+        "vid": "0x4B43",
+        "pid": "0x4152",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [

keyboards/kapcave/gskt00/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       0x4B43
-#define PRODUCT_ID      0x6061
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KapCave
-#define PRODUCT         GSKT00
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/kapcave/paladin64/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       0x4B43
-#define PRODUCT_ID      0x5036
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KapCave
-#define PRODUCT         paladin64
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/kb58/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 beanaccle
-#define PRODUCT      kb58
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

keyboards/kb58/info.json

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

keyboards/kb_elmo/67mk_e/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    0xA68C
-#define PRODUCT_ID   0xD03E
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb_elmo
-#define PRODUCT      67mk_E
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/kb_elmo/67mk_e/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "67mk_e", 
+    "keyboard_name": "67mk_E", 
+    "manufacturer": "kb_elmo",
     "url": "", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xD03E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/kb_elmo/aek2_usb/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 0xA68C
-#define PRODUCT_ID 0xDB52
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT AEK II USB
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 14

keyboards/kb_elmo/aek2_usb/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "aek 2 usb", 
+    "keyboard_name": "AEK II USB", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/aek2_usb", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDB52",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kb_elmo/elmopad/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 0xA68C
-#define PRODUCT_ID 0x8B35
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT ElmoPad
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/kb_elmo/elmopad/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "elmopad",
+    "keyboard_name": "ElmoPad",
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/numpad",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x8B35",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [

keyboards/kb_elmo/isolation/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    0xA68C
-#define PRODUCT_ID   0x4EE6
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT      ISOlation
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

keyboards/kb_elmo/isolation/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "isolation",
+    "keyboard_name": "ISOlation",
+    "manufacturer": "kb-elmo",
     "url": "",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x4EE6",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kb_elmo/m0110a_usb/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 0xA68C
-#define PRODUCT_ID 0xDB4B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT M0110A USB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 17

keyboards/kb_elmo/m0110a_usb/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "m0110a usb", 
+    "keyboard_name": "M0110A USB", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/m0110a_usb", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDB4B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kb_elmo/m0116_usb/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 0xA68C
-#define PRODUCT_ID 0x8F7E
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT M0116 USB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18

keyboards/kb_elmo/m0116_usb/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "m0116 usb", 
+    "keyboard_name": "M0116 USB", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/m0116_usb", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x8F7E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kb_elmo/noah_avr/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    0xA68C
-#define PRODUCT_ID   0x1DB0
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT      Noah AVR
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/kb_elmo/noah_avr/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Noah AVR",
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/noah_avr",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x1DB0",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_ansi": "LAYOUT_65_ansi_blocker",
         "LAYOUT_ansi_splitbs": "LAYOUT_65_ansi_blocker_split_bs",

keyboards/kb_elmo/qez/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    0xA68C
-#define PRODUCT_ID   0x675F
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb_elmo
-#define PRODUCT      QEZ
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10

keyboards/kb_elmo/qez/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "qez",
+    "keyboard_name": "QEZ",
+    "manufacturer": "kb_elmo",
     "url": "",
     "maintainer": "kb-elmo<mail@elmo.space>",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x675F",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [

keyboards/kb_elmo/sesame/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 0xA68C
-#define PRODUCT_ID 0xE2BD
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT Sesame
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kb_elmo/sesame/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "sesame",
+  "keyboard_name": "Sesame",
+  "manufacturer": "kb-elmo",
   "url": "https://github.com/kb-elmo/sesame",
   "maintainer": "kb-elmo",
+  "usb": {
+    "vid": "0xA68C",
+    "pid": "0xE2BD",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_alice": {
       "layout": [

keyboards/kb_elmo/twelvekey/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    0xA68C
-#define PRODUCT_ID   0x9879
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT      Twelvekey
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 4

keyboards/kb_elmo/twelvekey/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "twelvekey", 
+    "keyboard_name": "Twelvekey", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/twelvekey", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x9879",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_3x4": {
             "layout": [{"x":0, "y":0},

keyboards/kb_elmo/vertex/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    0xA68C
-#define PRODUCT_ID   0x6B47
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb_elmo
-#define PRODUCT      Vertex
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/kb_elmo/vertex/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "vertex",
+    "keyboard_name": "Vertex",
+    "manufacturer": "kb_elmo",
     "url": "",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x6B47",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_8keys": {
             "layout": [

keyboards/kbdclack/kaishi65/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 0x1A81
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KBDClack
-#define PRODUCT kaishi65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/baguette66/rgb/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x0106
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BAGUETTE66RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/baguette66/soldered/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x0107
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BAGUETTE66_SOLDERED
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/bella/rgb/config.h

@@ -16,12 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x0008
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BELLA RGB ANSI
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/kbdfans/bella/rgb_iso/config.h

@@ -16,12 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x0009
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BELLA RGB ISO
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/kbdfans/bella/soldered/config.h

@@ -16,12 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BELLA SOLDERED
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/kbdfans/bella/soldered/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "bella_soldered",
+    "keyboard_name": "Bella Soldered",
+    "manufacturer": "KBDfans",
     "url": "",
     "maintainer": "kbdfans",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/kbdfans/boop65/rgb/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x1000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BOOP65RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/boop65/rgb/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "boop65_rgb", 
+  "keyboard_name": "Boop65 RGB", 
+  "manufacturer": "KBDfans",
   "url": "", 
   "maintainer": "moyi4681", 
+  "usb": {
+    "vid": "0x4B42",
+    "pid": "0x1000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_65_ansi_blocker": {
           "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, "w":2}, {"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":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":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/kbdfans/bounce/75/hotswap/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x7001
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BOUNCE75_HOTSWAP
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/kbdfans/bounce/75/soldered/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x7000
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         BOUNCE75_SOLDERED
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/kbdfans/bounce/75/soldered/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "bounce75soldered",
+    "keyboard_name": "Bounce75 Soldered",
+    "manufacturer": "KBDfans",
     "url": "",
     "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x7000",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/kbdfans/bounce/pad/config.h

@@ -16,11 +16,7 @@
 
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x7002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDfans
-#define PRODUCT         BOUNCE_PAD
+
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 }

keyboards/kbdfans/bounce/pad/info.json

@@ -1,6 +1,12 @@
 {
-    "keyboard_name": "bouncepad", 
+    "keyboard_name": "Bounce Pad", 
+    "manufacturer": "KBDfans",
     "maintainer": "moyi4681", 
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x7002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [

keyboards/kbdfans/kbd19x/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       0x4B42
-#define PRODUCT_ID      0x0191
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFans
-#define PRODUCT         kbd19x
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 13

keyboards/kbdfans/kbd19x/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "KBD19x",
+    "manufacturer": "KBDfans",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd19x",
     "maintainer": "jshuf, mechmerlin",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0191",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [

keyboards/kbdfans/kbd4x/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    KBDFans
-#define PRODUCT         KBD4x
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/kbdfans/kbd4x/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "kbd4x",
+    "keyboard_name": "KBD4x",
+    "manufacturer": "KBDfans",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_planck_mit": {
             "layout": [

keyboards/kbdfans/kbd66/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      0xBD66
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFans
-#define PRODUCT         KBD66
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/kbdfans/kbd67/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       0x4B42
-#define PRODUCT_ID      0x6065
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFans
-#define PRODUCT         KBD67 Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/kbd67/hotswap/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "kbd67 hotswap", 
+    "keyboard_name": "KBD67 Hotswap", 
+    "manufacturer": "KBDFans",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6065",
+        "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":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":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/kbdfans/kbd67/mkii_soldered/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       0xA103 // ai03
-#define PRODUCT_ID      0x0013
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDfans
-#define PRODUCT         KBD67-MKII
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/kbd67/mkii_soldered/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "KBD67 MKII Soldered Variant", 
+    "keyboard_name": "KBD67-MKII Soldered", 
+    "manufacturer": "KBDfans",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0013",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"~", "x":0, "y":0}, 

keyboards/kbdfans/kbd67/mkiirgb_iso/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x0105
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         KBD67MKIIRGB_ISO
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/kbdfans/kbd67/mkiirgb_iso/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "kbd67mkiirgb_iso",
+    "keyboard_name": "KBD67MKIIRGB ISO",
+    "manufacturer": "KBDfans",
     "url": "",
     "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0105",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_iso_blocker": {
             "layout": [

keyboards/kbdfans/kbd67/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       0x4B42
-#define PRODUCT_ID      0x6066
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    kbdfans
-#define PRODUCT         kbd67
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/kbdfans/kbd67/rev1/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "kbd67",
+  "keyboard_name": "KBD67 Rev1",
+  "manufacturer": "KBDfans",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4B42",
+    "pid": "0x6066",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_all": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "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":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

keyboards/kbdfans/kbd67/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       0x4B42
-#define PRODUCT_ID      0x6067
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    KBDFans
-#define PRODUCT         KBD67v2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/kbdfans/kbd67/rev2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "kbd67v2",
+    "keyboard_name": "KBD67 Rev2",
+    "manufacturer": "KBDfans",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6067",
+        "device_version": "0.0.2"
+    },
     "layout_aliases": {
         "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs"
     },

keyboards/kbdfans/kbd6x/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       0x4B42
-#define PRODUCT_ID      0x3658
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    You
-#define PRODUCT         kbd6x
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14