Move keyboard USB IDs and strings to data driven, pass 2: D-E (#17956)

keyboards/dailycraft/bat43/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 0x5946 // YF
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT bat43
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/dailycraft/bat43/rev2/info.json → keyboards/dailycraft/bat43/info.json

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

keyboards/dailycraft/bat43/rev1/info.json

@@ -1,69 +0,0 @@
-{
-    "keyboard_name": "bat43",
-    "url": "",
-    "maintainer": "yfuku",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"k00", "x":0, "y":1.43},
-                {"label":"k01", "x":1, "y":1.11},
-                {"label":"k02", "x":2, "y":0.38},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0.05},
-                {"label":"k05", "x":5, "y":0.16},
-
-                {"label":"k40", "x":9, "y":0.16},
-                {"label":"k41", "x":10, "y":0.05},
-                {"label":"k42", "x":11, "y":0},
-                {"label":"k43", "x":12, "y":0.38},
-                {"label":"k44", "x":13, "y":1.11},
-                {"label":"k45", "x":14, "y":1.43},
-
-                {"label":"k10", "x":0, "y":2.43},
-                {"label":"k11", "x":1, "y":2.11},
-                {"label":"k12", "x":2, "y":1.38},
-                {"label":"k13", "x":3, "y":1},
-                {"label":"k14", "x":4, "y":1.05},
-                {"label":"k15", "x":5, "y":1.16},
-
-                {"label":"k30", "x":7, "y":1.16},
-
-                {"label":"k50", "x":9, "y":1.16},
-                {"label":"k51", "x":10, "y":1.05},
-                {"label":"k52", "x":11, "y":1},
-                {"label":"k53", "x":12, "y":1.38},
-                {"label":"k54", "x":13, "y":2.11},
-                {"label":"k55", "x":14, "y":2.43},
-
-                {"label":"k20", "x":0, "y":3.43},
-                {"label":"k21", "x":1, "y":3.11},
-                {"label":"k22", "x":2, "y":2.38},
-                {"label":"k23", "x":3, "y":2},
-                {"label":"k24", "x":4, "y":2.05},
-                {"label":"k25", "x":5, "y":2.16},
-
-                {"label":"k60", "x":9, "y":2.16},
-                {"label":"k61", "x":10, "y":2.05},
-                {"label":"k62", "x":11, "y":2},
-                {"label":"k63", "x":12, "y":2.38},
-                {"label":"k64", "x":13, "y":3.11},
-                {"label":"k65", "x":14, "y":3.43},
-
-                {"label":"k33", "x":4, "y":3.3},
-                {"label":"k34", "x":5, "y":3.3},
-                {"label":"k35", "x":6, "y":3.3},
-
-                {"label":"k70", "x":8, "y":3.3},
-                {"label":"k71", "x":9, "y":3.3},
-                {"label":"k72", "x":10, "y":3.3},
-
-                {"label":"k74", "x":5.1, "y":4.3, "w":0.8, "h":0.8},
-                {"label":"k75", "x":6.1, "y":4.3, "w":0.8, "h":0.8},
-
-                {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8},
-                {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8},
-                {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8}
-            ]
-        }
-    }
-}

keyboards/dailycraft/claw44/rev1/config.h

@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5946 // YF
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT claw44
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/dailycraft/claw44/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Claw44 rev1",
+    "keyboard_name": "claw44",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/sandbox/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 0x5946 // YF
-#define PRODUCT_ID 0x0009
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      sandbox
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 5

keyboards/dailycraft/sandbox/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sandbox rev1",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0009",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/sandbox/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 0x5946 // YF
-#define PRODUCT_ID 0x0011
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      sandbox rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5

keyboards/dailycraft/sandbox/rev2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sandbox rev2",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/stickey4/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 0x5946 // YF
-#define PRODUCT_ID 0x0010
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      stickey4
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 8

keyboards/dailycraft/stickey4/info.json

@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "stickey4",
+    "manufacturer": "yfuku",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    }
+}

keyboards/dailycraft/wings42/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 0x5946 // YF
-#define PRODUCT_ID 0x0003
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      wings42
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/dailycraft/wings42/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "wings42 rev1",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [

keyboards/dailycraft/wings42/rev1_extkeys/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 0x5946 // YF
-#define PRODUCT_ID 0x0004
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      wings42 extkeys
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8

keyboards/dailycraft/wings42/rev1_extkeys/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "wings42 rev1_extkeys",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/wings42/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 0x5946 // YF
-#define PRODUCT_ID 0x0005
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      wings42 rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6

keyboards/dailycraft/wings42/rev2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "wings42 rev2",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0005",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3_2": {
             "layout": [

keyboards/delikeeb/vanana/config.h

@@ -18,7 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-
-#define VENDOR_ID    0x9906
-#define PRODUCT_ID   0x0013
-#define MANUFACTURER dELIKEEb

keyboards/delikeeb/vanana/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "vanana",
+    "manufacturer": "dELIKEEb",
     "url": "",
     "maintainer": "noclew",
+    "usb": {
+        "vid": "0x9906",
+        "pid": "0x0013"
+    },
     "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]

keyboards/delikeeb/vanana/rev1/config.h

@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0001
-#define PRODUCT      Vanana rev1
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12

keyboards/delikeeb/vanana/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Vanana rev1",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/delikeeb/vanana/rev2/config.h

@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0002
-#define PRODUCT      Vanana rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 10

keyboards/delikeeb/vanana/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Vanana rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/delikeeb/waaffle/config.h

@@ -18,7 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-
-#define VENDOR_ID       0x9906
-#define PRODUCT_ID      0x0012
-#define MANUFACTURER    dELIKEEb

keyboards/delikeeb/waaffle/rev3/config.h

@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0003
-#define PRODUCT         Waaffle_rev3
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10

keyboards/delikeeb/waaffle/rev3/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "waaffle",
+    "keyboard_name": "Waaffle rev3",
+    "manufacturer": "dELIKEEb",
     "url": "",
     "maintainer": "noclew",
+    "usb": {
+        "vid": "0x9906",
+        "pid": "0x0012",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_ortho_5x16": {
             "layout":

keyboards/deltasplit75/v2/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      0x3060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    xyxjj
-#define PRODUCT         DeltaSplit75
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 14

keyboards/deltasplit75/info.json → keyboards/deltasplit75/v2/info.json

@@ -1,6 +1,12 @@
 {
     "keyboard_name": "DeltaSplit75",
+    "manufacturer": "xyxjj",
     "maintainer": "xyxjj & itsaferbie",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x3060",
+      "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_v2": {
           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Print", "x":14, "y":0}, {"label":"Scroll", "x":15, "y":0}, {"label":"Pause", "x":16, "y":0}, {"label":"~", "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":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Back", "x":14, "y":1}, {"label":"Trns", "x":15, "y":1}, {"label":"Home", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"PgUp", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Trns", "x":13.75, "y":3}, {"label":"Enter", "x":14.75, "y":3, "w":1.25}, {"label":"PgDn", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"Trns", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"End", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}]

keyboards/duck/octagon/v1/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x444B // Duck ("DK")
-#define PRODUCT_ID      0x4F31 // Octagon V1 ("O1")
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Duck
-#define PRODUCT         Octagon V1
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/duck/octagon/v1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Octagon V1", 
+    "manufacturer": "Duck",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F31",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [

keyboards/duck/octagon/v2/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       0x444B // Duck ("DK")
-#define PRODUCT_ID      0x4F32 // Octagon V2 ("O2")
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Duck
-#define PRODUCT         Octagon V2
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/duck/octagon/v2/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Octagon V2",
+    "manufacturer": "Duck",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F32",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "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":"%", "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":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}]

keyboards/duck/orion/v3/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       0x444B // Duck ("DK")
-#define PRODUCT_ID      0x4F52 // Orion ("OR")
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Duck
-#define PRODUCT         Orion V3
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18

keyboards/duck/orion/info.json → keyboards/duck/orion/v3/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Duck Orion V3", 
+    "keyboard_name": "Orion V3", 
+    "manufacturer": "Duck",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F52",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]

keyboards/dumbpad/config.h

@@ -18,12 +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       0xDEAF
-#define PRODUCT_ID      0x0913
-#define MANUFACTURER    imchipwood
-#define PRODUCT         dumbpad
-
 /* Column/Row IO definitions */
 #define DIODE_DIRECTION COL2ROW
 

keyboards/dumbpad/info.json

@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "dumbpad",
+    "manufacturer": "imchipwood",
+    "url": "https://www.github.com/imchipwood/dumbpad",
+    "maintainer": "imchipwood",
+    "usb": {
+        "vid": "0xDEAF",
+        "pid": "0x0913"
+    }
+}

keyboards/dumbpad/v0x/config.h

@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0007
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5

keyboards/dumbpad/v0x/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v0x",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.0.7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dumbpad/v0x_dualencoder/config.h

@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0006
-
 /* Column/Row IO definitions - dualencoder version is true 4x4 */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

keyboards/dumbpad/v0x_dualencoder/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v0x_dualencoder",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.0.6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dumbpad/v0x_right/config.h

@@ -16,9 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0007
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5

keyboards/dumbpad/v0x_right/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v0x_right",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.0.7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dumbpad/v1x/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v1x",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dumbpad/v1x_dualencoder/config.h

@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0010
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5

keyboards/dumbpad/v1x_dualencoder/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v1x_dualencoder",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dumbpad/v1x_oled/config.h

@@ -15,11 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    imchipwood
-#define PRODUCT         dumbpad
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5

keyboards/dumbpad/v1x_oled/info.json

@@ -1,8 +1,7 @@
 {
-    "keyboard_name": "dumbpad",
-    "keyboard_folder": "dumbpad",
-    "url": "https://www.github.com/keebd/dumbpad",
-    "maintainer": "keebd",
+    "usb": {
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dumbpad/v1x_right/config.h

@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0010
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5

keyboards/dumbpad/v1x_right/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v1x_right",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/durgod/dgk6x/config.h

@@ -18,10 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xD60D
-#define MANUFACTURER    Hoksi Technology
-
 #define WAIT_US_TIMER           GPTD3
 
 /* COL2ROW, ROW2COL*/

keyboards/durgod/dgk6x/galaxy/config.h

@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x6A1A
-#define DEVICE_VER      0x0001
-#define PRODUCT         Galaxy 84 HK gaming x DURGOD (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 6
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }

keyboards/durgod/dgk6x/galaxy/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Galaxy",
+  "keyboard_name": "Galaxy 84 HK gaming x DURGOD (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/Galaxy-75-Modular-Mechanical-Keyboard/dp/B08PDRD8MP",
   "maintainer": "dkjer",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x6A1A",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [

keyboards/durgod/dgk6x/hades/config.h

@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x4AD3
-#define DEVICE_VER      0x0001
-#define PRODUCT         DURGOD Hades (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 5
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }

keyboards/durgod/dgk6x/hades/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Hades",
+  "keyboard_name": "DURGOD Hades (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/gp/product/B08562392T",
   "maintainer": "J-Sully",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x4AD3",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [

keyboards/durgod/dgk6x/venus/config.h

@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x7EC5
-#define DEVICE_VER      0x0001
-#define PRODUCT         DURGOD Venus (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 5
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }

keyboards/durgod/dgk6x/venus/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Venus",
+  "keyboard_name": "DURGOD Venus (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/dp/B07XFP5MMZ",
   "maintainer": "J-Sully",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x7EC5",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [

keyboards/durgod/k3x0/config.h

@@ -19,10 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xD60D
-#define MANUFACTURER    Hoksi Technology
-
 #define WAIT_US_TIMER           GPTD3
 
 /* key matrix size (rows in specific keyboard variant) */

keyboards/durgod/k3x0/k310/base/config.h

@@ -17,7 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT         DURGOD Taurus K310 (QMK)
-#define DEVICE_VER      0x0001 // Base (no backlight)

keyboards/durgod/k3x0/k310/config.h

@@ -19,14 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x3100
-// Taurus K310 models:
-//#define DEVICE_VER      0x0001 // Base (no backlight)
-//#define DEVICE_VER      0x0002 // Corona (white led matrix)
-//#define DEVICE_VER      0x0003 // Aurora (red & blue led matrix)
-//#define DEVICE_VER      0x0004 // Nebula (rgb led matrix)
-
 /* key matrix size (cols in generic keyboard config) */
 #define MATRIX_ROWS 8
 

keyboards/durgod/k3x0/k310/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Taurus K310",
+  "keyboard_name": "DURGOD Taurus K310 (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.durgod.com/page9?product_id=53&_l=en",
   "maintainer": "tylert",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x3100",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [

keyboards/durgod/k3x0/k320/base/config.h

@@ -17,7 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT         DURGOD Taurus K320 (QMK)
-#define DEVICE_VER      0x0001 // Base (no backlight)

keyboards/durgod/k3x0/k320/config.h

@@ -19,14 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x3200
-// Taurus K320 models:
-//#define DEVICE_VER      0x0001 // Base (no backlight)
-//#define DEVICE_VER      0x0002 // Corona (white led matrix)
-//#define DEVICE_VER      0x0003 // Aurora (red & blue led matrix)
-//#define DEVICE_VER      0x0004 // Nebula (rgb led matrix)
-
 /* key matrix size (cols in generic keyboard config) */
 #define MATRIX_ROWS 7
 

keyboards/durgod/k3x0/k320/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Taurus K320",
+  "keyboard_name": "DURGOD Taurus K320 (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.durgod.com/page9?product_id=47&_l=en",
   "maintainer": "dkjer",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x3200",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [

keyboards/dztech/dz60rgb/info.json

@@ -1,7 +1,11 @@
 {
     "keyboard_name": "DZ60RGB",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dztech/dz60rgb/v1/config.h

@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1120
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb/v1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1120",
+        "device_version": "1.0.0"
+    }
+}

keyboards/dztech/dz60rgb/v2/config.h

@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1121
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb/v2/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1121",
+        "device_version": "2.0.0"
+    }
+}

keyboards/dztech/dz60rgb/v2_1/config.h

@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1121
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb/v2_1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1121",
+        "device_version": "2.1.0"
+    }
+}

keyboards/dztech/dz60rgb_ansi/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "dz60rgb_ansi",
+    "keyboard_name": "DZ60RGB_ANSI",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [

keyboards/dztech/dz60rgb_ansi/v1/config.h

@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1220
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_ANSI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb_ansi/v1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1220",
+        "device_version": "1.0.0"
+    }
+}

keyboards/dztech/dz60rgb_ansi/v2/config.h

@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1221
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_ANSI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb_ansi/v2/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1221",
+        "device_version": "2.0.0"
+    }
+}

keyboards/dztech/dz60rgb_ansi/v2_1/config.h

@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1221
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_ANSI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb_ansi/v2_1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1221",
+        "device_version": "2.1.0"
+    }
+}

keyboards/dztech/dz60rgb_wkl/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "dz60rgb_wkl",
+    "keyboard_name": "DZ60RGB_WKL",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [

keyboards/dztech/dz60rgb_wkl/v1/config.h

@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1320
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_WKL
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb_wkl/v1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1320",
+        "device_version": "1.0.0"
+    }
+}

keyboards/dztech/dz60rgb_wkl/v2/config.h

@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1321
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_WKL
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb_wkl/v2/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1321",
+        "device_version": "2.0.0"
+    }
+}

keyboards/dztech/dz60rgb_wkl/v2_1/config.h

@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1321
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_WKL
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/dztech/dz60rgb_wkl/v2_1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1321",
+        "device_version": "2.1.0"
+    }
+}

keyboards/dztech/dz65rgb/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "dz65rgb",
+    "keyboard_name": "DZ65RGB",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [

keyboards/dztech/dz65rgb/v1/config.h

@@ -15,13 +15,6 @@
  */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1420
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ65RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/dztech/dz65rgb/v1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1420",
+        "device_version": "1.0.0"
+    }
+}

keyboards/dztech/dz65rgb/v2/config.h

@@ -15,13 +15,6 @@
  */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1421
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ65RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/dztech/dz65rgb/v2/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1421",
+        "device_version": "2.0.0"
+    }
+}

keyboards/dztech/dz65rgb/v3/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1424
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ65RGBV3
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/dztech/dz65rgb/v3/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1424",
+        "device_version": "3.0.0"
+    }
+}

keyboards/eco/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       0x1337
-#define PRODUCT_ID      0x6006
-#define MANUFACTURER    Bishop Keyboards
-#define PRODUCT         The ECO Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14

keyboards/eco/info.json

@@ -1,7 +1,12 @@
 {
-  "keyboard_name": "ECO",
+  "keyboard_name": "The ECO Keyboard",
+  "manufacturer": "Bishop Keyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x1337",
+    "pid": "0x6006"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}]

keyboards/eco/rev1/config.h

@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../config.h"
 
-#define DEVICE_VER      0x0001
-
 /* ECO V1 pin-out */
 #define MATRIX_ROW_PINS { B1, B6, B2, B3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }

keyboards/eco/rev1/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/eco/rev2/config.h

@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../config.h"
 
-#define DEVICE_VER      0x0002
-
 /* ECO V2.1 pin-out */
 #define MATRIX_ROW_PINS { D7, B5, B4, E6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }

keyboards/eco/rev2/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/edi/hardlight/mk1/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       0xF7E0
-#define PRODUCT_ID      0x2401
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    Everywhere Defense Industries
-#define PRODUCT         Hard Light
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/edi/hardlight/mk1/info.json

@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Hard Light",
+    "manufacturer": "Everywhere Defense Industries",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x2401",
+        "device_version": "0.0.1"
+    }
+}

keyboards/edi/hardlight/mk2/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       0xF7E0
-#define PRODUCT_ID      0x2408
-#define DEVICE_VER      0x0007
-#define MANUFACTURER    Everywhere Defense Industries
-#define PRODUCT         Hard Light Mk 2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8