From 17176daf26ae17b8ae54312217555f1bfed782c1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 11:35:08 +1000 Subject: Move keyboard USB IDs and strings to data driven: T (#17899) --- keyboards/takashicompany/center_enter/config.h | 7 ------- keyboards/takashicompany/center_enter/info.json | 6 ++++++ keyboards/takashicompany/compacx/config.h | 7 ------- keyboards/takashicompany/compacx/info.json | 6 ++++++ keyboards/takashicompany/dogtag/config.h | 7 ------- keyboards/takashicompany/dogtag/info.json | 6 ++++++ keyboards/takashicompany/endzone34/config.h | 7 ------- keyboards/takashicompany/endzone34/info.json | 6 ++++++ keyboards/takashicompany/heavy_left/config.h | 7 ------- keyboards/takashicompany/heavy_left/info.json | 8 +++++++- keyboards/takashicompany/minizone/config.h | 7 ------- keyboards/takashicompany/minizone/info.json | 6 ++++++ keyboards/takashicompany/qoolee/config.h | 7 ------- keyboards/takashicompany/qoolee/info.json | 6 ++++++ keyboards/takashicompany/radialex/config.h | 7 ------- keyboards/takashicompany/radialex/info.json | 6 ++++++ 16 files changed, 49 insertions(+), 57 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index d6840ca682..0806c1068d 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0012 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Center x Enter - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 12 diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index cd7861f453..c9ecdb67ec 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Center x Enter", + "manufacturer": "takashicompany", "url": "", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index 1db4a7357a..3d769ab896 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0014 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Compacx - /* key matrix size */ #define MATRIX_ROWS 5 * 2 #define MATRIX_COLS 7 diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index 431579feb1..7690d3c333 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Compacx", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/compacx", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0014", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index bc4c44d24c..ebb5d696c4 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0018 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT DogTag - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 72bd5eb136..b9f82c26cb 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "DogTag", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/dogtag", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0018", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index c2c9e04200..5c8236c700 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0006 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT EndZone34 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index a70799b39b..2284f7a3b4 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "EndZone34", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/endzone34", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index 4c3138fc8e..4ca06fab2b 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0015 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Heavy Left - /* key matrix size */ #define MATRIX_ROWS 5 * 2 #define MATRIX_COLS 10 diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 878618e63d..6f04de1738 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "heavy_left", + "keyboard_name": "Heavy Left", + "manufacturer": "takashicompany", "url": "", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0015", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index 73a85e2d9f..25a74dc4d7 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0021 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT miniZone - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index 4c4969d1fc..51fb57276c 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "miniZone", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/minizone", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0021", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index 36bb330c95..24d5aa11fe 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0013 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT QooLee - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 12 diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index 56ef36b6e9..89335351ce 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "QooLee", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/qoolee", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0013", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index 7aa3c85360..49cb1f7e09 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7463 // tc = takashicompany -#define PRODUCT_ID 0x0019 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashicompany -#define PRODUCT Radialex - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 7 diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index d78e301ee9..8aff0b5ab8 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Radialex", + "manufacturer": "takashicompany", "url": "https://github.com/takashicompany/radialex", "maintainer": "takashicompany", + "usb": { + "vid": "0x7463", + "pid": "0x0019", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3