diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index 4103759d026..007a86529cd 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/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 0x4B4C // "KL" = klug
-#define PRODUCT_ID 0x4742 // "GB" = grooveboard
-#define DEVICE_VER 0x0001
-#define MANUFACTURER ianklug
-#define PRODUCT grooveboard
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 4
diff --git a/keyboards/ianklug/grooveboard/info.json b/keyboards/ianklug/grooveboard/info.json
index e08cf625744..a4bb849952f 100644
--- a/keyboards/ianklug/grooveboard/info.json
+++ b/keyboards/ianklug/grooveboard/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "grooveboard",
+ "manufacturer": "ianklug",
"url": "https://github.com/ianklug/grooveboard",
"maintainer": "ianklug",
+ "usb": {
+ "vid": "0x4B4C",
+ "pid": "0x4742",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h
index 28db5f3420b..04f368dce6b 100644
--- a/keyboards/ibnuda/alicia_cook/config.h
+++ b/keyboards/ibnuda/alicia_cook/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 0x6955
-#define DEVICE_VER 0x0899
-#define MANUFACTURER Ibnu D. Aji
-#define PRODUCT Alicia Cook
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 13
diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json
index c07be771902..3ce8256003b 100644
--- a/keyboards/ibnuda/alicia_cook/info.json
+++ b/keyboards/ibnuda/alicia_cook/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Alicia Cook",
+ "manufacturer": "Ibnu D. Aji",
"url": "https://github.com/ibnuda/alicia-cook",
"maintainer": "ibnuda",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6955",
+ "device_version": "8.9.9"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index a79ea6c5db2..da86f8557ec 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/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 0x1209
-#define PRODUCT_ID 0x6974
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Ibnu D. Aji
-#define PRODUCT Gurindam
-
/* key matrix size */
#define MATRIX_ROWS 9
#define MATRIX_COLS 8
diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
index a196f066e0d..4c7db56fd99 100644
--- a/keyboards/ibnuda/gurindam/info.json
+++ b/keyboards/ibnuda/gurindam/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "gurindam",
+ "keyboard_name": "Gurindam",
+ "manufacturer": "Ibnu D. Aji",
"url": "https://github.com/ibnuda/gurindam",
"maintainer": "Ibnu D. Aji",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x6974",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h
index 81dcfa854ea..eaaaf45d7d5 100644
--- a/keyboards/idb/idb_60/config.h
+++ b/keyboards/idb/idb_60/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 0x494B // "IB" for idb Keyboards
-#define PRODUCT_ID 0x0001 // idb 60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER idb Keyboards
-#define PRODUCT idb 60
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json
index d78c848c6d7..675fce45826 100644
--- a/keyboards/idb/idb_60/info.json
+++ b/keyboards/idb/idb_60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "idb 60",
+ "manufacturer": "idb Keyboards",
"url": "https://idb-keyboards.xyz/60",
"maintainer": "itspngu",
+ "usb": {
+ "vid": "0x494B",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_all",
"LAYOUT_default": "LAYOUT_60_ansi_wkl_split_rshift"
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 918dc16481f..16cffdfbad1 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/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 0x6964 // ID
-#define PRODUCT_ID 0x0075
-#define DEVICE_VER 0x0001
-#define MANUFACTURER IDOBAO
-#define PRODUCT ID75
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json
index bacdc42235e..cb1e21e5542 100644
--- a/keyboards/idobao/id75/v1/info.json
+++ b/keyboards/idobao/id75/v1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "IDOBO",
+ "keyboard_name": "ID75",
+ "manufacturer": "IDOBAO",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x6964",
+ "pid": "0x0075",
+ "device_version": "0.0.1"
+ },
"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/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index c2e54f611de..a36ba404a60 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6964 // ID
-#define PRODUCT_ID 0x0075
-#define DEVICE_VER 0x0002
-#define MANUFACTURER IDOBAO
-#define PRODUCT ID75
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
index 7babe0de1aa..b1afe268de0 100644
--- a/keyboards/idobao/id75/v2/info.json
+++ b/keyboards/idobao/id75/v2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "ID75 v2",
+ "keyboard_name": "ID75",
+ "manufacturer": "IDOBAO",
"url": "",
"maintainer": "peepeetee",
+ "usb": {
+ "vid": "0x6964",
+ "pid": "0x0075",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT_ortho_5x15": {
"layout": [
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index a268091d40c..6ae4cee1b54 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6964 // "id"
-#define PRODUCT_ID 0x0087
-#define DEVICE_VER 0x0001
-#define MANUFACTURER IDOBAO
-#define PRODUCT IDOBAO ID87
-
/* key matrix size */
#define MATRIX_ROWS 11
#define MATRIX_COLS 9
diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
index f154bbd940d..9f7c94619fd 100644
--- a/keyboards/idobao/id87/v1/info.json
+++ b/keyboards/idobao/id87/v1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "ID87",
+ "manufacturer": "IDOBAO",
"url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x6964",
+ "pid": "0x0087",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index 6bf1f14c430..3b0d9afc163 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -20,13 +20,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6964 // "id"
-#define PRODUCT_ID 0x0096
-#define DEVICE_VER 0x0001
-#define MANUFACTURER IDOBAO
-#define PRODUCT ID96
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index f972af64a2b..0732bce1542 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "id96",
+ "keyboard_name": "ID96",
+ "manufacturer": "IDOBAO",
"url": "https://www.idobao.net/collections/90/products/idobao-id96-aluminum-keyboard-kit",
"maintainer": "vinorodrigues",
+ "usb": {
+ "vid": "0x6964",
+ "pid": "0x0096",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 2321ce364e6..c21dda65a74 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6964
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Idobao
-#define PRODUCT Montex
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 5
diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
index c205e0027ab..f6834561749 100644
--- a/keyboards/idobao/montex/v1/info.json
+++ b/keyboards/idobao/montex/v1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "montex numpad",
+ "keyboard_name": "Montex",
+ "manufacturer": "IDOBAO",
"url": "https://www.idobao.net/products/ldobao-montex-pad-hot-swappable-mechanical-keyboard-kit",
"maintainer": "NachoxMacho",
+ "usb": {
+ "vid": "0x6964",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index 609aeb417e6..670b43462b5 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/config.h
@@ -5,13 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6964 // "id"
-#define PRODUCT_ID 0x0127
-#define DEVICE_VER 0x0001
-#define MANUFACTURER IDOBAO
-#define PRODUCT Montex RGB
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 5
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 27144e499c2..9001a3dfecd 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -1,5 +1,11 @@
{
- "keyboard_name": "IDOBAO MONTEX RGB",
+ "keyboard_name": "Montex RGB",
+ "manufacturer": "IDOBAO",
+ "usb": {
+ "vid": "0x6964",
+ "pid": "0x0127",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h
index cd7a7ce28fc..9416fd592f7 100644
--- a/keyboards/illuminati/is0/config.h
+++ b/keyboards/illuminati/is0/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA103
-#define PRODUCT_ID 0x0012
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Illuminati Works
-#define PRODUCT iS0
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 1
diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json
index f47cd753a90..f56850ca851 100644
--- a/keyboards/illuminati/is0/info.json
+++ b/keyboards/illuminati/is0/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "iS0",
+ "manufacturer": "Illuminati Works",
"url": "",
"maintainer": "ai03",
+ "usb": {
+ "vid": "0xA103",
+ "pid": "0x0012",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0.25, "y":0, "w":1.25, "h":2}]
diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h
index 5ad421ecbea..16f51989074 100644
--- a/keyboards/illusion/rosa/config.h
+++ b/keyboards/illusion/rosa/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 0x694B // iK -> illusion keyboards
-#define PRODUCT_ID 0x6952 // iR -> illusion Rosa
-#define DEVICE_VER 0x0001
-#define MANUFACTURER illusion keyboards
-#define PRODUCT Rosa
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json
index 60e285d66fb..9b9a613d012 100644
--- a/keyboards/illusion/rosa/info.json
+++ b/keyboards/illusion/rosa/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Rosa",
+ "manufacturer": "illusion keyboards",
"url": "",
"maintainer": "illusion",
+ "usb": {
+ "vid": "0x694B",
+ "pid": "0x6952",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_tsangan": {
"layout": [
diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h
index 4b6901d0967..3abd1b219a8 100644
--- a/keyboards/ilumkb/primus75/config.h
+++ b/keyboards/ilumkb/primus75/config.h
@@ -17,13 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x445A
-#define PRODUCT_ID 0x1014
-#define DEVICE_VER 0x0001
-#define MANUFACTURER moyi4681
-#define PRODUCT Primus75
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json
index 56f2be0c818..30a970a5c95 100644
--- a/keyboards/ilumkb/primus75/info.json
+++ b/keyboards/ilumkb/primus75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Primus75",
+ "manufacturer": "moyi4681",
"url": "",
"maintainer": "moyi4681",
+ "usb": {
+ "vid": "0x445A",
+ "pid": "0x1014",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"label":"Backspace", "x":14, "y":1.25}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25}, {"label":"Fn", "x":11, "y":5.25}, {"label":"Ctrl", "x":12, "y":5.25}, {"label":"Left", "x":13, "y":5.25}, {"label":"Down", "x":14, "y":5.25}, {"label":"Right", "x":15, "y":5.25}]
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index ae737bd1b66..26b7f603d44 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC3C3
-#define PRODUCT_ID 0xC361
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Equalz
-#define PRODUCT Simpler
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
index 01dc02797fc..7c2e0dd3af6 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Simpler61",
+ "manufacturer": "Equalz",
"url": "",
"maintainer": "Equalz",
+ "usb": {
+ "vid": "0xC3C3",
+ "pid": "0xC361",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_61_ansi": {
"layout": [
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index faf8fd152da..475e0d63c97 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC3C3
-#define PRODUCT_ID 0xC364
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Equalz
-#define PRODUCT Simpler
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
index c0fd4800cc0..0b99efb820b 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Simpler64",
+ "manufacturer": "Equalz",
"url": "",
"maintainer": "Equalz",
+ "usb": {
+ "vid": "0xC3C3",
+ "pid": "0xC364",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_64_ansi": {
"layout": [
diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h
index 9fb7b03c2b8..a64bcf64ba8 100644
--- a/keyboards/ilumkb/volcano660/config.h
+++ b/keyboards/ilumkb/volcano660/config.h
@@ -17,13 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x445A // "DZ"
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER DZTECH
-#define PRODUCT VOLCANO660
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json
index db26ee3859c..a48cabf7209 100644
--- a/keyboards/ilumkb/volcano660/info.json
+++ b/keyboards/ilumkb/volcano660/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "volcano660",
+ "keyboard_name": "Volcano660",
+ "manufacturer": "DZTech",
"url": "",
"maintainer": "dztech",
+ "usb": {
+ "vid": "0x445A",
+ "pid": "0x0002",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"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}, {"x":14, "y":0}, {"x":15.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}, {"x":15.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}, {"x":0, "y":3, "w":1.25}, {"label":"Shift", "x":1.25, "y":3}, {"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.25}, {"x":14.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":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}]
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index f516473cfac..2602dc82861 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -20,13 +20,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x694E //'iN'
-#define PRODUCT_ID 0x5336 //'S6'
-#define DEVICE_VER 0x0001
-#define MANUFACTURER iNETT Studio
-#define PRODUCT SQUARE.X
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index f2d36a5035e..6941c4c7d8d 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "sqx",
+ "keyboard_name": "SQUARE.X",
+ "manufacturer": "iNETT Studio",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x694E",
+ "pid": "0x5336",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_tsangan_hhkb": {
"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}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index d1fbf8f7a19..921f2b85ecd 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -20,13 +20,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x694E //'iN'
-#define PRODUCT_ID 0x5336 //'S6'
-#define DEVICE_VER 0x0001
-#define MANUFACTURER iNETT Studio
-#define PRODUCT SQUARE.X
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json
index 4588b27d581..8a2750f5ba9 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "sqx",
+ "keyboard_name": "SQUARE.X",
+ "manufacturer": "iNETT Studio",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x694E",
+ "pid": "0x5336",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_tsangan_split_rshift": {
"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":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index debf9a62b98..458b2d10428 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/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 0x1c11
-#define PRODUCT_ID 0xb04d
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input Club
-#define PRODUCT Infinity_Ergodox/QMK
-
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
#define MOUSEKEY_TIME_TO_MAX 60
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index 22b20eec390..dd6b3ac9aa1 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -1,5 +1,11 @@
{
- "keyboard_name": "Infinity Ergodox",
+ "keyboard_name": "Infinity Ergodox (QMK)",
+ "manufacturer": "Input:Club",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ergodox": {
"layout": [
diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h
index 18fedcb2195..a9901ce1e8c 100644
--- a/keyboards/input_club/infinity60/config.h
+++ b/keyboards/input_club/infinity60/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 0x1C11
-#define PRODUCT_ID 0xB04D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input Club
-#define PRODUCT Infinity 60% (QMK)
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 9
diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json
index 3fbd8b1b25a..8ec3f7dc686 100644
--- a/keyboards/input_club/infinity60/info.json
+++ b/keyboards/input_club/infinity60/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Infinity 60%",
+ "keyboard_name": "Infinity 60% (QMK)",
+ "manufacturer": "Input:Club",
"url": "https://input.club/devices/infinity-keyboard/",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index 8502ba7046e..d55bf892362 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/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 0x1C11
-#define PRODUCT_ID 0xB04D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input:Club
-#define PRODUCT K-Type (QMK)
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index cf0c9253bdd..6c9e1ebc16d 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "K-Type",
+ "keyboard_name": "K-Type (QMK)",
+ "manufacturer": "Input:Club",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 4ea7e7806f4..fde568ddae3 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/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 0x1C11
-#define PRODUCT_ID 0xB04D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Input:Club
-#define PRODUCT WhiteFox (QMK)
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 9
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index a920d7c1298..ed46ce17020 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -1,6 +1,12 @@
{
- "keyboard_name": "Whitefox",
+ "keyboard_name": "Whitefox (QMK)",
+ "manufacturer": "Input:Club",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1C11",
+ "pid": "0xB04D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/io_mini1800/config.h b/keyboards/io_mini1800/config.h
index ea7efd8ff46..88636c28251 100644
--- a/keyboards/io_mini1800/config.h
+++ b/keyboards/io_mini1800/config.h
@@ -5,13 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jpuerto96
-#define PRODUCT io_mini1800
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json
index 13a5fb32621..0db951f44a7 100644
--- a/keyboards/io_mini1800/info.json
+++ b/keyboards/io_mini1800/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "io_mini1800",
+ "manufacturer": "jpuerto96",
"url": "https://github.com/jpuerto96",
"maintainer": "jpuerto96 (s8erdude)",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_625u": {
"layout": [
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index 34093e33a11..9b745d1c1dc 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/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 0x1434
-#define PRODUCT_ID 0x3000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Andrei Collado
-#define PRODUCT Irene
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json
index 1219010915d..1500f81ca27 100644
--- a/keyboards/irene/info.json
+++ b/keyboards/irene/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Irene",
+ "manufacturer": "Andrei Collado",
"url": "",
"maintainer": "Andrei Collado",
+ "usb": {
+ "vid": "0x1434",
+ "pid": "0x3000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h
index 8757c407b2b..2d06e9f05cb 100644
--- a/keyboards/iriskeyboards/config.h
+++ b/keyboards/iriskeyboards/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 0x494B // IK (IrisKeyboards)
-#define PRODUCT_ID 0x3031 // 01 (PCB no.01)
-#define DEVICE_VER 0x0001
-#define MANUFACTURER SonOfAres
-#define PRODUCT IrisRev0
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/iriskeyboards/info.json b/keyboards/iriskeyboards/info.json
index 480fb0428e8..9091531538b 100644
--- a/keyboards/iriskeyboards/info.json
+++ b/keyboards/iriskeyboards/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "iriskeyboards",
+ "keyboard_name": "Iris Rev0",
+ "manufacturer": "SonOfAres",
"url": "",
"maintainer": "SonOfAres",
+ "usb": {
+ "vid": "0x494B",
+ "pid": "0x3031",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h
index cc5c81a50cc..2f69d009370 100644
--- a/keyboards/iron180/config.h
+++ b/keyboards/iron180/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 0x8384 //SR for Smith and Rune
-#define PRODUCT_ID 0x1180
-#define DEVICE_VER 0x0001
-#define MANUFACTURER SmithRune
-#define PRODUCT IRON180
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/iron180/info.json b/keyboards/iron180/info.json
index 64ee4b4ee39..cd689706410 100644
--- a/keyboards/iron180/info.json
+++ b/keyboards/iron180/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Iron180",
+ "manufacturer": "SmithRune",
"url": "",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x8384",
+ "pid": "0x1180",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
index 3aaeb26dad4..1ad00356feb 100644
--- a/keyboards/j80/config.h
+++ b/keyboards/j80/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0x20A0
-#define PRODUCT_ID 0x422D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JER
-#define PRODUCT J80
-
#define MATRIX_ROWS 7
#define MATRIX_COLS 14
diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json
index 6c14139bd70..bbb86f66f70 100644
--- a/keyboards/j80/info.json
+++ b/keyboards/j80/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "J80",
+ "manufacturer": "JER",
"url": "",
"maintainer": "oeywil",
+ "usb": {
+ "vid": "0x20A0",
+ "pid": "0x422D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index e68ed4a9286..92a6a5b60a2 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA13B // Jacky's vendor ID, arbitrarily selected by MudkipMao
-#define PRODUCT_ID 0x000A
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Jacky
-#define PRODUCT Jacky Bear 65 Ergo
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/jacky_studio/bear_65/info.json b/keyboards/jacky_studio/bear_65/info.json
index 5f7f0596966..151fd6fa5f7 100644
--- a/keyboards/jacky_studio/bear_65/info.json
+++ b/keyboards/jacky_studio/bear_65/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Bear 65",
+ "manufacturer": "Jacky",
"url": "https://qmk.fm/keyboards",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xA13B",
+ "pid": "0x000A",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":11.25, "y":0}, {"label":"*", "x":12.25, "y":0}, {"label":"(", "x":13.25, "y":0}, {"label":")", "x":14.25, "y":0}, {"label":"_", "x":15.25, "y":0}, {"label":"+", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"~", "x":18.25, "y":0}, {"label":"Del", "x":19.75, "y":0}, {"label":"PgUp", "x":0.25, "y":1}, {"label":"Tab", "x":1.75, "y":1, "w":1.5}, {"label":"Q", "x":3.25, "y":1}, {"label":"W", "x":4.25, "y":1}, {"label":"E", "x":5.25, "y":1}, {"label":"R", "x":6.25, "y":1}, {"label":"T", "x":7.25, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"{", "x":15.75, "y":1}, {"label":"}", "x":16.75, "y":1}, {"label":"Backspace", "x":17.75, "y":1, "w":1.5}, {"label":"PgDn", "x":0, "y":2}, {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75}, {"label":"A", "x":3.5, "y":2}, {"label":"S", "x":4.5, "y":2}, {"label":"D", "x":5.5, "y":2}, {"label":"F", "x":6.5, "y":2}, {"label":"G", "x":7.5, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"\"", "x":16, "y":2}, {"label":"Enter", "x":17, "y":2, "w":2.25}, {"label":"Shift", "x":1.75, "y":3, "w":2.25}, {"label":"Z", "x":4, "y":3}, {"label":"X", "x":5, "y":3}, {"label":"C", "x":6, "y":3}, {"label":"V", "x":7, "y":3}, {"label":"B", "x":8, "y":3}, {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3}, {"label":"M", "x":12.5, "y":3}, {"label":"<", "x":13.5, "y":3}, {"label":">", "x":14.5, "y":3}, {"label":"?", "x":15.5, "y":3}, {"label":"Shift", "x":16.5, "y":3, "w":1.75}, {"label":"Up", "x":18.25, "y":3}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"label":"Win", "x":8.25, "y":4}, {"x":10.5, "y":4, "w":2.75}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}]
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index 76c4c7d4068..96f8d57edea 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jacky
-#define PRODUCT S7 Elephant
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index b47f3264564..b1621eecd73 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "S7 Elephant",
+ "keyboard_name": "S7 Elephant Rev1",
+ "manufacturer": "Jacky",
"url": "https://geekhack.org/index.php?topic=96434.0",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xA13B",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 246479dd375..41a8c77f9df 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID 0x0008 // 8 for S7++
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Jacky
-#define PRODUCT Jacky S7 Elephant Rev 2
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index e3be4afe381..c9f45edca93 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "S7 Elephant Rev2",
+ "manufacturer": "Jacky",
"url": "https://geekhack.org/index.php?topic=103148.0",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xA13B",
+ "pid": "0x0008",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h
index ac5808f236b..21ec68ad9ba 100644
--- a/keyboards/jadookb/jkb2/config.h
+++ b/keyboards/jadookb/jkb2/config.h
@@ -16,12 +16,6 @@
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0x4A4B // "JK"
-#define PRODUCT_ID 0x3225 // "2%"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JadooKB
-#define PRODUCT JKB2
-
#define MATRIX_ROWS 1
#define MATRIX_COLS 2
diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json
index ed818d64127..ef27783c7a8 100644
--- a/keyboards/jadookb/jkb2/info.json
+++ b/keyboards/jadookb/jkb2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jkb2",
+ "keyboard_name": "JKB2",
+ "manufacturer": "JadooKB",
"url": "https://jadookb.com/",
"maintainer": "Wizard-GG",
+ "usb": {
+ "vid": "0x4A4B",
+ "pid": "0x3225",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }]
diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h
index 552f6930cb3..1804dfeb4e9 100644
--- a/keyboards/jae/j01/config.h
+++ b/keyboards/jae/j01/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 0x4705
-#define PRODUCT_ID 0x0143
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Evyd13
-#define PRODUCT J-01
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 17
diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json
index 03c18c46d15..94363e3aa5d 100644
--- a/keyboards/jae/j01/info.json
+++ b/keyboards/jae/j01/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "J01",
+ "keyboard_name": "J-01",
+ "manufacturer": "Evyd13",
"url": "",
"maintainer": "MechMerlin",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x0143",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"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":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.75, "y":3.25}, {"x":18, "y":3}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"x":12.5, "y":4, "w":1.5}, {"x":14, "y":4, "w":1.5}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25}, {"x":17.75, "y":4.25}]
diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h
index 611b107137c..e6c205e61c4 100644
--- a/keyboards/jagdpietr/drakon/config.h
+++ b/keyboards/jagdpietr/drakon/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 0x7776
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jagdpietr
-#define PRODUCT drakon
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 14
diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json
index 8208fa22bb6..48945eaf3e1 100644
--- a/keyboards/jagdpietr/drakon/info.json
+++ b/keyboards/jagdpietr/drakon/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "drakon",
+ "manufacturer": "jagdpietr",
"url": "",
"maintainer": "jagdpietr",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x7776",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"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":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":17.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":16.25, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.25}, {"x":13.75, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.25}]
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index b4cef251b5e..01b73b34db1 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0x1234
-#define PRODUCT_ID 0x5679
-#define DEVICE_VER 0x0200
-#define MANUFACTURER RAMA
-#define PRODUCT JC65 BMC
-
/* matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 15
diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index 9c22289d8fa..a6130b77c64 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jc65",
+ "keyboard_name": "JC65 BMC",
+ "manufacturer": "RAMA",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1234",
+ "pid": "0x5679",
+ "device_version": "2.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "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}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "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, "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"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}, {"x":14, "y":3}, {"x":15, "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}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index 108e4126be3..f4b49632364 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0002
-#define MANUFACTURER dou
-#define PRODUCT KEYCLACK65-V1
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json
index 84d832eede8..83e248fc30e 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jc65",
+ "keyboard_name": "JC65",
+ "manufacturer": "dou",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "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}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "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, "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}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"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}, {"x":14, "y":3}, {"x":15, "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}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index dd6984f1088..3645e86984a 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER geekhack
-#define PRODUCT jd40v2
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json
index 6cfdcdc3ee4..b94e9076f77 100644
--- a/keyboards/jd40/info.json
+++ b/keyboards/jd40/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "jd40",
+ "manufacturer": "geekhack",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h
index 3deea197409..ec4628fccb7 100644
--- a/keyboards/jd45/config.h
+++ b/keyboards/jd45/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER geekhack
-#define PRODUCT JD45
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 13
diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json
index 99059b09609..3fa16119f6a 100644
--- a/keyboards/jd45/info.json
+++ b/keyboards/jd45/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jd45",
+ "keyboard_name": "JD45",
+ "manufacturer": "geekhack",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
index 6805018dd72..ab9c51335be 100644
--- a/keyboards/jels/jels60/config.h
+++ b/keyboards/jels/jels60/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor paramater */
-#define VENDOR_ID 0x006A //Jels (J)
-#define PRODUCT_ID 0x0060 //Jels 60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jels
-#define PRODUCT jels60
-
/* Define Matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index b958bb6905b..d8c6590ccb1 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jels60",
+ "manufacturer": "Jels",
"url": "",
"maintainer": "Jels",
+ "usb": {
+ "vid": "0x006A",
+ "pid": "0x0060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index 3018e15c866..54c2fecc5ca 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor paramater */
-#define VENDOR_ID 0x006a // Jels (J)
-#define PRODUCT_ID 0x0088 // Jels 88
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Jels
-#define PRODUCT Jels88
-
/* Define Matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index 827e911494a..dc4887cbb7f 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jels88",
+ "manufacturer": "Jels",
"url": "",
"maintainer": "Jels",
+ "usb": {
+ "vid": "0x006A",
+ "pid": "0x0088",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
index da100292e2f..0579f44a770 100644
--- a/keyboards/jiran/config.h
+++ b/keyboards/jiran/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 0x1209
-#define PRODUCT_ID 0x3735
-#define DEVICE_VER 0x0300
-#define MANUFACTURER Ladniy
-#define PRODUCT Jiran
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 8dd6a43fe80..93b8ad11cee 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jiran",
+ "keyboard_name": "Jiran",
+ "manufacturer": "Ladniy",
"url": "t.me/s/ladniys",
"maintainer": "Ladniy",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x3735",
+ "device_version": "3.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h
index ba8bfcd8d15..1c12761600b 100644
--- a/keyboards/jkdlab/binary_monkey/config.h
+++ b/keyboards/jkdlab/binary_monkey/config.h
@@ -20,12 +20,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x4934
-#define PRODUCT_ID 0x0101
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JKDLAB.
-#define PRODUCT Binary_Monkey
-
#define MATRIX_ROWS 1
#define MATRIX_COLS 3
#define MATRIX_ROW_PINS { D0 }
diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json
index 9d563c0b124..24671d285d5 100644
--- a/keyboards/jkdlab/binary_monkey/info.json
+++ b/keyboards/jkdlab/binary_monkey/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Binary_Monkey",
+ "manufacturer": "JKDLAB.",
"url": "https://gumroad.com/jkdlab",
"maintainer": "JKDLAB.",
+ "usb": {
+ "vid": "0x4934",
+ "pid": "0x0101",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h
index 113c6b4dfb6..d3b5ec72436 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/jm60/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 0xFEED
-#define PRODUCT_ID 0x6464
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JMWS
-#define PRODUCT JM60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/jm60/info.json b/keyboards/jm60/info.json
index cdb0da4671c..5ad1053aa9b 100644
--- a/keyboards/jm60/info.json
+++ b/keyboards/jm60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "JM60",
+ "manufacturer": "JMWS",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6464",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index 702fee324f6..a5d8b9fe594 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -17,13 +17,6 @@
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4A48
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jsor-hpoli
-#define PRODUCT denial75
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index 71c9651a8a8..0224187eff1 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "denial75",
+ "manufacturer": "jsor-hpoli",
"url": "",
"maintainer": "jolofsor",
+ "usb": {
+ "vid": "0x4A48",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_denial75_ansi": {
"layout": [
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index 706c1d05e9a..9123005ac44 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/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 0xB9DD
-#define PRODUCT_ID 0x175A
-#define DEVICE_VER 0x0030
-#define MANUFACTURER jpskenn
-#define PRODUCT Jones
-
/* key matrix size */
// Same size for Jones' custom Round-Robin matrix.
#define MATRIX_ROWS 11
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
index c3d0477afce..c2884886b62 100644
--- a/keyboards/jones/v03/info.json
+++ b/keyboards/jones/v03/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jones",
+ "manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x175A",
+ "device_version": "0.3.0"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 33dd0994a53..e73bb22850e 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/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 0xB9DD
-#define PRODUCT_ID 0x175A
-#define DEVICE_VER 0x0031
-#define MANUFACTURER jpskenn
-#define PRODUCT Jones
-
/* key matrix size */
// Same size for Jones' custom Round-Robin matrix.
#define MATRIX_ROWS 11
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
index c3d0477afce..365178b9d59 100644
--- a/keyboards/jones/v03_1/info.json
+++ b/keyboards/jones/v03_1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jones",
+ "manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x175A",
+ "device_version": "0.3.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 16610eef4af..0d4ab90a604 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/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 0xB9DD
-#define PRODUCT_ID 0x175A
-#define DEVICE_VER 0x0100
-#define MANUFACTURER jpskenn
-#define PRODUCT Jones
-
/* key matrix size */
// Same number for Round-Robin matrix.
#define MATRIX_ROWS 10
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index 6aba4fd74bf..e323445fc9f 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jones",
+ "manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x175A",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/just60/.noci b/keyboards/just60/.noci
deleted file mode 100644
index e69de29bb2d..00000000000