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/tokyokeyboard/alix40/config.h | 7 ------- keyboards/tokyokeyboard/alix40/info.json | 6 ++++++ keyboards/tokyokeyboard/tokyo60/config.h | 7 ------- keyboards/tokyokeyboard/tokyo60/info.json | 6 ++++++ 4 files changed, 12 insertions(+), 14 deletions(-) (limited to 'keyboards/tokyokeyboard') diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index f4b4e6e5ab..8f2d1b7865 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5143 // QC -#define PRODUCT_ID 0x4134 // A4 -#define DEVICE_VER 0x0001 -#define MANUFACTURER quadcube -#define PRODUCT alix40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index 66a578bef3..220e238128 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "alix40", + "manufacturer": "quadcube", "url": "https://tokyokeyboard.com/", "maintainer": "qmk", + "usb": { + "vid": "0x5143", + "pid": "0x4134", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_40_alix": { "layout": [{ diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index 03dee74e9b..60ed4d8f86 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5436 // "T6" -#define PRODUCT_ID 0x6060 // Tokyo60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Tokyo Keyboard -#define PRODUCT Tokyo60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index 3f6b120c17..b6422e68c7 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Tokyo60", + "manufacturer": "Tokyo Keyboard", "url": "https://tokyokeyboard.com/", "maintainer": "qmk", + "usb": { + "vid": "0x5436", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_hhkb": { "layout": [{ -- cgit v1.2.3