summaryrefslogtreecommitdiff
path: root/keyboards/xelus
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-06 18:45:43 +1000
committerGitHub <noreply@github.com>2022-08-06 18:45:43 +1000
commit0e3cc6af12ad0337574280f783ee118a79c6ea55 (patch)
treea69abcbc09837237c910631e5059551a05f4e300 /keyboards/xelus
parent64acbcb42a5c38ceedb9e7ba14607e6e6427a92a (diff)
Move keyboard USB IDs and strings to data driven: X (#17925)
Diffstat (limited to 'keyboards/xelus')
-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
32 files changed, 106 insertions, 122 deletions
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": [