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/kiwikeebs/macro/config.h | 7 ------- keyboards/kiwikeebs/macro/info.json | 8 +++++++- keyboards/kiwikeebs/macro_v2/config.h | 7 ------- keyboards/kiwikeebs/macro_v2/info.json | 8 +++++++- 4 files changed, 14 insertions(+), 16 deletions(-) (limited to 'keyboards/kiwikeebs') diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index 47349d0e09..2457f99879 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B51 -#define PRODUCT_ID 0x4712 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKeebs -#define PRODUCT MacroBoard v.1.0 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index de9ce2f01f..63fedd2484 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KiwiKeebs MacroBoard v1.0", + "keyboard_name": "MacroBoard v.1.0", + "manufacturer": "KiwiKeebs", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", + "usb": { + "vid": "0x4B51", + "pid": "0x4712", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h index a962a9a82a..179a08e34c 100644 --- a/keyboards/kiwikeebs/macro_v2/config.h +++ b/keyboards/kiwikeebs/macro_v2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B51 -#define PRODUCT_ID 0x4712 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKeebs -#define PRODUCT MacroBoard v.2.0 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json index 524e259463..8c76890abd 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KiwiKeebs MacroBoard v.2.0", + "keyboard_name": "MacroBoard v.2.0", + "manufacturer": "KiwiKeebs", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", + "usb": { + "vid": "0x4B51", + "pid": "0x4712", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3