From 0e3cc6af12ad0337574280f783ee118a79c6ea55 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Aug 2022 18:45:43 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven: X (#17925) --- keyboards/x16/config.h | 7 ------- keyboards/x16/info.json | 6 ++++++ keyboards/xbows/knight/config.h | 6 ------ keyboards/xbows/knight/info.json | 6 ++++++ keyboards/xbows/knight_plus/config.h | 6 ------ keyboards/xbows/knight_plus/info.json | 6 ++++++ keyboards/xbows/nature/config.h | 6 ------ keyboards/xbows/nature/info.json | 6 ++++++ keyboards/xbows/numpad/config.h | 6 ------ keyboards/xbows/numpad/info.json | 6 ++++++ keyboards/xbows/ranger/config.h | 6 ------ keyboards/xbows/ranger/info.json | 6 ++++++ keyboards/xbows/woody/config.h | 5 ----- keyboards/xbows/woody/info.json | 6 ++++++ keyboards/xelus/akis/config.h | 7 ------- keyboards/xelus/akis/info.json | 8 +++++++- keyboards/xelus/dharma/config.h | 7 ------- keyboards/xelus/dharma/info.json | 8 +++++++- keyboards/xelus/kangaroo/config.h | 7 ------- keyboards/xelus/kangaroo/info.json | 6 ++++++ keyboards/xelus/la_plus/config.h | 7 ------- keyboards/xelus/la_plus/info.json | 8 +++++++- keyboards/xelus/ninjin/config.h | 7 ------- keyboards/xelus/ninjin/info.json | 6 ++++++ keyboards/xelus/pachi/mini_32u4/config.h | 7 ------- keyboards/xelus/pachi/mini_32u4/info.json | 8 +++++++- keyboards/xelus/pachi/rev1/config.h | 7 ------- keyboards/xelus/pachi/rev1/info.json | 8 +++++++- keyboards/xelus/pachi/rgb/rev1/config.h | 7 ------- keyboards/xelus/pachi/rgb/rev1/info.json | 8 +++++++- keyboards/xelus/pachi/rgb/rev2/config.h | 7 ------- keyboards/xelus/pachi/rgb/rev2/info.json | 8 +++++++- keyboards/xelus/rs108/config.h | 7 ------- keyboards/xelus/rs108/info.json | 6 ++++++ keyboards/xelus/snap96/config.h | 7 ------- keyboards/xelus/snap96/info.json | 6 ++++++ keyboards/xelus/trinityxttkl/config.h | 7 ------- keyboards/xelus/trinityxttkl/info.json | 6 ++++++ keyboards/xelus/valor/rev1/config.h | 7 ------- keyboards/xelus/valor/rev1/info.json | 8 +++++++- keyboards/xelus/valor/rev2/config.h | 7 ------- keyboards/xelus/valor/rev2/info.json | 8 +++++++- keyboards/xelus/valor_frl_tkl/config.h | 7 ------- keyboards/xelus/valor_frl_tkl/info.json | 8 +++++++- keyboards/xelus/xs60/config.h | 7 ------- keyboards/xelus/xs60/info.json | 6 ++++++ keyboards/xenon/config.h | 6 ------ keyboards/xenon/info.json | 7 ++++++- keyboards/xiaomi/mk02/config.h | 7 ------- keyboards/xiaomi/mk02/info.json | 8 +++++++- keyboards/xiudi/xd002/config.h | 7 ------- keyboards/xiudi/xd002/info.json | 8 +++++++- keyboards/xiudi/xd68/config.h | 7 ------- keyboards/xiudi/xd68/info.json | 8 +++++++- keyboards/xiudi/xd75/config.h | 7 ------- keyboards/xiudi/xd75/info.json | 6 ++++++ keyboards/xiudi/xd84/config.h | 7 ------- keyboards/xiudi/xd84/info.json | 6 ++++++ keyboards/xiudi/xd84pro/config.h | 7 ------- keyboards/xiudi/xd84pro/info.json | 6 ++++++ keyboards/xiudi/xd87/config.h | 7 ------- keyboards/xiudi/xd87/info.json | 6 ++++++ keyboards/xiudi/xd96/config.h | 7 ------- keyboards/xiudi/xd96/info.json | 8 +++++++- keyboards/xmmx/config.h | 7 ------- keyboards/xmmx/info.json | 6 ++++++ keyboards/xw60/config.h | 7 ------- keyboards/xw60/info.json | 6 ++++++ 68 files changed, 218 insertions(+), 245 deletions(-) diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h index 8378880d08e76f68ef89d68bd9ad9011e3f7a36a..c46a035718f02ce1faa704b556d75a8350951ab4 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 742777648d1603f10852951e5bfcf1347787c8cb..a006269af07d9b764f0f11788ccda30546c29c72 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 013bb4e7d4294f2f800165e98b2714f7f9e5c840..f0fc0f712aba014324680613b6e23c892d38d9d6 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 dca3ea1ed14c54508232fc0003e5dac829a449b9..d4ce054f0bc1ccba99cfe4c86c304ac335171ee8 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 414b5a86b7c6c2dc15f6405b45926636bdf98cb6..91c6dcebd480fb54807009cea444f1d34c96dda7 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 7b6521510f9dc749766985127cb13c434f8884b8..8311f0026e442493ecb3194350a521a5788b4060 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 d9d6a2753eb9823f88fa9bd8d98272fa8ccd1530..a248fa37bb08f1ebe6d7fdf9f6d0a63db439531f 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 62e2c1f6d96a604ca094be967d7b988ef53b8ccc..69da3dec9c886528a13bdea48041649df9897bfd 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 c36ee1a52c20ea6dee7e052071c05cd4915749bc..7eb56caea7354b57d6e63df72965c6dee23ef6e2 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 f4be5f56d150e84c4bf96b18b263653433cc4c80..543a4f876f2153aa85b2c2c7e12148fa05c77530 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 73a1bc3a74761c7932dc681e79d7b03a0278f045..6c557bf34125eefc7199007dff7073e5cea600de 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 8f0e3d1135047edb5d890159ad2a80b8a0c5afe8..29919193c3532c7f4dd5d164e05e49ea2d81e9d4 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 9d04eb84c477bce7c0bbe6c654c959689411b9d7..d6b7f32c68b2429f30000d7c8724cc12b368202d 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 4e4e77a4baa23e4fd936eed318f58aa76b6c4362..5b984811df7b3d3bd23d9bb116f9153cdc6c1604 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 2cbdb8bb00611838f7ad39ef87f72fc44da6d0b8..8432076307be2ec81ddbbc08c78a88296d168e13 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 29dec68aee5a8627665b475ef92caf0f363ed26e..36a6d78277750d53f2793f254b2fc6a63aafc284 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 eab2c224c2f8c2badfb0055cd9fd44a747fc5962..7f02bf3e61fe8164a2e4dda64a4e50d31028ae90 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 661df2afbbc746587eeedc38ce9fc43d1bd409a8..174cf2a1f053639fc76d3b075fad290ccf0eb85d 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 1d746b342e0d44da8bbade4a0a7f1ac6721464e9..a57d22a7f8e5afcc89ed5853d84ef549d03de2df 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 c7b45eb946cbe47a13ea347c58a6f21a0d865db6..d70cb92e9306d094d2538db5c58aa6943bfd7267 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 14cad0fa8771f68f04d689a8a7a30a8e29cf61cb..4b4105af420164f49c5f6c1e4203ee8cd4e41542 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 bfa3a4dc207fb7b1fb10ef9719b625dceab1e96c..ced81e6f3d116f1dd95831f111d0a2111347bf38 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 4dd40210a66a0665cec6741c6aaf594ae57027a4..7f49c299af571638cc745d717c9f55b19bf11ff9 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 8b44ea9dedc32b9227918511d845212edc508b0c..f85a6a54c445360125c5260253f426be8e7c8097 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 cf15d57cfcaf61cafd84d983f1631800f44cfe4d..f2abc3619f0e8507dcef79258a747ada26c643bc 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 3b0128ee823ea93aacdd259afe791e2a217784a3..ca78bdbffe487d72abb7066da0c91223c931f820 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 23797001384606c80187ebdc913e5106f560dff1..8a8c51779f20932e5f2281cf00348f921f7b9bea 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 2fb0c554794fb651ebf71027c8f805d50f946c49..1b14340edd7bf530e1e9ef18f43bcb41cd209290 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 2711b5c7a86f227b48bed5a810b3b2b89d2067b8..6f4dfa24d1a30c16f07dbd1fd718821f4a580551 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 7448e755f05012607740bf842a9428b89376219f..24b6c4834abb7992b792dcd0e59d56613039dda5 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 35a4cf238f797ad546dbd22a3bdc72f86f96871e..b5c85deb78ad5ed64978790ae2133142a1a4394a 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 7448e755f05012607740bf842a9428b89376219f..46a4de5920e585362cfba18752b60021b40cbecd 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 d7527010e8b2f8db48f7abfa188c2bf3c69eaba4..4cc11eb20ba0b4da7eb6fa2bc24d36a8ad09945e 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 019945ebe8b858cf8a8fd7952c78f47aadb666e1..c266a5193bac6d2447bbdda555e4d1cf0fae9020 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 96c5d247232ae872002e617fd311722e338f0c80..736cbe81ed3839814e0d6aa6f0bdc610e020f11f 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 5130c5db6ed6e8ce4d550d1ace299fa3f0b40b85..74c7d6225aeac9a6578b3f1813496e06f868de3c 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 12745c54dc39ed1863b1b832b4bb5d1ab4214fe9..d480a57ff8297f7421affeb111c8f9e46c6f35bd 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 de113f2193667f1d23fd187f2327977825582960..724eaef1148b999870b80aaf1722ca5efc7354a3 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 a45ecbc0794198ecae99e56735cac693f5dad122..a61645d74c9342e63a826b6016f62423d4a312db 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 33e367059c5069468a1bca5a30ca8b5d9de237f0..7e8f874d2c2b0f47b122d0de0ce2e2714620735b 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 8201373d23420a54593ceb17ed8363f62c6d8213..edc1be8d6d82147f1f0f11a67b9082cf65a1ada0 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 47fd2c3e2b4faef721f628f2e33970f428fddc54..1d19fbad2dc53cb1f77c4f645b73ec8ddac790c0 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 c1c08878c0fd0205e1ad4153c0279b739df2dd6d..253ff176876ca0e016e802d292048a06fd04cad1 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 36c95032fb30b4c1163562540434395b0dbae1e8..4b4b59c43cb90a85798e06ef61292f76c0406b68 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 3a72af86ad8f8905635423ad8417dfb8d832d049..097a833e98d327842e5e7d9c2354a6ae76bc45cf 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 55665b0399c7e75dd5436c23e521b15f1b585682..089d728b01ca334162b824d9aefda862b7a249e9 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 b14861140c025181e821241f46a619b62b57c57a..c648ca66d56e38058f687dd2fa12136cd18f2523 100644 --- a/keyboards/xenon/config.h +++ b/keyboards/xenon/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #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 fd1146a1d41b1c266d5a4cf17490a107948bb7f0..9caa493f86e04aacc29f2094a9a606d99023a8bc 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 1b029d6b4946f56efc93b4057782c40caf621196..93e4b892918ed2389069f8086be2756038d60103 100644 --- a/keyboards/xiaomi/mk02/config.h +++ b/keyboards/xiaomi/mk02/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #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 6f216802f6fb87397bc01c5bee3b81baf8f5a7ea..58c3f3cbc343dfba72c4a433126e9d8796062801 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 c17d816cfce272af1424d30adddf42128fa31501..46896531a9166cc2282e742f9818b8db49abbc42 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 0ef0e8f21a6a6e05ee015110488818573986aad9..f06e823a885d079d01b62d75a470dbd05bc983ed 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 af8e8b7dab091d17b45f7be6b1ca058a45e3c4de..ac6989b9fe6d0b24f8f3d7506e5e4bfa9650afe5 100644 --- a/keyboards/xiudi/xd68/config.h +++ b/keyboards/xiudi/xd68/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #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 276bd729413451b569aa04d35bb95b667cac7b80..36d72134c138e660ef9a2d04b76a4afed135cc3a 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 9cceea346755489ac1bddd7d2771d3a085a2842a..604e9aec20de5f2419788b6d01a9c3b7cd94948d 100644 --- a/keyboards/xiudi/xd75/config.h +++ b/keyboards/xiudi/xd75/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #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 bb15a7faef36edffb3d782a75eded37f9e9c974c..732972249516ffe8af85e817509cc2c6430ef913 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 a96793cd75186d3f56d37802d928c4b1705be61d..742b7fce0b81814e0f62f7174a48ed0ad38aceac 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 e24a5a92a158f136c9510e34d8405241c93c7e87..7c02fdeeef85982376c04b901e637b61377f3a07 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 797d209db3e8871b5a2eabd5c047030543aede45..abd2e0d8f19898d863f1af5eeb4144de951befff 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 b8e92158b880386b91db5af8df62a47071c7463d..36d52e5f721bd0951abd915c0a5f20f61ffbe4c9 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 5f5b704f3642470e8893f383c8e245b5a66a7e44..52fcb09f8456c39b40078d201f4c909ee57c6c4a 100644 --- a/keyboards/xiudi/xd87/config.h +++ b/keyboards/xiudi/xd87/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #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 4f4f82fdaf35fa11f42f99b32613f570e1bba37b..922d0641f2ad51a26f8aa5c2d23007345021603c 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 ddf97f9d00d9798af6d7e39b36c2d5bd47866dbd..2291ca439e28c8456819093e66f963c838d586b0 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 4b01ab9ed7eee8e4077d35f5846630629d305405..aa9f2a7522d80e96e0fd539c21c28c92d314d647 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 773f612089c486174df3bcd0583bbe26cf01060e..37b977a0fe0651d2716679bde8cd495a8b759afd 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 b96b4e1352bed8be06bcb393479be54fc0208dfd..30b6cee59d21af0ad7afc6be1df66e2ba41ff46a 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 2bea6db3990072bdeb47e75a07581c77a8e6ff68..2277a52a4c618f02ba866b17acaa7e32b21ddc6d 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 e3284a6905169bfb326695f02dbfdc6615c65d64..40f3f44760ba9a59fb7b5e7075c1b2628ebe6c90 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}]