Move keyboard USB IDs and strings to data driven: M (#17859)

keyboards/m10a/config.h

@@ -20,13 +20,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5241 // "RA"
-#define PRODUCT_ID      0x00AA // 10-A
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    RAMA WORKS
-#define PRODUCT         RAMA WORKS M10-A
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 3

keyboards/m10a/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Rama Works X Machine Industries M10-A Macropad",
+    "keyboard_name": "M10-A",
+    "manufacturer": "RAMA WORKS",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x00AA",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/machine_industries/m4_a/config.h

@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x5241 // "RA"
-#define PRODUCT_ID   0x004A // 4-A
-#define DEVICE_VER   0x0001
-#define MANUFACTURER RAMA WORKS
-#define PRODUCT      M4-A
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 2

keyboards/machine_industries/m4_a/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Rama Works M4-A",
+    "keyboard_name": "M4-A",
+    "manufacturer": "RAMA WORKS",
     "url": "http://rama.works",
     "maintainer": "naut",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x004A",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/machkeyboards/mach3/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       0x4D41
-#define PRODUCT_ID      0x4D33
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MachKeyboard
-#define PRODUCT         Mach33
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/machkeyboards/mach3/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mach 3",
+    "manufacturer": "MachKeyboard",
     "url": "https://machkeyboards.com",
     "maintainer": "etiennelepagel",
+    "usb": {
+        "vid": "0x4D41",
+        "pid": "0x4D33",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_3x3": {
             "layout": [

keyboards/macro1/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4C50 // "LP" = Laneware Peripherals
-#define PRODUCT_ID      0x9999
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Laneware Peripherals
-#define PRODUCT         MACRO-1
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/macro1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "MACRO1", 
+    "keyboard_name": "MACRO-1", 
+    "manufacturer": "Laneware Peripherals",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+      "vid": "0x4C50",
+      "pid": "0x9999",
+      "device_version": "0.0.1"
+    },
     "layouts":{
       "LAYOUT_numpad":{
         "layout":[

keyboards/macro3/config.h

@@ -6,13 +6,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xC88B
-#define PRODUCT_ID      0x3388
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DPB
-#define PRODUCT         Macro3
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4

keyboards/macro3/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Macro3",
+    "manufacturer": "DPB",
     "url": "https://github.com/davidphilipbarr/Macropads/tree/main/macro3",
     "maintainer": "@davidphilipbarr",
+    "usb": {
+        "vid": "0xC88B",
+        "pid": "0x3388",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/majistic/config.h

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

keyboards/majistic/info.json

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

keyboards/makrosu/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xAB69
-#define PRODUCT_ID      0x8585
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    valdydesu_
-#define PRODUCT         makrosu
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 6

keyboards/makrosu/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "MakrOSU",
+    "manufacturer": "Valdydesu_",
     "url": "",
     "maintainer": "Valdydesu_",
+    "usb": {
+        "vid": "0xAB69",
+        "pid": "0x8585",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/malevolti/lyra/rev1/config.h

@@ -15,13 +15,6 @@
   */ 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4443  //DC
-#define PRODUCT_ID      0x4C43  //LC
-#define DEVICE_VER      0x3031  //01
-#define MANUFACTURER    Dom
-#define PRODUCT         Lyra
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

keyboards/malevolti/lyra/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "lyra",
+    "keyboard_name": "Lyra",
+    "manufacturer": "Dom",
     "url": "",
     "maintainer": "malevolti",
+    "usb": {
+        "vid": "0x4443",
+        "pid": "0x4C43",
+        "device_version": "30.3.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/malevolti/superlyra/rev1/config.h

@@ -15,13 +15,6 @@
   */ 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4443  //DC
-#define PRODUCT_ID      0x4C53  //LS
-#define DEVICE_VER      0x3031  //01
-#define MANUFACTURER    Dom
-#define PRODUCT         SuperLyra
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18

keyboards/malevolti/superlyra/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "superlyra",
+    "keyboard_name": "SuperLyra",
+    "manufacturer": "Dom",
     "url": "",
     "maintainer": "malevolti",
+    "usb": {
+        "vid": "0x4443",
+        "pid": "0x4C53",
+        "device_version": "30.3.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/manta60/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   0x991D
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kamonanban
-#define PRODUCT      manta60
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

keyboards/manta60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "manta60",
+    "manufacturer": "kamonanban",
     "url": "https://github.com/KamoNanban",
     "maintainer": "kamonanban",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x991D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/manyboard/macro/config.h

@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4D42 // MB
-#define PRODUCT_ID   0x0015 // 15 keys
-#define DEVICE_VER   0x0103
-#define MANUFACTURER Manyboard
-#define PRODUCT      MB_Macro
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

keyboards/manyboard/macro/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "manyboard_macro",
+    "keyboard_name": "MB_Macro",
+    "manufacturer": "Manyboard",
     "url": "https://github.com/WillEhman/qmk_firmware/tree/dev_create_mb_macro",
     "maintainer": "William Ehman",
+    "usb": {
+        "vid": "0x4D42",
+        "pid": "0x0015",
+        "device_version": "1.0.3"
+    },
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [

keyboards/maple_computing/6ball/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       0xCEEB
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    That-Canadian
-#define PRODUCT         6-Ball
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 6

keyboards/maple_computing/6ball/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "6-Ball",
+    "manufacturer": "That-Canadian",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xCEEB",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/maple_computing/c39/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       0xCA17
-#define PRODUCT_ID      0xCA39
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         C39
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 13

keyboards/maple_computing/c39/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "C39", 
+    "manufacturer": "Maple Computing",
     "url": "", 
     "maintainer": "Space Cat", 
+    "usb": {
+        "vid": "0xCA17",
+        "pid": "0xCA39",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Back", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Enter", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Fn", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}]

keyboards/maple_computing/jnao/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       0x1337
-#define PRODUCT_ID      0x6017
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         JNAO Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12

keyboards/maple_computing/jnao/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "JNAO",
+  "manufacturer": "Maple Computing",
   "url": "",
   "maintainer": "That-Canadian",
+  "usb": {
+    "vid": "0x1337",
+    "pid": "0x6017",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_5x12": {
       "layout": [

keyboards/maple_computing/the_ruler/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       0x1337
-#define PRODUCT_ID      0x6007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         The PCB Ruler
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 6

keyboards/maple_computing/the_ruler/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "The Ruler",
+  "manufacturer": "Maple Computing",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x1337",
+    "pid": "0x6007",
+    "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, "w":2}]

keyboards/marksard/leftover30/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 0xDFA8
-#define DEVICE_VER 0x0001
-#define MANUFACTURER marksard
-#define PRODUCT leftover30
-
 /* Encoder */
 #define ENCODERS_PAD_A { F4 }
 #define ENCODERS_PAD_B { F5 }

keyboards/marksard/leftover30/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Leftover30",
+    "manufacturer": "marksard",
     "url": "https://github.com/marksard/Keyboards",
     "maintainer": "marksard",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDFA8",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/marksard/treadstone48/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      0xDFA3
-#define DEVICE_VER      0x0010
-#define MANUFACTURER    marksard
-#define PRODUCT         treadstone48
-
 /* key matrix size */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 6

keyboards/marksard/treadstone48/rev1/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Treadstone48",
+  "manufacturer": "marksard",
   "url": "https://github.com/marksard/Keyboards",
   "maintainer": "marksard",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDFA3",
+    "device_version": "0.1.0"
+  },
   "layouts": {
     "LAYOUT_base": {
       "layout": [

keyboards/marksard/treadstone48/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       0xFEED
-#define PRODUCT_ID      0xDFA3
-#define DEVICE_VER      0x0020
-#define MANUFACTURER    marksard
-#define PRODUCT         treadstone48
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/marksard/treadstone48/rev2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Treadstone48",
+    "manufacturer": "marksard",
     "url": "https://github.com/marksard/Keyboards",
     "maintainer": "marksard",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDFA3",
+        "device_version": "0.2.0"
+    },
     "layouts": {
         "LAYOUT_base": {
             "layout": [

keyboards/massdrop/thekey/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Drop
-#define PRODUCT         The Key
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3

keyboards/massdrop/thekey/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "The Key",
+    "manufacturer": "Drop",
     "url": "https://drop.com/buy/stack-overflow-the-key-macropad",
     "maintainer": "massdrop",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/massdrop/thekey_v2/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Drop
-#define PRODUCT         The Key V2
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3

keyboards/massdrop/thekey_v2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "The Key V2",
+    "manufacturer": "Drop",
     "url": "https://drop.com/buy/stack-overflow-the-key-v2-macropad",
     "maintainer": "massdrop",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/matchstickworks/southpad/config.h

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

keyboards/matchstickworks/southpad/info.json

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

keyboards/matrix/abelx/config.h

@@ -19,13 +19,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID  0x4D58   // MX
-#define PRODUCT_ID 0xAB87   // abelx keyboard
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MATRIX
-#define PRODUCT ABELX
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/matrix/cain_re/config.h

@@ -21,13 +21,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D58   // MX
-#define PRODUCT_ID      0x0106   // cain
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matrix LAB
-#define PRODUCT         Matrix Cain Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 12

keyboards/matrix/falcon/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D58
-#define PRODUCT_ID      0x474E
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matrix Lab 
-#define PRODUCT         Falcon
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13

keyboards/matrix/falcon/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Matrix Lab Falcon",
+    "keyboard_name": "Falcon",
+    "manufacturer": "Matrix Lab",
     "url": "",
     "maintainer": "yulei (Astro)",
+    "usb": {
+        "vid": "0x4D58",
+        "pid": "0x474E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_hhkb": {
             "layout": [

keyboards/matrix/m12og/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    0x4D58
-#define PRODUCT_ID   0x0369
-#define DEVICE_VER   0x0001
-#define MANUFACTURER matrix
-#define PRODUCT      m12og_v1
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/matrix/m12og/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Matrix 8XV1.2 OG rev1",
+    "keyboard_name": "m12og_v1",
+    "manufacturer": "Matrix",
     "url": "",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0x4D58",
+        "pid": "0x0369",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/matrix/m12og/rev2/config.h

@@ -6,13 +6,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D58   // MX
-#define PRODUCT_ID      0x8712   // matrix 1.2 og
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    matrix
-#define PRODUCT         M12OG
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 14

keyboards/matrix/m20add/config.h

@@ -7,13 +7,6 @@
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID  0x4D58   // MX
-#define PRODUCT_ID 0x20AD   // 8XV2.0 Additional
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MATRIX
-#define PRODUCT 8XV2.0 Additional
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/matrix/me/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D58  // MX
-#define PRODUCT_ID      0x454D  // ME
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matrix Lab
-#define PRODUCT         Matrix ME
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/matrix/noah/config.h

@@ -7,13 +7,6 @@
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID  0x4D58   // MX
-#define PRODUCT_ID 0x0065   // noah 65
-#define DEVICE_VER 0x0001
-#define MANUFACTURER matrix
-#define PRODUCT NOAH
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/matrix/noah/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "NOAH",
+  "manufacturer": "Matrix",
   "url": "",
   "maintainer": "astro",
+  "usb": {
+    "vid": "0x4D58",
+    "pid": "0x0065",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_default": {
       "layout": [

keyboards/matthewdias/m3n3van/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       0x6D64
-#define PRODUCT_ID      0x2323
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         m3n3van
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

keyboards/matthewdias/m3n3van/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "m3n3van",
+    "manufacturer": "Matthew Dias",
     "url": "https://github.com/matthewdias/m3n3van/tree/main/rev2",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x2323",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/matthewdias/minim/config.h

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

keyboards/matthewdias/minim/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "minim",
+    "manufacturer": "Matthew Dias",
     "url": "https://github.com/matthewdias/minim",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xAAAA",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/matthewdias/model_v/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       0x6D64
-#define PRODUCT_ID      0x6D76
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         model-v
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/matthewdias/model_v/info.json

@@ -1,6 +1,12 @@
 {
     "keyboard_name": "model-v",
+    "manufacturer": "Matthew Dias",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x6D76",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split": {
             "layout": [

keyboards/matthewdias/txuu/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       0x6D64
-#define PRODUCT_ID      0x2809
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Matthew Dias
-#define PRODUCT         txuu
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/matthewdias/txuu/info.json

@@ -1,6 +1,12 @@
 {
     "keyboard_name": "Txuu", 
+    "manufacturer": "Matthew Dias",
     "maintainer": "matthewdias", 
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x2809",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs"
     },

keyboards/maxipad/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    wootpatoot
-#define PRODUCT         maxipad
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 

keyboards/maxipad/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "maxipad",
+  "manufacturer": "wootpatoot",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_grid": {
           "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}]

keyboards/maxr1998/phoebe/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define PRODUCT         Phoebe
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/maxr1998/phoebe/info.json

@@ -16,6 +16,11 @@
         "key_lock": true,
         "leader": true
     },
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/maxr1998/pulse4k/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Maxr1998
-#define PRODUCT         Pulse 4k
-
 /* Key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/maxr1998/pulse4k/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Pulse 4k",
+  "manufacturer": "Maxr1998",
   "url": "https://github.com/Maxr1998/Pulse_4k",
   "maintainer": "Maxr1998",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [ 

keyboards/mb44/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 0x6d62
-#define PRODUCT_ID 0x6d62
-#define DEVICE_VER 0x0001
-#define MANUFACTURER melonbred
-
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/mb44/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "MB-44",
+    "manufacturer": "melonbred",
     "url": "",
     "maintainer": "melonbred",
+    "usb": {
+        "vid": "0x6D62",
+        "pid": "0x6D62",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [

keyboards/mc_76k/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 0x4D43
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Yiancar-Designs
-#define PRODUCT MC-76K
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14

keyboards/mechanickeys/miniashen40/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D4B // MechanicKeys
-#define PRODUCT_ID      0x6D6E
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MechanicKeys
-#define PRODUCT         MINI ASHEN 40
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

keyboards/mechanickeys/miniashen40/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mini Ashen 40",
+    "manufacturer": "MechanicKeys",
     "url": "",
     "maintainer": "jfescobar18",
+    "usb": {
+        "vid": "0x4D4B",
+        "pid": "0x6D6E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/mechanickeys/undead60m/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4D4B // MechanicKeys
-#define PRODUCT_ID   0x3C4D
-#define DEVICE_VER   0x0001
-#define MANUFACTURER    MechanicKeys
-#define PRODUCT         Undead 60-M
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/mechanickeys/undead60m/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Undead-60M",
+    "keyboard_name": "Undead 60-M",
+    "manufacturer": "MechanicKeys",
     "url": "",
     "maintainer": "jfescobar18",
+    "usb": {
+        "vid": "0x4D4B",
+        "pid": "0x3C4D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/mechbrewery/mb65h/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4252	//BR
-#define PRODUCT_ID      0x0002	//hotswap
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MechBrewery
-#define PRODUCT         MB65H
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/mechbrewery/mb65h/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "mb65h",
+    "keyboard_name": "MB65H",
+    "manufacturer": "MechBrewery",
     "url": "",
     "maintainer": "AnthonyNguyen168",
+    "usb": {
+        "vid": "0x4252",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
 
         "LAYOUT_65_ansi_blocker": {

keyboards/mechbrewery/mb65s/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4252	//BR
-#define PRODUCT_ID      0x3635	//65
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MechBrewery
-#define PRODUCT         MB65S
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/mechbrewery/mb65s/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "mb65s",
+    "keyboard_name": "MB65S",
+    "manufacturer": "MechBrewery",
     "url": "",
     "maintainer": "AnthonyNguyen168",
+    "usb": {
+        "vid": "0x4252",
+        "pid": "0x3635",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechkeys/acr60/config.h

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

keyboards/mechkeys/acr60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ACR60",
+    "manufacturer": "MechKeys",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA60",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_2_shifts": "LAYOUT_all"
     },

keyboards/mechkeys/alu84/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xCA75
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MECHKEYS
-#define PRODUCT         ALU84
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/mechkeys/alu84/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ALU84",
+    "manufacturer": "MechKeys",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA75",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_75_ansi"
     },

keyboards/mechkeys/espectro/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xCA96
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MECHKEYS
-#define PRODUCT         Espectro
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 13

keyboards/mechkeys/espectro/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Espectro",
+  "manufacturer": "MechKeys",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xCA96",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_default": {
       "layout": [

keyboards/mechkeys/mechmini/v1/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       0xFEED
-#define PRODUCT_ID      0xCA40
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MECHKEYS
-#define PRODUCT         Mechmini
-
 /* matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/mechkeys/mechmini/v1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "MechMini v1",
+    "keyboard_name": "MechMini",
+    "manufacturer": "MechKeys",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA40",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/mechkeys/mechmini/v2/config.h

@@ -17,14 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xAF99
-#define PRODUCT_ID      0xCA40
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    MECHKEYS
-#undef PRODUCT
-#define PRODUCT         Mechmini 2
-
 /* key matrix size */
 #undef MATRIX_COLS
 #undef MATRIX_ROWS

keyboards/mechkeys/mechmini/v2/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "MechMini 2",
+  "manufacturer": "MechKeys",
   "url": "https://mechkeys.ca/pages/mechmini-2-guide",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xAF99",
+    "pid": "0xCA40",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT_ortho": {
       "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Caps", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"GUI", "x":3, "y":3}, {"label":"MO(1)", "x":4, "y":3}, {"label":"Space", "x":5, "y":3}, {"label":"Space", "x":6, "y":3}, {"label":"MO(2)", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}]

keyboards/mechkeys/mk60/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    Mechkeys
-#define PRODUCT         mechkeys mk60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/mechkeys/mk60/info.json

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

keyboards/mechlovin/hex6c/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    0x4D4C
-#define PRODUCT_ID   0x6C01
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Mechlovin Studio and Hex Keyboard
-#define PRODUCT      Hex6C
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 21

keyboards/mechlovin/hex6c/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "hex-6C",
+    "keyboard_name": "Hex6C",
+    "manufacturer": "Mechlovin Studio and Hex Keyboard",
     "url": "",
     "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6C01",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/infinity875/config.h

@@ -19,11 +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   0x4D4C // ML
-#define PRODUCT_ID  0x0875
-#define DEVICE_VER  0x0001
-#define PRODUCT     Infinity87.5
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17