Move keyboard USB IDs and strings to data driven: D (#17814)

qmk · Jul 30, 2022 · 306e50b · 306e50b
1 parent d1096ad
commit 306e50b
Show file tree

Hide file tree

Showing 130 changed files with 392 additions and 460 deletions.
diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5946 // YF
-#define PRODUCT_ID 0x0008
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT owl8
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 16

diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "owl8",
+ "manufacturer": "yfuku",
  "url": "",
  "maintainer": "yfuku",
+ "usb": {
+ "vid": "0x5946",
+ "pid": "0x0008",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h
@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xBF00
-#define PRODUCT_ID 0xBF22
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Daji
-#define PRODUCT Seis Cinco
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

diff --git a/keyboards/daji/seis_cinco/info.json b/keyboards/daji/seis_cinco/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Seis Cinco",
+ "manufacturer": "Daji",
  "url": "",
  "maintainer": "toraifu",
+ "usb": {
+ "vid": "0xBF00",
+ "pid": "0xBF22",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_default": {
  "layout": [

diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
@@ -17,12 +17,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define VENDOR_ID 0xFAAD
-#define PRODUCT_ID 0x422D
-#define DEVICE_VER 0x0200
-#define MANUFACTURER HNB
-#define PRODUCT DB63v1 Hotswap
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
 

diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "db63",
+ "keyboard_name": "DB63v1 Hotswap",
+ "manufacturer": "HNB",
  "url": "http:https://www.keyboard-layout-editor.com/#/gists/dadea703fc8bfc87dc7c480de9f3ef38",
  "maintainer": "QMK Community",
+ "usb": {
+ "vid": "0xFAAD",
+ "pid": "0x422D",
+ "device_version": "2.0.0"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/dc01/arrow/config.h b/keyboards/dc01/arrow/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x8968
-#define PRODUCT_ID 0x1012
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Mechboards
-#define PRODUCT DC01 Arrow
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 3

diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "DC01 Arrow Cluster",
+ "keyboard_name": "DC01 Arrow",
+ "manufacturer": "Mechboards",
  "url": "",
  "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1012",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_all": {
  "layout": [{"label":"Insert", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Delete", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"\u2191", "x":1, "y":3}, {"label":"\u2190", "x":0, "y":4}, {"label":"\u2193", "x":1, "y":4}, {"label":"\u2192", "x":2, "y":4}]

diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x8968
-#define PRODUCT_ID 0x1010
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Mechboards
-#define PRODUCT DC01 Left
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 21

diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "DC01 Left Half",
+ "keyboard_name": "DC01 Left",
+ "manufacturer": "Mechboards",
  "url": "",
  "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1010",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_ansi": {
  "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "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":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"Num Lock", "x":18.5, "y":0}, {"label":"/", "x":19.5, "y":0}, {"label":"*", "x":20.5, "y":0}, {"label":"-", "x":21.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "y":1}, {"label":"7", "x":18.5, "y":1}, {"label":"8", "x":19.5, "y":1}, {"label":"9", "x":20.5, "y":1}, {"label":"+", "x":21.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":18.5, "y":2}, {"label":"5", "x":19.5, "y":2}, {"label":"6", "x":20.5, "y":2}, {"label":"+", "x":21.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Shift", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"1", "x":18.5, "y":3}, {"label":"2", "x":19.5, "y":3}, {"label":"3", "x":20.5, "y":3}, {"label":"Enter", "x":21.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"label":"Fn", "x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}, {"label":"0", "x":18.5, "y":4}, {"label":"00", "x":19.5, "y":4}, {"label":".", "x":20.5, "y":4}, {"label":"Enter", "x":21.5, "y":4}]

diff --git a/keyboards/dc01/numpad/config.h b/keyboards/dc01/numpad/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x8968
-#define PRODUCT_ID 0x1013
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Mechboards
-#define PRODUCT DC01 Numpad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "DC01 Numpad",
+ "manufacturer": "Mechboards",
  "url": "",
  "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1013",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_numpad_5x4": {
  "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]

diff --git a/keyboards/dc01/right/config.h b/keyboards/dc01/right/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x8968
-#define PRODUCT_ID 0x1011
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Mechboards
-#define PRODUCT DC01 Right
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 8

diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "DC01 Right Half",
+ "keyboard_name": "DC01 Right",
+ "manufacturer": "Mechboards",
  "url": "",
  "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1011",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_all": {
  "layout": [{"label":"&", "x":0.5, "y":0}, {"label":"*", "x":1.5, "y":0}, {"label":"(", "x":2.5, "y":0}, {"label":")", "x":3.5, "y":0}, {"label":"_", "x":4.5, "y":0}, {"label":"+", "x":5.5, "y":0}, {"label":"Back", "x":6.5, "y":0}, {"label":"Del", "x":7.5, "y":0}, {"label":"Y", "x":0, "y":1}, {"label":"U", "x":1, "y":1}, {"label":"I", "x":2, "y":1}, {"label":"O", "x":3, "y":1}, {"label":"P", "x":4, "y":1}, {"label":"{", "x":5, "y":1}, {"label":"}", "x":6, "y":1}, {"label":"|", "x":7, "y":1, "w":1.5}, {"label":"H", "x":0.25, "y":2}, {"label":"J", "x":1.25, "y":2}, {"label":"K", "x":2.25, "y":2}, {"label":"L", "x":3.25, "y":2}, {"label":":", "x":4.25, "y":2}, {"label":"@", "x":5.25, "y":2}, {"label":"~", "x":6.25, "y":2}, {"label":"Enter", "x":7.25, "y":2, "w":1.25}, {"label":"N", "x":0.75, "y":3}, {"label":"M", "x":1.75, "y":3}, {"label":"<", "x":2.75, "y":3}, {"label":">", "x":3.75, "y":3}, {"label":"?", "x":4.75, "y":3}, {"label":"Shift", "x":5.75, "y":3, "w":1.75}, {"label":"Shift", "x":7.5, "y":3}, {"label":"Fn", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":2.25}, {"label":"AltGr", "x":3.5, "y":4, "w":1.25}, {"label":"Win", "x":4.75, "y":4, "w":1.25}, {"label":"Menu", "x":6, "y":4, "w":1.25}, {"label":"Ctrl", "x":7.25, "y":4, "w":1.25}]

diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
@@ -22,12 +22,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x444E // "DN"
-#define PRODUCT_ID 0x4450 // "DP"
-#define DEVICE_VER 0x0001 // 1.0
-#define MANUFACTURER dekuNukem
-#define PRODUCT duckyPad
-
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 17
 

diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "duckyPad",
+ "manufacturer": "dekuNukem",
  "url": "https://github.com/dekuNukem/",
  "maintainer": "M4cs",
+ "usb": {
+ "vid": "0x444E",
+ "pid": "0x4450",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x9906
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER delikeeb
-#define PRODUCT Flatbread60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12

diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "flatbread60",
+ "keyboard_name": "Flatbread60",
+ "manufacturer": "delikeeb",
  "url": "",
  "maintainer": "noclew",
+ "usb": {
+ "vid": "0x9906",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_ortho_5x12": {
  "layout": [

diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x9906
-#define PRODUCT_ID 0x0011
-#define DEVICE_VER 0x0003
-#define MANUFACTURER dELIKEEb
-#define PRODUCT Vaguette Lite
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 12

diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "vaguettelite",
+ "keyboard_name": "Vaguette Lite",
+ "manufacturer": "dELIKEEb",
  "url": "",
  "maintainer": "noclew",
+ "usb": {
+ "vid": "0x9906",
+ "pid": "0x0011",
+ "device_version": "0.0.3"
+ },
  "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":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, "w":1.5}, {"x":13, "y":1}, {"x":14, "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, "w":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3, "w":1.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4}, {"x":4.5, "y":4, "w":1.25}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4, "w":1.25}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]

diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x9906
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER noclew
-#define PRODUCT Vaneela
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12

diff --git a/keyboards/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Vaneela",
+ "manufacturer": "noclew",
  "url": "http:https://www.keyboard-layout-editor.com/#/gists/be89ff3a761a44280296994d459bd0a9",
  "maintainer": "qmk",
+ "usb": {
+ "vid": "0x9906",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x9906
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER delikeeb
-#define PRODUCT VaneelaEx
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 12

diff --git a/keyboards/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "VaneelaEx",
+ "manufacturer": "delikeeb",
  "url": "http:https://www.keyboard-layout-editor.com/#/gists/f605c1a2cb2fea256161964740bd2a52",
  "maintainer": "qmk",
+ "usb": {
+ "vid": "0x9906",
+ "pid": "0x0002",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_ss_6x12": {
  "layout": [

diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0123
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Richard Snijder
-#define PRODUCT deltapad
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

diff --git a/keyboards/deltapad/info.json b/keyboards/deltapad/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "deltapad",
+ "manufacturer": "Richard Snijder",
  "url": "",
  "maintainer": "Richard Snijder",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0123",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_ortho_4x4": {
  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]

diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F6A
-#define PRODUCT_ID 0x6475
-#define DEVICE_VER 0x0001 
-#define PRODUCT Demiurge
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 17

diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Demiurge",
+ "manufacturer": "ojthetiny",
  "url": "",
  "maintainer": "ojthetiny",
+ "usb": {
+ "vid": "0x6F6A",
+ "pid": "0x6475",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_all": {
  "layout": [