diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-15 17:54:07 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-15 17:54:07 +1000 |
| commit | c202602938e1b065e6bac394771b310fea2a3edb (patch) | |
| tree | 444978b63e48d68f004b1c0730929bfbcfb221e8 /keyboards/dztech/dz60rgb_ansi | |
| parent | 8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff) | |
| parent | 51d5aad25b92a34bc051849616fcd93e3ae407fc (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/dztech/dz60rgb_ansi')
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/info.json | 6 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/v1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/v1/info.json | 6 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/v2/config.h | 7 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/v2/info.json | 6 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/v2_1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 6 |
7 files changed, 23 insertions, 22 deletions
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 b1be1fb430..9b31f27f2f 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 89b2315ee6..92fcd17c88 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 f4ec86ae9d..7ec226c30b 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" + } +} |