From 3da6575e2480d46399be01c21270c57420e0f16d Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 17:15:43 +1000 Subject: Move keyboard USB IDs and strings to data driven: M (#17859) --- keyboards/mokey/ginkgo65/config.h | 7 ------- keyboards/mokey/ginkgo65/info.json | 8 +++++++- keyboards/mokey/ginkgo65hot/config.h | 7 ------- keyboards/mokey/ginkgo65hot/info.json | 6 ++++++ keyboards/mokey/mokey63/config.h | 7 ------- keyboards/mokey/mokey63/info.json | 6 ++++++ keyboards/mokey/mokey64/config.h | 7 ------- keyboards/mokey/mokey64/info.json | 6 ++++++ keyboards/mokey/xox70/config.h | 7 ------- keyboards/mokey/xox70/info.json | 8 +++++++- keyboards/mokey/xox70hot/config.h | 7 ------- keyboards/mokey/xox70hot/info.json | 8 +++++++- 12 files changed, 39 insertions(+), 45 deletions(-) (limited to 'keyboards/mokey') diff --git a/keyboards/mokey/ginkgo65/config.h b/keyboards/mokey/ginkgo65/config.h index 3660989267..5b09351e32 100644 --- a/keyboards/mokey/ginkgo65/config.h +++ b/keyboards/mokey/ginkgo65/config.h @@ -15,13 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6653 -#define PRODUCT_ID 0x3365 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mokey -#define PRODUCT ginkgo 65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/info.json index 080d97feeb..462d1869b6 100644 --- a/keyboards/mokey/ginkgo65/info.json +++ b/keyboards/mokey/ginkgo65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ginkgo65", + "keyboard_name": "ginkgo 65", + "manufacturer": "Mokey", "url": "", "maintainer": "rhmokey", + "usb": { + "vid": "0x6653", + "pid": "0x3365", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h index 2830227490..63d633d661 100644 --- a/keyboards/mokey/ginkgo65hot/config.h +++ b/keyboards/mokey/ginkgo65hot/config.h @@ -15,13 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6653 -#define PRODUCT_ID 0x3366 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mokey -#define PRODUCT ginkgo65hot - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json index e2e96c167c..dbe99e1909 100644 --- a/keyboards/mokey/ginkgo65hot/info.json +++ b/keyboards/mokey/ginkgo65hot/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ginkgo65hot", + "manufacturer": "Mokey", "url": "", "maintainer": "mokey", + "usb": { + "vid": "0x6653", + "pid": "0x3366", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mokey/mokey63/config.h b/keyboards/mokey/mokey63/config.h index 504a274143..86ff35ad5c 100644 --- a/keyboards/mokey/mokey63/config.h +++ b/keyboards/mokey/mokey63/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6653 -#define PRODUCT_ID 0x063A -#define DEVICE_VER 0x0001 -#define MANUFACTURER rhmokey -#define PRODUCT MOKEY63 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json index 476667dfbc..f34c47050e 100644 --- a/keyboards/mokey/mokey63/info.json +++ b/keyboards/mokey/mokey63/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Mokey63", + "manufacturer": "Mokey", "url": "", "maintainer": "mokey", + "usb": { + "vid": "0x6653", + "pid": "0x063A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h index 52345ed973..60a0b69d38 100644 --- a/keyboards/mokey/mokey64/config.h +++ b/keyboards/mokey/mokey64/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x6653 -#define PRODUCT_ID 0x001A -#define DEVICE_VER 0x0001 - -#define MANUFACTURER rhmokey -#define PRODUCT MOKEY64 - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json index 62b9c90493..4673f1120c 100644 --- a/keyboards/mokey/mokey64/info.json +++ b/keyboards/mokey/mokey64/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Mokey64", + "manufacturer": "Mokey", "url": "", "maintainer": "mokey", + "usb": { + "vid": "0x6653", + "pid": "0x001A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mokey/xox70/config.h b/keyboards/mokey/xox70/config.h index f5c08c4480..3c1448ee75 100644 --- a/keyboards/mokey/xox70/config.h +++ b/keyboards/mokey/xox70/config.h @@ -15,13 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6653 -#define PRODUCT_ID 0x3370 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mokey -#define PRODUCT XOX 70 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json index 5baa620bc6..73aa7e8dec 100644 --- a/keyboards/mokey/xox70/info.json +++ b/keyboards/mokey/xox70/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "xox70", + "keyboard_name": "XOX 70", + "manufacturer": "Mokey", "url": "", "maintainer": "Mokey", + "usb": { + "vid": "0x6653", + "pid": "0x3370", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h index bc2279e3d1..3c1448ee75 100644 --- a/keyboards/mokey/xox70hot/config.h +++ b/keyboards/mokey/xox70hot/config.h @@ -15,13 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6653 -#define PRODUCT_ID 0x3371 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mokey -#define PRODUCT xox70hot - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json index a1fc86924f..8a490265ec 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "xox70hot", + "keyboard_name": "XOX 70 Hotswap", + "manufacturer": "Mokey", "url": "", "maintainer": "rhmokey", + "usb": { + "vid": "0x6653", + "pid": "0x3371", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan" }, -- cgit v1.2.3