From 1b92c204c10594fce6a715710c277a748a4fdc68 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 17:03:47 +1000 Subject: Move keyboard USB IDs and strings to data driven: K (#17846) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kabedon/kabedon78s/config.h | 7 ------- keyboards/kabedon/kabedon78s/info.json | 8 +++++++- keyboards/kabedon/kabedon980/config.h | 8 -------- keyboards/kabedon/kabedon980/info.json | 8 +++++++- keyboards/kabedon/kabedon98e/config.h | 7 ------- keyboards/kabedon/kabedon98e/info.json | 8 +++++++- 6 files changed, 21 insertions(+), 25 deletions(-) (limited to 'keyboards/kabedon') diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h index e0076afed8..fe34ddf67c 100644 --- a/keyboards/kabedon/kabedon78s/config.h +++ b/keyboards/kabedon/kabedon78s/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B44 //KD -#define PRODUCT_ID 0x3738 //78 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kabe_Don -#define PRODUCT 78S - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json index beaf71bd14..83668c5458 100644 --- a/keyboards/kabedon/kabedon78s/info.json +++ b/keyboards/kabedon/kabedon78s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KabeDon78s", + "keyboard_name": "78S", + "manufacturer": "Kabe_Don", "url": "", "maintainer": "370490639", + "usb": { + "vid": "0x4B44", + "pid": "0x3738", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h index db93dfcf85..7da74f6c92 100644 --- a/keyboards/kabedon/kabedon980/config.h +++ b/keyboards/kabedon/kabedon980/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B44 //KD -#define PRODUCT_ID 0x3938 //98 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kabe_Don -#define PRODUCT 980 - - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 13 diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json index 5be1ee11dd..879ea537be 100644 --- a/keyboards/kabedon/kabedon980/info.json +++ b/keyboards/kabedon/kabedon980/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KabeDon980", + "keyboard_name": "980", + "manufacturer": "Kabe_Don", "url": "https://kabedon.taobao.com", "maintainer": "370490639", + "usb": { + "vid": "0x4B44", + "pid": "0x3938", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h index a34e99bccd..e5cd98c40b 100644 --- a/keyboards/kabedon/kabedon98e/config.h +++ b/keyboards/kabedon/kabedon98e/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B44 -#define PRODUCT_ID 0x3935 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Kabe_Don -#define PRODUCT 98e - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 11 diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json index de8f975b2d..60a1cd25c6 100644 --- a/keyboards/kabedon/kabedon98e/info.json +++ b/keyboards/kabedon/kabedon98e/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KabeDon98E", + "keyboard_name": "98e", + "manufacturer": "Kabe_Don", "url": "", "maintainer": "370490639", + "usb": { + "vid": "0x4B44", + "pid": "0x3935", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3