From 7222969964a41a295910844ef93372e368439a09 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 Aug 2022 10:02:19 +1000 Subject: Move keyboard USB IDs and strings to data driven: L (#17849) --- keyboards/lucid/alexa/config.h | 7 ------- keyboards/lucid/alexa/info.json | 6 ++++++ keyboards/lucid/alexa_solder/config.h | 7 ------- keyboards/lucid/alexa_solder/info.json | 6 ++++++ keyboards/lucid/kbd8x_hs/config.h | 7 ------- keyboards/lucid/kbd8x_hs/info.json | 8 +++++++- keyboards/lucid/phantom_hs/config.h | 7 ------- keyboards/lucid/phantom_hs/info.json | 6 ++++++ keyboards/lucid/phantom_solder/config.h | 7 ------- keyboards/lucid/phantom_solder/info.json | 6 ++++++ keyboards/lucid/scarlet/config.h | 7 ------- keyboards/lucid/scarlet/info.json | 8 +++++++- 12 files changed, 38 insertions(+), 44 deletions(-) (limited to 'keyboards/lucid') diff --git a/keyboards/lucid/alexa/config.h b/keyboards/lucid/alexa/config.h index 19b5f4f19a..433c43b5d2 100644 --- a/keyboards/lucid/alexa/config.h +++ b/keyboards/lucid/alexa/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7667 // Lucid -#define PRODUCT_ID 0x0005 // Phantom -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Lucid -#define PRODUCT Alexa - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json index 91c3836444..ffd9cb9c8d 100644 --- a/keyboards/lucid/alexa/info.json +++ b/keyboards/lucid/alexa/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Alexa", + "manufacturer": "Lucid", "url": "https://www.makerkeyboards.com/products/alexa", "maintainer": "mrnoisytiger", + "usb": { + "vid": "0x7667", + "pid": "0x0005", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ diff --git a/keyboards/lucid/alexa_solder/config.h b/keyboards/lucid/alexa_solder/config.h index 63fd1f2e2d..6bbd9eb32d 100644 --- a/keyboards/lucid/alexa_solder/config.h +++ b/keyboards/lucid/alexa_solder/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7667 // Maker Keyboards -#define PRODUCT_ID 0x0006 // Alexa -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Maker Keyboards -#define PRODUCT Alexa - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/info.json index 319cb71206..9f1c64363f 100644 --- a/keyboards/lucid/alexa_solder/info.json +++ b/keyboards/lucid/alexa_solder/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Alexa Solder", + "manufacturer": "Maker Keyboards", "url": "http://www.makerkeyboards.com", "maintainer": "Maker Keyboards", + "usb": { + "vid": "0x7667", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lucid/kbd8x_hs/config.h b/keyboards/lucid/kbd8x_hs/config.h index 1e5cff8e7f..e6e587c458 100644 --- a/keyboards/lucid/kbd8x_hs/config.h +++ b/keyboards/lucid/kbd8x_hs/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7667 // Lucid -#define PRODUCT_ID 0x0003 // KBD8X Hotswap PCB's -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Lucid -#define PRODUCT KBD8X_HS - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json index 1a22c78326..5adeb63b8b 100644 --- a/keyboards/lucid/kbd8x_hs/info.json +++ b/keyboards/lucid/kbd8x_hs/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KBD8X Hotswap PCB's", + "keyboard_name": "KBD8X Hotswap", + "manufacturer": "Lucid", "url": "http://www.lucidkb.com", "maintainer": "Lucid", + "usb": { + "vid": "0x7667", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/lucid/phantom_hs/config.h b/keyboards/lucid/phantom_hs/config.h index b94b345c16..bf9f1f371e 100644 --- a/keyboards/lucid/phantom_hs/config.h +++ b/keyboards/lucid/phantom_hs/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7667 // Lucid -#define PRODUCT_ID 0x0001 // Phantom -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Lucid -#define PRODUCT Phantom - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/info.json index 2aea46bdd1..5ab8f56608 100644 --- a/keyboards/lucid/phantom_hs/info.json +++ b/keyboards/lucid/phantom_hs/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Phantom", + "manufacturer": "Lucid", "url": "http://www.lucidkb.com", "maintainer": "Lucid", + "usb": { + "vid": "0x7667", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/lucid/phantom_solder/config.h b/keyboards/lucid/phantom_solder/config.h index 2c78c4f5ff..2fdc7ef475 100644 --- a/keyboards/lucid/phantom_solder/config.h +++ b/keyboards/lucid/phantom_solder/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7667 // Lucid -#define PRODUCT_ID 0x0002 // Phantom_Solder -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Lucid -#define PRODUCT Phantom - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/info.json index beee1ac2b2..950107367f 100644 --- a/keyboards/lucid/phantom_solder/info.json +++ b/keyboards/lucid/phantom_solder/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Phantom Solder", + "manufacturer": "Lucid", "url": "http://www.lucidkb.com", "maintainer": "Lucid", + "usb": { + "vid": "0x7667", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lucid/scarlet/config.h b/keyboards/lucid/scarlet/config.h index 67c2fe7b07..3435720623 100644 --- a/keyboards/lucid/scarlet/config.h +++ b/keyboards/lucid/scarlet/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7667 // Lucid -#define PRODUCT_ID 0x0004 // Scarlet PCB's -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Lucid -#define PRODUCT Scarlet - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/lucid/scarlet/info.json b/keyboards/lucid/scarlet/info.json index 59526a9f4c..219a64a2ae 100644 --- a/keyboards/lucid/scarlet/info.json +++ b/keyboards/lucid/scarlet/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Scarlet PCB's", + "keyboard_name": "Scarlet", + "manufacturer": "Lucid", "url": "http://www.lucidkb.com", "maintainer": "Lucid", + "usb": { + "vid": "0x7667", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ -- cgit v1.2.3