summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-06 08:46:12 +0000
committerQMK Bot <hello@qmk.fm>2022-08-06 08:46:12 +0000
commitcac704241404908794514b7a534e58c96aff4d6b (patch)
tree6c6bb9fe1fd2a46322924ae4dc25a708c1f27137
parent1d45c993557013c6ed9e8f94fb222e0950f00afd (diff)
parent0e3cc6af12ad0337574280f783ee118a79c6ea55 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/x16/config.h7
-rw-r--r--keyboards/x16/info.json6
-rw-r--r--keyboards/xbows/knight/config.h6
-rw-r--r--keyboards/xbows/knight/info.json6
-rw-r--r--keyboards/xbows/knight_plus/config.h6
-rw-r--r--keyboards/xbows/knight_plus/info.json6
-rw-r--r--keyboards/xbows/nature/config.h6
-rw-r--r--keyboards/xbows/nature/info.json6
-rw-r--r--keyboards/xbows/numpad/config.h6
-rw-r--r--keyboards/xbows/numpad/info.json6
-rw-r--r--keyboards/xbows/ranger/config.h6
-rw-r--r--keyboards/xbows/ranger/info.json6
-rw-r--r--keyboards/xbows/woody/config.h5
-rw-r--r--keyboards/xbows/woody/info.json6
-rw-r--r--keyboards/xelus/akis/config.h7
-rw-r--r--keyboards/xelus/akis/info.json8
-rw-r--r--keyboards/xelus/dharma/config.h7
-rw-r--r--keyboards/xelus/dharma/info.json8
-rw-r--r--keyboards/xelus/kangaroo/config.h7
-rw-r--r--keyboards/xelus/kangaroo/info.json6
-rwxr-xr-xkeyboards/xelus/la_plus/config.h7
-rw-r--r--keyboards/xelus/la_plus/info.json8
-rw-r--r--keyboards/xelus/ninjin/config.h7
-rw-r--r--keyboards/xelus/ninjin/info.json6
-rw-r--r--keyboards/xelus/pachi/mini_32u4/config.h7
-rw-r--r--keyboards/xelus/pachi/mini_32u4/info.json8
-rw-r--r--keyboards/xelus/pachi/rev1/config.h7
-rw-r--r--keyboards/xelus/pachi/rev1/info.json8
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/config.h7
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/info.json8
-rw-r--r--keyboards/xelus/pachi/rgb/rev2/config.h7
-rw-r--r--keyboards/xelus/pachi/rgb/rev2/info.json8
-rw-r--r--keyboards/xelus/rs108/config.h7
-rw-r--r--keyboards/xelus/rs108/info.json6
-rw-r--r--keyboards/xelus/snap96/config.h7
-rw-r--r--keyboards/xelus/snap96/info.json6
-rw-r--r--keyboards/xelus/trinityxttkl/config.h7
-rw-r--r--keyboards/xelus/trinityxttkl/info.json6
-rw-r--r--keyboards/xelus/valor/rev1/config.h7
-rw-r--r--keyboards/xelus/valor/rev1/info.json8
-rw-r--r--keyboards/xelus/valor/rev2/config.h7
-rw-r--r--keyboards/xelus/valor/rev2/info.json8
-rw-r--r--keyboards/xelus/valor_frl_tkl/config.h7
-rw-r--r--keyboards/xelus/valor_frl_tkl/info.json8
-rw-r--r--keyboards/xelus/xs60/config.h7
-rw-r--r--keyboards/xelus/xs60/info.json6
-rw-r--r--keyboards/xenon/config.h6
-rw-r--r--keyboards/xenon/info.json7
-rw-r--r--keyboards/xiaomi/mk02/config.h7
-rw-r--r--keyboards/xiaomi/mk02/info.json8
-rw-r--r--keyboards/xiudi/xd002/config.h7
-rw-r--r--keyboards/xiudi/xd002/info.json8
-rw-r--r--keyboards/xiudi/xd68/config.h7
-rw-r--r--keyboards/xiudi/xd68/info.json8
-rw-r--r--keyboards/xiudi/xd75/config.h7
-rw-r--r--keyboards/xiudi/xd75/info.json6
-rw-r--r--keyboards/xiudi/xd84/config.h7
-rw-r--r--keyboards/xiudi/xd84/info.json6
-rw-r--r--keyboards/xiudi/xd84pro/config.h7
-rw-r--r--keyboards/xiudi/xd84pro/info.json6
-rw-r--r--keyboards/xiudi/xd87/config.h7
-rw-r--r--keyboards/xiudi/xd87/info.json6
-rw-r--r--keyboards/xiudi/xd96/config.h7
-rw-r--r--keyboards/xiudi/xd96/info.json8
-rw-r--r--keyboards/xmmx/config.h7
-rw-r--r--keyboards/xmmx/info.json6
-rw-r--r--keyboards/xw60/config.h7
-rw-r--r--keyboards/xw60/info.json6
68 files changed, 218 insertions, 245 deletions
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h
index 8378880d08..c46a035718 100644
--- a/keyboards/x16/config.h
+++ b/keyboards/x16/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B50
-#define PRODUCT_ID 0x016A
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yinxianwei
-#define PRODUCT x16
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4
diff --git a/keyboards/x16/info.json b/keyboards/x16/info.json
index 742777648d..a006269af0 100644
--- a/keyboards/x16/info.json
+++ b/keyboards/x16/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "x16",
+ "manufacturer": "yinxianwei",
"url": "",
"maintainer": "yinxianwei",
+ "usb": {
+ "vid": "0x4B50",
+ "pid": "0x016A",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 013bb4e7d4..f0fc0f712a 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -17,12 +17,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x5842
-#define PRODUCT_ID 0x4B6E
-#define DEVICE_VER 0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT KNIGHT
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index dca3ea1ed1..d4ce054f0b 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "KNIGHT",
+ "manufacturer": "X-BOWS",
"url": "",
"maintainer": "xbows-qmk",
+ "usb": {
+ "vid": "0x5842",
+ "pid": "0x4B6E",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 414b5a86b7..91c6dcebd4 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -17,12 +17,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x5842
-#define PRODUCT_ID 0x4B50
-#define DEVICE_VER 0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT KNIGHT_PLUS
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index 7b6521510f..8311f0026e 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "KNIGHT_PLUS",
+ "manufacturer": "X-BOWS",
"url": "",
"maintainer": "xbows-qmk",
+ "usb": {
+ "vid": "0x5842",
+ "pid": "0x4B50",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index d9d6a2753e..a248fa37bb 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -17,12 +17,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x5842
-#define PRODUCT_ID 0x4E61
-#define DEVICE_VER 0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT NATURE
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index 62e2c1f6d9..69da3dec9c 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "NATURE",
+ "manufacturer": "X-BOWS",
"url": "",
"maintainer": "xbows-qmk",
+ "usb": {
+ "vid": "0x5842",
+ "pid": "0x4E61",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index c36ee1a52c..7eb56caea7 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -17,12 +17,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x5842
-#define PRODUCT_ID 0x4E75
-#define DEVICE_VER 0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT NUMPAD
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 4
#define MATRIX_ROW_PINS { B5, B4, C6, B6, D7, B3 }
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index f4be5f56d1..543a4f876f 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "NUMPAD",
+ "manufacturer": "X-BOWS",
"url": "",
"maintainer": "xbows-qmk",
+ "usb": {
+ "vid": "0x5842",
+ "pid": "0x4E75",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 73a1bc3a74..6c557bf341 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -17,12 +17,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x5842
-#define PRODUCT_ID 0x5261
-#define DEVICE_VER 0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT Ranger
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
#define MATRIX_ROW_PINS { C7, B6, B4, C6, B5, D6 }
diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json
index 8f0e3d1135..29919193c3 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Ranger",
+ "manufacturer": "X-BOWS",
"url": "",
"maintainer": "xbows-qmk",
+ "usb": {
+ "vid": "0x5842",
+ "pid": "0x5261",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_tkl_ansi"
},
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index 9d04eb84c4..d6b7f32c68 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -1,10 +1,5 @@
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1224
-#define DEVICE_VER 0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT WOO-DY
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index 4e4e77a4ba..5b984811df 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "WOO-DY",
+ "manufacturer": "X-BOWS",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1224",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"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, "w":2}, {"x":15, "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, "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":15, "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.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6.25}, {"x":10.25, "y":4, "w":1.5}, {"x":11.75, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index 2cbdb8bb00..8432076307 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-// USB Device descriptor parameter
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0xA04B // A-K
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT AkiS
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/info.json
index 29dec68aee..36a6d78277 100644
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "akiS",
+ "keyboard_name": "AkiS",
+ "manufacturer": "Xelus",
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/akis",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0xA04B",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_65_all": "LAYOUT_all"
},
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h
index eab2c224c2..7f02bf3e61 100644
--- a/keyboards/xelus/dharma/config.h
+++ b/keyboards/xelus/dharma/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0xDAAA // Dharma
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Dharma
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 18
diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json
index 661df2afbb..174cf2a1f0 100644
--- a/keyboards/xelus/dharma/info.json
+++ b/keyboards/xelus/dharma/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Dharma",
+ "keyboard_name": "Dharma",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0xDAAA",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/config.h
index 1d746b342e..a57d22a7f8 100644
--- a/keyboards/xelus/kangaroo/config.h
+++ b/keyboards/xelus/kangaroo/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x524F // RO
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Kangaroo
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 11
diff --git a/keyboards/xelus/kangaroo/info.json b/keyboards/xelus/kangaroo/info.json
index c7b45eb946..d70cb92e93 100644
--- a/keyboards/xelus/kangaroo/info.json
+++ b/keyboards/xelus/kangaroo/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Kangaroo",
+ "manufacturer": "Xelus",
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x524F",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"label":"PrtSc", "x":4.25, "y":0}, {"label":"Scroll Lock", "x":5.25, "y":0}, {"label":"Pause", "x":6.25, "y":0}, {"label":"Esc", "x":7.5, "y":0}, {"label":"F1", "x":9.5, "y":0}, {"label":"F2", "x":10.5, "y":0}, {"label":"F3", "x":11.5, "y":0}, {"label":"F4", "x":12.5, "y":0}, {"label":"F5", "x":14, "y":0}, {"label":"F6", "x":15, "y":0}, {"label":"F7", "x":16, "y":0}, {"label":"F8", "x":17, "y":0}, {"label":"F9", "x":18.5, "y":0}, {"label":"F10", "x":19.5, "y":0}, {"label":"F11", "x":20.5, "y":0}, {"label":"F12", "x":21.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"label":"Insert", "x":4.25, "y":1.25}, {"label":"Home", "x":5.25, "y":1.25}, {"label":"PgUp", "x":6.25, "y":1.25}, {"label":"~", "x":7.5, "y":1.25}, {"label":"!", "x":8.5, "y":1.25}, {"label":"@", "x":9.5, "y":1.25}, {"label":"#", "x":10.5, "y":1.25}, {"label":"$", "x":11.5, "y":1.25}, {"label":"%", "x":12.5, "y":1.25}, {"label":"^", "x":13.5, "y":1.25}, {"label":"&", "x":14.5, "y":1.25}, {"label":"*", "x":15.5, "y":1.25}, {"label":"(", "x":16.5, "y":1.25}, {"label":")", "x":17.5, "y":1.25}, {"label":"_", "x":18.5, "y":1.25}, {"label":"+", "x":19.5, "y":1.25}, {"x":20.5, "y":1.25}, {"x":21.5, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"label":"Delete", "x":4.25, "y":2.25}, {"label":"End", "x":5.25, "y":2.25}, {"label":"PgDn", "x":6.25, "y":2.25}, {"label":"Tab", "x":7.5, "y":2.25, "w":1.5}, {"label":"Q", "x":9, "y":2.25}, {"label":"W", "x":10, "y":2.25}, {"label":"E", "x":11, "y":2.25}, {"label":"R", "x":12, "y":2.25}, {"label":"T", "x":13, "y":2.25}, {"label":"Y", "x":14, "y":2.25}, {"label":"U", "x":15, "y":2.25}, {"label":"I", "x":16, "y":2.25}, {"label":"O", "x":17, "y":2.25}, {"label":"P", "x":18, "y":2.25}, {"label":"{", "x":19, "y":2.25}, {"label":"}", "x":20, "y":2.25}, {"label":"|", "x":21, "y":2.25, "w":1.5}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"label":"Caps Lock", "x":7.5, "y":3.25, "w":1.75}, {"label":"A", "x":9.25, "y":3.25}, {"label":"S", "x":10.25, "y":3.25}, {"label":"D", "x":11.25, "y":3.25}, {"label":"F", "x":12.25, "y":3.25}, {"label":"G", "x":13.25, "y":3.25}, {"label":"H", "x":14.25, "y":3.25}, {"label":"J", "x":15.25, "y":3.25}, {"label":"K", "x":16.25, "y":3.25}, {"label":"L", "x":17.25, "y":3.25}, {"label":":", "x":18.25, "y":3.25}, {"label":"\"", "x":19.25, "y":3.25}, {"label":"Enter", "x":20.25, "y":3.25, "w":2.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"label":"\u2191", "x":5.25, "y":4.25}, {"label":"Shift", "x":7.5, "y":4.25, "w":2.25}, {"label":"Z", "x":9.75, "y":4.25}, {"label":"X", "x":10.75, "y":4.25}, {"label":"C", "x":11.75, "y":4.25}, {"label":"V", "x":12.75, "y":4.25}, {"label":"B", "x":13.75, "y":4.25}, {"label":"N", "x":14.75, "y":4.25}, {"label":"M", "x":15.75, "y":4.25}, {"label":"<", "x":16.75, "y":4.25}, {"label":">", "x":17.75, "y":4.25}, {"label":"?", "x":18.75, "y":4.25}, {"x":19.75, "y":4.25, "w":1.75}, {"x":21.5, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"label":"\u2190", "x":4.25, "y":5.25}, {"label":"\u2193", "x":5.25, "y":5.25}, {"label":"\u2192", "x":6.25, "y":5.25}, {"label":"Ctrl", "x":7.5, "y":5.25, "w":1.25}, {"label":"Win", "x":8.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":6.25}, {"label":"Alt", "x":17.5, "y":5.25, "w":1.25}, {"label":"Win", "x":18.75, "y":5.25, "w":1.25}, {"label":"Menu", "x":20, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":21.25, "y":5.25, "w":1.25}]
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 14cad0fa87..4b4105af42 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x4C50 // LP
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT MechaMaker La+
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index bfa3a4dc20..ced81e6f3d 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "La+",
+ "keyboard_name": "MechaMaker La+",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x4C50",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 4dd40210a6..7f49c299af 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x4E4A // NJ
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Ninjin
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index 8b44ea9ded..f85a6a54c4 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Ninjin",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x4E4A",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
},
diff --git a/keyboards/xelus/pachi/mini_32u4/config.h b/keyboards/xelus/pachi/mini_32u4/config.h
index cf15d57cfc..f2abc3619f 100644
--- a/keyboards/xelus/pachi/mini_32u4/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x5041 // PA
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Pachi Mini
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json
index 3b0128ee82..ca78bdbffe 100644
--- a/keyboards/xelus/pachi/mini_32u4/info.json
+++ b/keyboards/xelus/pachi/mini_32u4/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Pachi Mini",
+ "keyboard_name": "Pachi Mini",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5041",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/pachi/rev1/config.h b/keyboards/xelus/pachi/rev1/config.h
index 2379700138..8a8c51779f 100644
--- a/keyboards/xelus/pachi/rev1/config.h
+++ b/keyboards/xelus/pachi/rev1/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x5041 // PA
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Pachi
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json
index 2fb0c55479..1b14340edd 100644
--- a/keyboards/xelus/pachi/rev1/info.json
+++ b/keyboards/xelus/pachi/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Pachi Rev 1",
+ "keyboard_name": "Pachi Rev 1",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5041",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 2711b5c7a8..6f4dfa24d1 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // "XE"
-#define PRODUCT_ID 0x5052 // "PR"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Pachi RGB Rev1
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
index 7448e755f0..24b6c4834a 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Pachi RGB Rev 1",
+ "keyboard_name": "Pachi RGB Rev 1",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5052",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan"
},
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 35a4cf238f..b5c85deb78 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // "XE"
-#define PRODUCT_ID 0x5053 // "PR" + 1
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Pachi RGB Rev 2
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json
index 7448e755f0..46a4de5920 100644
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Pachi RGB Rev 1",
+ "keyboard_name": "Pachi RGB Rev 2",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5053",
+ "device_version": "0.0.2"
+ },
"layout_aliases": {
"LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan"
},
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index d7527010e8..4cc11eb20b 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -15,13 +15,6 @@
*/
#pragma once
-// USB Device descriptor parameter
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x5208 // RS108 "R+08"
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Xelus
-#define PRODUCT RS60
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 11
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
index 019945ebe8..c266a5193b 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "RS108",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5208",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT_108_fullsize_ansi": {
"layout": [
diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h
index 96c5d24723..736cbe81ed 100644
--- a/keyboards/xelus/snap96/config.h
+++ b/keyboards/xelus/snap96/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-// USB Device descriptor parameter
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x5396 // Snap96
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Snap96
-
// key matrix size
#define MATRIX_ROWS 12
#define MATRIX_COLS 10
diff --git a/keyboards/xelus/snap96/info.json b/keyboards/xelus/snap96/info.json
index 5130c5db6e..74c7d6225a 100644
--- a/keyboards/xelus/snap96/info.json
+++ b/keyboards/xelus/snap96/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Snap96",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5396",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
index 12745c54dc..d480a57ff8 100644
--- a/keyboards/xelus/trinityxttkl/config.h
+++ b/keyboards/xelus/trinityxttkl/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // XE
-#define PRODUCT_ID 0x5854 // XT
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT TrinityXTtkl
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 19
diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
index de113f2193..724eaef114 100644
--- a/keyboards/xelus/trinityxttkl/info.json
+++ b/keyboards/xelus/trinityxttkl/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Trinity XT TKL",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5854",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index a45ecbc079..a61645d74c 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // "XE"
-#define PRODUCT_ID 0x5652 // Valor "VR"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Valor
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json
index 33e367059c..7e8f874d2c 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Valor rev1",
+ "keyboard_name": "Valor Rev1",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5652",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 8201373d23..edc1be8d6d 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // "XE"
-#define PRODUCT_ID 0x5653 // Valor "VR" + 1
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Valor Rev2
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index 47fd2c3e2b..1d19fbad2d 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Valor Rev2",
+ "keyboard_name": "Valor Rev2",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5653",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/config.h
index c1c08878c0..253ff17687 100644
--- a/keyboards/xelus/valor_frl_tkl/config.h
+++ b/keyboards/xelus/valor_frl_tkl/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // "XE"
-#define PRODUCT_ID 0x4654 // "FT"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus Valor FRL TKL
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 17
diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json
index 36c95032fb..4b4b59c43c 100644
--- a/keyboards/xelus/valor_frl_tkl/info.json
+++ b/keyboards/xelus/valor_frl_tkl/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xelus Valor FRL TKL",
+ "keyboard_name": "Valor FRL TKL",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x4654",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xelus/xs60/config.h b/keyboards/xelus/xs60/config.h
index 3a72af86ad..097a833e98 100644
--- a/keyboards/xelus/xs60/config.h
+++ b/keyboards/xelus/xs60/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5845 // "XE"
-#define PRODUCT_ID 0x5860 // "XS60"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xelus
-#define PRODUCT Xelus XS60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/xelus/xs60/info.json b/keyboards/xelus/xs60/info.json
index 55665b0399..089d728b01 100644
--- a/keyboards/xelus/xs60/info.json
+++ b/keyboards/xelus/xs60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XS60",
+ "manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5860",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
index b14861140c..c648ca66d5 100644
--- a/keyboards/xenon/config.h
+++ b/keyboards/xenon/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x3404
-#define DEVICE_VER 0x0001
-#define PRODUCT Xenon
-
/* key matrix size */
/* Rows are doubled up */
#define MATRIX_ROWS 10
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
index fd1146a1d4..9caa493f86 100644
--- a/keyboards/xenon/info.json
+++ b/keyboards/xenon/info.json
@@ -1,8 +1,13 @@
{
"keyboard_name": "Xenon",
+ "manufacturer": "narinari",
"url": "https://github.com/narinari/xenon-keyboard",
"maintainer": "Kyrremann",
- "manufacturer": "narinari",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3404",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h
index 1b029d6b49..93e4b89291 100644
--- a/keyboards/xiaomi/mk02/config.h
+++ b/keyboards/xiaomi/mk02/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0B91
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Xiaomi
-#define PRODUCT MK02
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/info.json
index 6f216802f6..58c3f3cbc3 100644
--- a/keyboards/xiaomi/mk02/info.json
+++ b/keyboards/xiaomi/mk02/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Xiaomi MK02",
+ "keyboard_name": "MK02",
+ "manufacturer": "Xiaomi",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0B91",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h
index c17d816cfc..46896531a9 100644
--- a/keyboards/xiudi/xd002/config.h
+++ b/keyboards/xiudi/xd002/config.h
@@ -17,13 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7844 // "XD"
-#define PRODUCT_ID 0x0202
-#define DEVICE_VER 0x0001
-#define MANUFACTURER XIUDI
-#define PRODUCT XD002
-
/* matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 2
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index 0ef0e8f21a..f06e823a88 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "xd002",
+ "keyboard_name": "XD002",
+ "manufacturer": "XIUDI",
"url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
"maintainer": "zvecr",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x0202",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index af8e8b7dab..ac6989b9fe 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/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 0x7844 // "XD"
-#define PRODUCT_ID 0x6868
-#define DEVICE_VER 0x0001
-#define MANUFACTURER xiudi
-#define PRODUCT XD68
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 276bd72941..36d72134c1 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "xd68",
+ "keyboard_name": "XD68",
+ "manufacturer": "xiudi",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x6868",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 9cceea3467..604e9aec20 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/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 0x7844 // "XD"
-#define PRODUCT_ID 0x7575
-#define DEVICE_VER 0x0001
-#define MANUFACTURER xiudi
-#define PRODUCT XD75
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index bb15a7faef..7329722495 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XD75",
+ "manufacturer": "xiudi",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x7575",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_5x15": {
"layout": [
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index a96793cd75..742b7fce0b 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7844 // "XD"
-#define PRODUCT_ID 0x8484
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KPrepublic
-#define PRODUCT XD84
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index e24a5a92a1..7c02fdeeef 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XD84",
+ "manufacturer": "KPrepublic",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x8484",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_75_ansi": {
"layout": [
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 797d209db3..abd2e0d8f1 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7844 // "xD"
-#define PRODUCT_ID 0x8450 // 84 "P"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KPrepublic
-#define PRODUCT XD84 Pro
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index b8e92158b8..36d52e5f72 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XD84 Pro",
+ "manufacturer": "KPrepublic",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x8450",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 5f5b704f36..52fcb09f84 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/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 0x7844 // "XD"
-#define PRODUCT_ID 0x8787
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KP Republic
-#define PRODUCT XD87 TKL
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index 4f4f82fdaf..922d0641f2 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XD87",
+ "manufacturer": "KPrepublic",
"url": "https://kprepublic.com/products/hot-swappable-xd87-hs-xd87-custom-mechanical-keyboard-kit80-supports-tkg-tools-support-underglow-rgb-pcb-programmed-gh80-kle",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x8787",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index ddf97f9d00..2291ca439e 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7844 // "XD"
-#define PRODUCT_ID 0x9696
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KPrepublic
-#define PRODUCT XD96
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index 4b01ab9ed7..aa9f2a7522 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "xd96",
+ "keyboard_name": "XD96",
+ "manufacturer": "KPrepublic",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x9696",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_96_ansi": {
"layout": [
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 773f612089..37b977a0fe 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6776
-#define DEVICE_VER 0x0001
-#define MANUFACTURER farmakon
-#define PRODUCT "XMMX"
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/xmmx/info.json b/keyboards/xmmx/info.json
index b96b4e1352..30b6cee59d 100644
--- a/keyboards/xmmx/info.json
+++ b/keyboards/xmmx/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XMMX",
+ "manufacturer": "farmakon",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6776",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/xw60/config.h b/keyboards/xw60/config.h
index 2bea6db399..2277a52a4c 100644
--- a/keyboards/xw60/config.h
+++ b/keyboards/xw60/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Drclick
-#define PRODUCT XW60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json
index e3284a6905..40f3f44760 100644
--- a/keyboards/xw60/info.json
+++ b/keyboards/xw60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "XW60",
+ "manufacturer": "Drclick",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "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":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K0C", "x":12, "y":0}, {"label":"K0D", "x":13, "y":0}, {"label":"K49", "x":14, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K1D", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2}, {"label":"K2D", "x":13.75, "y":2, "w":1.25}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3}, {"label":"K32", "x":2.25, "y":3}, {"label":"K33", "x":3.25, "y":3}, {"label":"K34", "x":4.25, "y":3}, {"label":"K35", "x":5.25, "y":3}, {"label":"K36", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K38", "x":8.25, "y":3}, {"label":"K39", "x":9.25, "y":3}, {"label":"K3A", "x":10.25, "y":3}, {"label":"K3B", "x":11.25, "y":3}, {"label":"K3D", "x":12.25, "y":3, "w":1.75}, {"label":"K3C", "x":14, "y":3}, {"label":"K40", "x":0, "y":4, "w":1.25}, {"label":"K41", "x":1.25, "y":4, "w":1.25}, {"label":"K42", "x":2.5, "y":4, "w":1.25}, {"label":"K44", "x":3.75, "y":4, "w":2}, {"label":"K45", "x":5.75, "y":4, "w":2.25}, {"label":"K46", "x":8, "y":4, "w":2}, {"label":"K4A", "x":10, "y":4, "w":1.25}, {"label":"K4B", "x":11.25, "y":4, "w":1.25}, {"label":"K4C", "x":12.5, "y":4, "w":1.25}, {"label":"K4D", "x":13.75, "y":4, "w":1.25}]