From 51d5aad25b92a34bc051849616fcd93e3ae407fc Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 15 Aug 2022 13:30:12 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: D-E (#17956) --- keyboards/dztech/dz60rgb/info.json | 4 ++++ keyboards/dztech/dz60rgb/v1/config.h | 7 ------- keyboards/dztech/dz60rgb/v1/info.json | 6 ++++++ keyboards/dztech/dz60rgb/v2/config.h | 7 ------- keyboards/dztech/dz60rgb/v2/info.json | 6 ++++++ keyboards/dztech/dz60rgb/v2_1/config.h | 7 ------- keyboards/dztech/dz60rgb/v2_1/info.json | 6 ++++++ keyboards/dztech/dz60rgb_ansi/info.json | 6 +++++- keyboards/dztech/dz60rgb_ansi/v1/config.h | 7 ------- keyboards/dztech/dz60rgb_ansi/v1/info.json | 6 ++++++ keyboards/dztech/dz60rgb_ansi/v2/config.h | 7 ------- keyboards/dztech/dz60rgb_ansi/v2/info.json | 6 ++++++ keyboards/dztech/dz60rgb_ansi/v2_1/config.h | 7 ------- keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 6 ++++++ keyboards/dztech/dz60rgb_wkl/info.json | 6 +++++- keyboards/dztech/dz60rgb_wkl/v1/config.h | 7 ------- keyboards/dztech/dz60rgb_wkl/v1/info.json | 6 ++++++ keyboards/dztech/dz60rgb_wkl/v2/config.h | 7 ------- keyboards/dztech/dz60rgb_wkl/v2/info.json | 6 ++++++ keyboards/dztech/dz60rgb_wkl/v2_1/config.h | 7 ------- keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 6 ++++++ keyboards/dztech/dz65rgb/info.json | 6 +++++- keyboards/dztech/dz65rgb/v1/config.h | 7 ------- keyboards/dztech/dz65rgb/v1/info.json | 6 ++++++ keyboards/dztech/dz65rgb/v2/config.h | 7 ------- keyboards/dztech/dz65rgb/v2/info.json | 6 ++++++ keyboards/dztech/dz65rgb/v3/config.h | 7 ------- keyboards/dztech/dz65rgb/v3/info.json | 6 ++++++ 28 files changed, 91 insertions(+), 87 deletions(-) create mode 100644 keyboards/dztech/dz60rgb/v1/info.json create mode 100644 keyboards/dztech/dz60rgb/v2/info.json create mode 100644 keyboards/dztech/dz60rgb/v2_1/info.json create mode 100644 keyboards/dztech/dz60rgb_ansi/v1/info.json create mode 100644 keyboards/dztech/dz60rgb_ansi/v2/info.json create mode 100644 keyboards/dztech/dz60rgb_ansi/v2_1/info.json create mode 100644 keyboards/dztech/dz60rgb_wkl/v1/info.json create mode 100644 keyboards/dztech/dz60rgb_wkl/v2/info.json create mode 100644 keyboards/dztech/dz60rgb_wkl/v2_1/info.json create mode 100644 keyboards/dztech/dz65rgb/v1/info.json create mode 100644 keyboards/dztech/dz65rgb/v2/info.json create mode 100644 keyboards/dztech/dz65rgb/v3/info.json (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json index 5cbce57165..d5179aa09f 100644 --- a/keyboards/dztech/dz60rgb/info.json +++ b/keyboards/dztech/dz60rgb/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "DZ60RGB", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h index 7bdad00144..69d4ac0b90 100644 --- a/keyboards/dztech/dz60rgb/v1/config.h +++ b/keyboards/dztech/dz60rgb/v1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1120 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json new file mode 100644 index 0000000000..914ae82cd9 --- /dev/null +++ b/keyboards/dztech/dz60rgb/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1120", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h index 9426a7be99..1beccc5c08 100644 --- a/keyboards/dztech/dz60rgb/v2/config.h +++ b/keyboards/dztech/dz60rgb/v2/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1121 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json new file mode 100644 index 0000000000..172ca21102 --- /dev/null +++ b/keyboards/dztech/dz60rgb/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1121", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h index 7e5dfd6703..f1fddcb2e9 100644 --- a/keyboards/dztech/dz60rgb/v2_1/config.h +++ b/keyboards/dztech/dz60rgb/v2_1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1121 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json new file mode 100644 index 0000000000..7b2073bd4a --- /dev/null +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1121", + "device_version": "2.1.0" + } +} diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json index 8431f17708..31c04c9599 100644 --- a/keyboards/dztech/dz60rgb_ansi/info.json +++ b/keyboards/dztech/dz60rgb_ansi/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz60rgb_ansi", + "keyboard_name": "DZ60RGB_ANSI", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h index ccfe91b66b..518a3d7d4e 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1220 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_ANSI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json new file mode 100644 index 0000000000..6fcbd0806f --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1220", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h index 865ac2ab21..9efc5b75d3 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1221 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_ANSI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json new file mode 100644 index 0000000000..6d2ac4fbab --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1221", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h index 64e2a40bda..e08286cd64 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1221 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_ANSI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json new file mode 100644 index 0000000000..f2afc157ed --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1221", + "device_version": "2.1.0" + } +} diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json index 304c571f22..e5d0b7b962 100644 --- a/keyboards/dztech/dz60rgb_wkl/info.json +++ b/keyboards/dztech/dz60rgb_wkl/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz60rgb_wkl", + "keyboard_name": "DZ60RGB_WKL", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h index 9af78167ad..4a341e9df9 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1320 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_WKL - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json new file mode 100644 index 0000000000..767be04f31 --- /dev/null +++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1320", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h index 140d74fee0..bd4ca27e24 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1321 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_WKL - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json new file mode 100644 index 0000000000..ee69be3b5a --- /dev/null +++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1321", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h index 3ab221391e..1088863891 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1321 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_WKL - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json new file mode 100644 index 0000000000..3b2b23e989 --- /dev/null +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1321", + "device_version": "2.1.0" + } +} diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json index 4a97f4fd82..32171cd74a 100644 --- a/keyboards/dztech/dz65rgb/info.json +++ b/keyboards/dztech/dz65rgb/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz65rgb", + "keyboard_name": "DZ65RGB", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h index d281eaa51e..0ae5173051 100644 --- a/keyboards/dztech/dz65rgb/v1/config.h +++ b/keyboards/dztech/dz65rgb/v1/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1420 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json new file mode 100644 index 0000000000..752d361728 --- /dev/null +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1420", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h index 5267f42aa2..d2dec023ef 100644 --- a/keyboards/dztech/dz65rgb/v2/config.h +++ b/keyboards/dztech/dz65rgb/v2/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1421 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json new file mode 100644 index 0000000000..1cfb5abdbb --- /dev/null +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1421", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h index 6c21fa22c2..87c6555e49 100755 --- a/keyboards/dztech/dz65rgb/v3/config.h +++ b/keyboards/dztech/dz65rgb/v3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1424 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGBV3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json new file mode 100644 index 0000000000..f2c2236031 --- /dev/null +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1424", + "device_version": "3.0.0" + } +} -- cgit v1.2.3