From a8744b163074457253da2c63affd3b4cceefe04a Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:12:37 +1000 Subject: Move keyboard USB IDs and strings to data driven: S (#17889) --- keyboards/sentraq/number_pad/config.h | 7 ------- keyboards/sentraq/number_pad/info.json | 8 +++++++- keyboards/sentraq/s65_plus/config.h | 7 ------- keyboards/sentraq/s65_plus/info.json | 6 ++++++ keyboards/sentraq/s65_x/config.h | 7 ------- keyboards/sentraq/s65_x/info.json | 6 ++++++ 6 files changed, 19 insertions(+), 22 deletions(-) (limited to 'keyboards/sentraq') diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index 0426773a68..341bad6b67 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq -#define PRODUCT Sentraq Number Pad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index 806edcea27..b0c0ca370d 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "Sentraq Number Pad", + "keyboard_name": "Number Pad", + "manufacturer": "Sentraq", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "url": "https://sentraq.com/collections/kits/products/number-pad-rgb-kit", "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 2f02e8e162..e1e829b3ae 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT S65-PLUS -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index 141f7d6c63..625bc63fd3 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "S65-Plus", + "manufacturer": "Sentraq", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index b8886bf67f..61a468a33c 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT S65-X RGB -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index 20088cee89..7e87cf2011 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "S65-X PCB", + "manufacturer": "Sentraq", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ -- cgit v1.2.3