diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index d83a855572e8..d1edf3284e1c 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xE117
-#define PRODUCT_ID 0x6161
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 0xC7
-#define PRODUCT 61Key
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
@@ -149,4 +142,4 @@ along with this program. If not, see .
/* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json
index 02070e87c906..9ed798c93bcc 100644
--- a/keyboards/0xc7/61key/info.json
+++ b/keyboards/0xc7/61key/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "61Key",
+ "manufacturer": "0xC7",
"url": "",
"maintainer": "RealEmanGaming",
+ "usb": {
+ "vid": "0xE117",
+ "pid": "0x6161",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_60_ansi"
},
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index d134d1ab49dc..3b34af658061 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
// clang-format off
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xCB00
-#define PRODUCT_ID 0x1337
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 0xCB
-#define PRODUCT 1337
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index 25899933cb1a..cd5993ee0d59 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "0xCB 1337",
+ "keyboard_name": "1337",
+ "manufacturer": "0xCB",
"url": "https://0xCB.dev",
"maintainer": "Conor-Burns",
+ "usb": {
+ "vid": "0xCB00",
+ "pid": "0x1337",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index c30450b460dc..9c3a0c664963 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see .
#include "config_common.h"
// clang-format off
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xCB00
-#define PRODUCT_ID 0xA455
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 0xCB
-#define PRODUCT Static
/* key matrix size */
#define MATRIX_ROWS 8
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index 33fa8d265ea2..4a6232abad48 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "0xCB Static",
+ "keyboard_name": "Static",
+ "manufacturer": "0xCB",
"url": "https://0xCB.dev",
"maintainer": "Conor-Burns",
+ "usb": {
+ "vid": "0xCB00",
+ "pid": "0xA455",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index d3e845fec96c..867589a27cb5 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .*/
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0x7C88 // "hw" = haierwangwei2005
-#define PRODUCT_ID 0x7C99 // "10b" = 10bleoledhub
-#define DEVICE_VER 0x0001
-#define MANUFACTURER haierwangwei2005
-#define PRODUCT 10bleoledhub
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index 769c98874d9c..ec468454b135 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "10bleoledhub",
+ "manufacturer": "haierwangwei2005",
"url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
"maintainer": "haierwangwei2005",
+ "usb": {
+ "vid": "0x7C88",
+ "pid": "0x7C99",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 7a7fa56fe50d..3f4f742b480d 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F75 // OU
-#define PRODUCT_ID 0x6873
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 1upkeyboards
-#define PRODUCT 1up60hse
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 7eca93d8a956..d6d87310d6c3 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "1up60hse",
+ "manufacturer": "1upkeyboards",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x6873",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"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":"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":2.75}, {"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":6.25}, {"label":"Alt", "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}]
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index 81fa0e1eb6dd..256af396e538 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -20,13 +20,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F75 // OU
-#define PRODUCT_ID 0x6874 // HT
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 1upkeyboards
-#define PRODUCT 1up60hte
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 830c6e289fde..3a4a716d9668 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "1up60hte",
+ "manufacturer": "1upkeyboards",
"url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
"maintainer": "1upkeyboards",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x6874",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
},
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index c78fc3e52b5f..00cff570b137 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F75 // OU
-#define PRODUCT_ID 0x7267 // RG
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 1upkeyboards
-#define PRODUCT 1UP RGB Underglow PCB
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index 701088c46184..956ccb0afaed 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "1up60rgb",
+ "keyboard_name": "1UP RGB Underglow PCB",
+ "manufacturer": "1upkeyboards",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x7267",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index c0c0a7891b71..354f0680e820 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F75 // "ou"
-#define PRODUCT_ID 0x5516 // "U" 16
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 1upkeyboards
-#define PRODUCT super16
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index 261fde20a630..b437bb503851 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "super16",
+ "manufacturer": "1upkeyboards",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5516",
+ "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/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 4fd4238780a8..77bb89d954f0 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F75 // OU
-#define PRODUCT_ID 0x5517
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 1upkeyboards
-#define PRODUCT super16v2
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 2a384f775d56..891eaf316b49 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -1,10 +1,16 @@
{
"keyboard_name": "super16v2",
+ "manufacturer": "1upkeyboards",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5517",
+ "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}]
}
}
- }
\ No newline at end of file
+ }
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index cac03f6346c0..71621695f4a5 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -19,14 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCA42
-#define DEVICE_VER 0x0001
-#define MANUFACTURER monksoffunk
-#define PRODUCT cassette42
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 6
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index 87c67df95165..4fe088f9e6b1 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "cassette42",
- "url": "http://www.sho-k.co.uk/tech/1246.html",
- "maintainer": "monksoffunk",
+ "keyboard_name": "cassette42",
+ "manufacturer": "monksoffunk",
+ "url": "http://www.sho-k.co.uk/tech/1246.html",
+ "maintainer": "monksoffunk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xCA42",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}]
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index 27a94a00ca70..f6fc6f8c1eaa 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6090
-#define DEVICE_VER 0x0002
-#define MANUFACTURER WoodKeys.click
-#define PRODUCT 2Key2Crawl
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 7
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index cc48e811382b..c2cad9847050 100644
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "2Key2CrawlPad",
+ "keyboard_name": "2Key2Crawl",
+ "manufacturer": "WoodKeys.click",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6090",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h
index d4f656edca92..65a54cba4ab2 100644
--- a/keyboards/30wer/config.h
+++ b/keyboards/30wer/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1234
-#define PRODUCT_ID 0x5678
-#define DEVICE_VER 0x0000
-#define MANUFACTURER 8o7wer
-#define PRODUCT 30wer
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 13
diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json
index 18ea404fd22b..62fee361a075 100644
--- a/keyboards/30wer/info.json
+++ b/keyboards/30wer/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "30wer",
- "url": "",
- "maintainer": "qmk",
+ "keyboard_name": "30wer",
+ "manufacturer": "8o7wer",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x1234",
+ "pid": "0x5678",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 4ca0e830ee86..58010eea5513 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -18,13 +18,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1209
-#define PRODUCT_ID 0x3304
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 3-Key-Ecosystem
-#define PRODUCT 2key2
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 2
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 49caf91b5a3a..79e999cc1608 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "3-Key-Ecosystem 2key2: 2x1 macro-keyboard",
+ "keyboard_name": "2key2",
+ "manufacturer": "3-Key-Ecosystem",
"url": "https://github.com/softplus/3keyecosystem/tree/main/2key2",
"maintainer": "softplus",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x3304",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index d478131e95c0..292854f68f1c 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // 40%
-#define PRODUCT_ID 0x0F25
-#define DEVICE_VER 0x0100
-#define MANUFACTURER di0ib
-#define PRODUCT The 5x5 Keyboard
-
#define USE_SERIAL
/* serial.c configuration for split keyboard */
#define SOFT_SERIAL_PIN D0
diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json
index 1e86454125c7..15995f84797b 100644
--- a/keyboards/40percentclub/25/info.json
+++ b/keyboards/40percentclub/25/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "foobar",
+ "keyboard_name": "The 5x5 Keyboard",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0F25",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index 023df5fc4eee..305e71e542e9 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 40percentclub
-#define PRODUCT 4pack
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 4
diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json
index d328a999c297..e8e0463ab6dc 100644
--- a/keyboards/40percentclub/4pack/info.json
+++ b/keyboards/40percentclub/4pack/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "4pack",
- "url": "",
- "maintainer": "qmk",
+ "keyboard_name": "4pack",
+ "manufacturer": "40percentclub",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index 439aa1b1479e..b74eb62c1e8f 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -4,13 +4,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 //"40 %", since 0x3430 is already registered.
-#define PRODUCT_ID 0x0A0C
-#define DEVICE_VER 0x4444
-#define MANUFACTURER di0ib
-#define PRODUCT The 4x4 Keyboard
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 16
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index 96a08d3fd531..f0e55b4c2340 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "40percent.club 4x4",
+ "keyboard_name": "The 4x4 Keyboard",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0A0C",
+ "device_version": "44.4.4"
+ },
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index c3bb5d6380c7..62d63b8afa4a 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -4,13 +4,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // 40%
-#define PRODUCT_ID 0x05B5
-#define DEVICE_VER 0x0100
-#define MANUFACTURER di0ib
-#define PRODUCT The 5x5 Keyboard
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json
index bb6b836ba991..94ffc2d9d29c 100644
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "40percent.club 5x5",
+ "keyboard_name": "The 5x5 Keyboard",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x05B5",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index ae4ee1bad87d..e402932b2191 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // 40%
-#define PRODUCT_ID 0x0F61
-#define DEVICE_VER 0x0100
-#define MANUFACTURER di0ib
-#define PRODUCT The 6lit Macropad
-
#define USE_SERIAL
/* serial.c configuration for split keyboard */
diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json
index 8308847f6cbe..a844a044e208 100644
--- a/keyboards/40percentclub/6lit/info.json
+++ b/keyboards/40percentclub/6lit/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "6lit",
+ "keyboard_name": "The 6lit Macropad",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0F61",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 1e91d3bd10bb..3f6cb1f10c3c 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // 40%
-#define PRODUCT_ID 0x0F00
-#define DEVICE_VER 0x0100
-#define MANUFACTURER di0ib
-#define PRODUCT The foobar Keyboard
-
#define USE_SERIAL
/* serial.c configuration for split keyboard */
diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
index b825ed0267e1..832e65bfc61c 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "foobar",
+ "keyboard_name": "The foobar Keyboard",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0F00",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_ortho_3x5": {
"layout": [
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 6373ea2e60db..e7062990cb37 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 //"40 %", since 0x3430 is already registered.
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 40 Percent Club
-#define PRODUCT Gherkin
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 6
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index b4600eba0059..86938754494c 100644
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Gherkin",
+ "manufacturer": "40 Percent Club",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_3x10": {
"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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 0c819031da2a..292ac485bd1a 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // 40%
-#define PRODUCT_ID 0x4A1F
-#define DEVICE_VER 0x0100
-#define MANUFACTURER di0ib
-#define PRODUCT half_n_half
-
/* key matrix size */
#define MATRIX_ROWS 4*2
#define MATRIX_COLS 7
diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
index 57a65424f00a..1b7f12940126 100644
--- a/keyboards/40percentclub/half_n_half/info.json
+++ b/keyboards/40percentclub/half_n_half/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "half_n_half",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x4A1F",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
index bacf9eb30f77..bce564c042aa 100644
--- a/keyboards/40percentclub/i75/config.h
+++ b/keyboards/40percentclub/i75/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x0A0C
-#define DEVICE_VER 0x0175
-#define MANUFACTURER di0ib
-#define PRODUCT i75
-
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json
index 7e705cdf8638..1753d4230977 100644
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "i75",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0A0C",
+ "device_version": "1.7.5"
+ },
"layouts": {
"LAYOUT_ortho_5x15": {
"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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "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":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"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/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 3f15523c89ab..3924841b0465 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // "40%", changed since 0x3430 is already officially registered
-#define PRODUCT_ID 0x4C55 // "LU"
-#define DEVICE_VER 0x1001
-#define MANUFACTURER di0ib
-#define PRODUCT Luddite
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 8
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index 45a446e818de..565880a16565 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Luddite",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x4C55",
+ "device_version": "10.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 7ebe5ae1b3d1..2ed8c8719550 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // "40%", changed since 0x3430 is already officially registered
-#define PRODUCT_ID 0x4D68 // "M68"
-#define DEVICE_VER 0x0101
-#define MANUFACTURER di0ib
-#define PRODUCT MF68
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 9
diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json
index 873824edb0df..5a8164bcb44c 100644
--- a/keyboards/40percentclub/mf68/info.json
+++ b/keyboards/40percentclub/mf68/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "MF68",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x4D68",
+ "device_version": "1.0.1"
+ },
"layouts": {
"LAYOUT_68_ansi": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "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":"Backspace", "x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "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}, {"x":15.25, "y":1}, {"x":16.25, "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":"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":2.75}, {"x":15.25, "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":6.25}, {"label":"Alt", "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}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index c6d66a1bb3d0..7d789cff049c 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 //"40 %", to make it consistent with other 40percent.club boards.
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER di0ib
-#define PRODUCT Nano
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 35eff7e960ce..914b32aaa443 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Nano",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_2x4": {
"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}]
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index 87c62673f968..4dfb143e52e7 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 // "40%", changed since 0x3430 is already officially registered
-#define PRODUCT_ID 0x9999
-#define DEVICE_VER 0x9999
-#define MANUFACTURER di0ib
-#define PRODUCT The nein Keyboard
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3
diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json
index 6d948877d167..812853d0fef1 100644
--- a/keyboards/40percentclub/nein/info.json
+++ b/keyboards/40percentclub/nein/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "nein",
+ "keyboard_name": "The nein Keyboard",
+ "manufacturer": "di0ib",
"url": "http://www.40percent.club/2019/04/nein.html",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "vid": "0x9999",
+ "device_version": "99.9.9"
+ },
"layouts": {
"LAYOUT_ortho_3x3": {
"layout": [
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 882da633e074..0fed3daf1110 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x0A0C
-#define DEVICE_VER 0x0444
-#define MANUFACTURER di0ib
-#define PRODUCT The nori Keyboard
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index 9de33d52f04d..536696670523 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "nori",
+ "keyboard_name": "The nori Keyboard",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0xA0C",
+ "device_version": "4.4.4"
+ },
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h
index 6f04d12297c3..1fd3e22f49be 100644
--- a/keyboards/40percentclub/polyandry/config.h
+++ b/keyboards/40percentclub/polyandry/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER di0ib
-#define PRODUCT Polypad
-
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index d0d1a00f86c8..3572b38c233a 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Polyandry",
+ "keyboard_name": "Polypad",
+ "manufacturer": "di0ib",
"url": "",
"maintainer": "QMK",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index edb123c4b9c2..4ddad2efb762 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025 //"40 %", since 0x3430 is already registered.
-#define PRODUCT_ID 0x5350 // "SP"
-#define DEVICE_VER 0x1001
-#define MANUFACTURER di0ib
-#define PRODUCT Six Pack
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index 3e02a01bc2fd..b99c24a61765 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Six Pack",
+ "manufacturer": "di0ib",
"url": "https://www.40percent.club/2017/05/six-pack-11.html",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x5350",
+ "device_version": "10.0.1"
+ },
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 8f06341aad84..b6534622eafa 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x546F //"To", was duplicate with polyandry
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 40 Percent Club
-#define PRODUCT Tomato
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 6
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index 57bcfd17a303..1ecaa84affaf 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Tomato",
+ "manufacturer": "40 Percent Club",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "pid": "0x546F",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_3x10": {
"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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h
index 7ead58e09647..3724e4b2d57a 100644
--- a/keyboards/40percentclub/ut47/config.h
+++ b/keyboards/40percentclub/ut47/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x7574 //"ut"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 40percent.club
-#define PRODUCT ut47
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json
index 4993bebb0fc0..e3173098e4b1 100644
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "UT47",
+ "keyboard_name": "ut47",
+ "manufacturer": "40percent.club",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x4025",
+ "vid": "0x7574",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"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":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}]
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
index 4733095bc134..8177f89038d0 100644
--- a/keyboards/45_ats/config.h
+++ b/keyboards/45_ats/config.h
@@ -20,13 +20,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xAB13
-#define PRODUCT_ID 0x4511
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Abec13
-#define PRODUCT 45ATS
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 14
diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json
index 2ea14357ee4d..268af942feaf 100644
--- a/keyboards/45_ats/info.json
+++ b/keyboards/45_ats/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "45-ATS",
+ "keyboard_name": "45ATS",
+ "manufacturer": "Abec13",
"url": "",
"maintainer": "The-Royal",
+ "usb": {
+ "vid": "0xAB13",
+ "pid": "0x4511",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_split_space": {
"layout": [
diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h
index daaafb02a6ff..27ad7441cc86 100644
--- a/keyboards/4by3/config.h
+++ b/keyboards/4by3/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xEEEE
-#define PRODUCT_ID 0x2019
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Elias Sjögreen
-#define PRODUCT 4by3
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 4
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
index 50f7c44b4f8c..24a2b3d34a31 100644
--- a/keyboards/4by3/info.json
+++ b/keyboards/4by3/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "4by3",
+ "manufacturer": "Elias Sjögreen",
"url": "https://github.com/eliassjogreen/4by3",
"maintainer": "eliassjogreen",
+ "usb": {
+ "vid": "0xEEEE",
+ "pid": "0x2019",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_horizontal": {
"layout": [
diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h
index 44a69bf4e58f..5ed43862ccfb 100644
--- a/keyboards/7c8/framework/config.h
+++ b/keyboards/7c8/framework/config.h
@@ -17,12 +17,6 @@
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0x77C8
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0000
-#define MANUFACTURER 7c8
-#define PRODUCT Framework
-
#define MATRIX_ROWS 10
#define MATRIX_COLS 6
diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json
index f78ea1eb580f..1a2c0b300bba 100644
--- a/keyboards/7c8/framework/info.json
+++ b/keyboards/7c8/framework/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Framework",
+ "manufacturer": "7c8",
"url": "",
"maintainer": "stevennguyen",
+ "usb": {
+ "vid": "0x77C8",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index b0462eb50fe2..622ccc7ae9c3 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bishop Keyboards
-#define PRODUCT 9Key
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index 326a63b12ca8..5508697df658 100644
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "9key",
+ "keyboard_name": "9Key",
+ "manufacturer": "Bishop Keyboards",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]