From 0e3cc6af12ad0337574280f783ee118a79c6ea55 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Aug 2022 18:45:43 +1000 Subject: Move keyboard USB IDs and strings to data driven: X (#17925) --- 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 +++++++- 14 files changed, 45 insertions(+), 52 deletions(-) (limited to 'keyboards/xiudi') 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 . #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 . #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 . #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": [ -- cgit v1.2.1