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/kbdfans/kbdpad/mk1/config.h | 6 ------ keyboards/kbdfans/kbdpad/mk1/info.json | 8 +++++++- keyboards/kbdfans/kbdpad/mk2/config.h | 7 ------- keyboards/kbdfans/kbdpad/mk2/info.json | 8 +++++++- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'keyboards/kbdfans/kbdpad') diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h index 80a1abef57..28ce21e88e 100644 --- a/keyboards/kbdfans/kbdpad/mk1/config.h +++ b/keyboards/kbdfans/kbdpad/mk1/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x20A0 -#define PRODUCT_ID 0x422D -#define DEVICE_VER 0x0200 -#define MANUFACTURER KBDfans -#define PRODUCT KBDPAD Mk. I - #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index 760d1d94ea..97736cf44f 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KBDfans KBDPad MKI", + "keyboard_name": "KBDPAD Mk. I", + "manufacturer": "KBDfans", "url": "https://kbdfans.com/products/kbdfans-pad-custom-mechanical-keyboard-diy-kit", "maintainer": "qmk", + "usb": { + "vid": "0x20A0", + "pid": "0x422D", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index 99f3792d55..711d1b03e5 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0006 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDfans -#define PRODUCT KBDPAD-MKII - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 2f61318575..11522e14f8 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "kbdpad_mk2", + "keyboard_name": "KBDPAD-MKII", + "manufacturer": "KBDfans", "url": "https://kb.ai03.me/projects/kbdpad-mkii.html", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [ -- cgit v1.2.3 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/kbdfans/kbdpad/mk2/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/kbdfans/kbdpad') diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index 711d1b03e5..c0f1632169 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { D3, D1, D2, C6, C7, B6 } #define MATRIX_COL_PINS { C4, C5, B3, B2 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3