From b0eda7701a372e820264c6a78afa1f8c410845f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 22 Aug 2022 08:08:50 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 3 (#18111) --- keyboards/bajjak/config.h | 6 ------ keyboards/bajjak/info.json | 8 +++++++- keyboards/dumbpad/v1x/config.h | 3 --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 4 ---- keyboards/handwired/tractyl_manuform/4x6_right/info.json | 6 +++++- keyboards/handwired/tractyl_manuform/5x6_right/config.h | 3 --- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/info.json | 5 ++++- keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h | 2 -- .../handwired/tractyl_manuform/5x6_right/teensy2pp/info.json | 3 +++ keyboards/handwired/tractyl_manuform/config.h | 3 --- keyboards/handwired/tractyl_manuform/info.json | 5 ++++- keyboards/kapcave/paladinpad/rev1/config.h | 2 -- keyboards/kapcave/paladinpad/rev2/config.h | 2 -- keyboards/kin80/blackpill103/config.h | 2 -- keyboards/kin80/blackpill103/info.json | 5 +++++ keyboards/kin80/blackpill401/config.h | 2 -- keyboards/kin80/blackpill401/info.json | 5 +++++ keyboards/kin80/blackpill411/config.h | 2 -- keyboards/kin80/blackpill411/info.json | 5 +++++ keyboards/kin80/micro/config.h | 2 -- keyboards/kin80/micro/info.json | 5 +++++ keyboards/kopibeng/xt60_singa/config.h | 7 ------- keyboards/kopibeng/xt60_singa/info.json | 8 +++++++- keyboards/massdrop/alt/config.h | 4 ---- keyboards/massdrop/alt/info.json | 5 +++++ keyboards/massdrop/ctrl/config.h | 4 ---- keyboards/massdrop/ctrl/info.json | 5 +++++ keyboards/mechwild/puckbuddy/config.h | 7 ------- keyboards/mechwild/puckbuddy/info.json | 8 +++++++- keyboards/minimon/index_tab/config.h | 6 ------ keyboards/minimon/index_tab/info.json | 6 +++++- keyboards/tkw/grandiceps/config.h | 4 ---- keyboards/v4n4g0rth0n/v1/config.h | 2 -- keyboards/v4n4g0rth0n/v1/info.json | 5 +++++ keyboards/v4n4g0rth0n/v2/config.h | 2 -- keyboards/v4n4g0rth0n/v2/info.json | 5 +++++ keyboards/vertex/angler2/config.h | 7 ------- keyboards/vertex/angler2/info.json | 8 +++++++- keyboards/vitamins_included/rev1/config.h | 3 --- keyboards/vitamins_included/rev1/info.json | 5 +++++ keyboards/vitamins_included/rev2/config.h | 3 --- keyboards/vitamins_included/rev2/info.json | 5 +++++ keyboards/xelus/valor_frl_tkl/info.json | 4 +--- keyboards/xelus/valor_frl_tkl/rev1/info.json | 6 ++++++ keyboards/xelus/valor_frl_tkl/rev2_0/config.h | 4 ---- keyboards/xelus/valor_frl_tkl/rev2_0/info.json | 6 ++++++ keyboards/xelus/valor_frl_tkl/rev2_1/config.h | 4 ---- keyboards/xelus/valor_frl_tkl/rev2_1/info.json | 6 ++++++ keyboards/ymdk/yd60mq/12led/config.h | 2 -- keyboards/ymdk/yd60mq/12led/info.json | 5 +++++ keyboards/ymdk/yd60mq/16led/config.h | 2 -- keyboards/ymdk/yd60mq/16led/info.json | 5 +++++ keyboards/ymdk/ymd75/rev1/config.h | 1 - keyboards/ymdk/ymd75/rev1/info.json | 5 +++++ keyboards/ymdk/ymd75/rev2/config.h | 1 - keyboards/ymdk/ymd75/rev2/info.json | 5 +++++ keyboards/ymdk/ymd75/rev3/config.h | 1 - keyboards/ymdk/ymd75/rev3/info.json | 5 +++++ 64 files changed, 152 insertions(+), 114 deletions(-) create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json create mode 100644 keyboards/kin80/blackpill103/info.json create mode 100644 keyboards/kin80/blackpill401/info.json create mode 100644 keyboards/kin80/blackpill411/info.json create mode 100644 keyboards/kin80/micro/info.json create mode 100644 keyboards/v4n4g0rth0n/v1/info.json create mode 100644 keyboards/v4n4g0rth0n/v2/info.json create mode 100644 keyboards/vitamins_included/rev1/info.json create mode 100644 keyboards/vitamins_included/rev2/info.json create mode 100644 keyboards/xelus/valor_frl_tkl/rev1/info.json create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/info.json create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_1/info.json create mode 100644 keyboards/ymdk/yd60mq/12led/info.json create mode 100644 keyboards/ymdk/yd60mq/16led/info.json create mode 100644 keyboards/ymdk/ymd75/rev1/info.json create mode 100644 keyboards/ymdk/ymd75/rev2/info.json create mode 100644 keyboards/ymdk/ymd75/rev3/info.json diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h index 344bc9040e..d821bc0a8c 100644 --- a/keyboards/bajjak/config.h +++ b/keyboards/bajjak/config.h @@ -23,12 +23,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define PRODUCT BAJJAK - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json index 072ca33f5b..f3ebb4e159 100644 --- a/keyboards/bajjak/info.json +++ b/keyboards/bajjak/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "bajjak", + "keyboard_name": "BAJJAK", + "manufacturer": "garykong", "maintainer": "garykong", + "usb": { + "vid": "0x1209", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_6x7": { "layout": [ diff --git a/keyboards/dumbpad/v1x/config.h b/keyboards/dumbpad/v1x/config.h index 0d967a6a01..0222d87c66 100644 --- a/keyboards/dumbpad/v1x/config.h +++ b/keyboards/dumbpad/v1x/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index ab46bc5276..f6a784a4c8 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #include "config_common.h" -#define PRODUCT_ID 0x3537 -#define DEVICE_VER 0x0001 -#define PRODUCT Tractyl Manuform(4x6) - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 0681db1f3e..62b61072ec 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Tractyl Manuform 4x6", + "keyboard_name": "Tractyl Manuform (4x6)", "url": "", "maintainer": "drashna", + "usb": { + "pid": "0x3537", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_4x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index fc5037ae9d..53a2b41e06 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h @@ -20,9 +20,6 @@ along with this program. If not, see . #include "config_common.h" -#define PRODUCT_ID 0x3536 -#define DEVICE_VER 0x0001 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h index d8d36e824c..486459560e 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once -#define PRODUCT Tractyl Manuform(5x6) Elite C - // wiring of each half #define MATRIX_COL_PINS \ { D4, D7, E6, B4, B5, B7 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json new file mode 100644 index 0000000000..b3cb5928de --- /dev/null +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Tractyl Manuform (5x6) Elite-C" +} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index f9a44587b0..312c271bb8 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once -#define PRODUCT Tractyl Manuform(5x6) Proton C - // wiring of each half #define MATRIX_COL_PINS \ { B0, B1, B2, B3, B4, B5 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json new file mode 100644 index 0000000000..d88708d17d --- /dev/null +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Tractyl Manuform (5x6) Proton-C" +} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 5f0350810c..3fc1bc10a2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once -#define PRODUCT Tractyl Manuform(5x6) BlackPill - // wiring of each half #define MATRIX_COL_PINS \ { A15, B3, B4, B5, B6, B7 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json new file mode 100644 index 0000000000..7466004165 --- /dev/null +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Tractyl Manuform (5x6) BlackPill" +} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json index 81a308fd21..5000486242 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json @@ -1,6 +1,9 @@ { - "keyboard_name": "Tractyl Manuform 5x6", "url": "", + "usb": { + "pid": "0x3536", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_5x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index 442d474920..57c2fd6fcd 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once -#define PRODUCT Tractyl Manuform(5x6) Teensy 2.0 ++ - // wiring of each half #define MATRIX_COL_PINS \ { C0, C1, C2, C3, C4, C5 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json new file mode 100644 index 0000000000..dfdbc435bc --- /dev/null +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++" +} diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h index 845125c5cd..6f62685f4e 100644 --- a/keyboards/handwired/tractyl_manuform/config.h +++ b/keyboards/handwired/tractyl_manuform/config.h @@ -20,9 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x44DD - /* disable debug print */ // #define NO_DEBUG diff --git a/keyboards/handwired/tractyl_manuform/info.json b/keyboards/handwired/tractyl_manuform/info.json index 7214e6773b..c84d008e15 100644 --- a/keyboards/handwired/tractyl_manuform/info.json +++ b/keyboards/handwired/tractyl_manuform/info.json @@ -1,4 +1,7 @@ { "manufacturer": "QMK Community", - "maintainer": "Drashna Jael're" + "maintainer": "Drashna Jael're", + "usb": { + "vid": "0x44DD" + } } diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h index 84af56ec25..5a59246355 100644 --- a/keyboards/kapcave/paladinpad/rev1/config.h +++ b/keyboards/kapcave/paladinpad/rev1/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { C7, B6, B4, D7, D6 } #define MATRIX_COL_PINS { D4, D5, D3, B7 } diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h index a27ac03ab1..a04bfcd46e 100644 --- a/keyboards/kapcave/paladinpad/rev2/config.h +++ b/keyboards/kapcave/paladinpad/rev2/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define DEVICE_VER 0x0002 - /* key matrix pins */ #define MATRIX_ROW_PINS { F4, F6, D7, B4, D6 } #define MATRIX_COL_PINS { F7, F5, D3, B7 } diff --git a/keyboards/kin80/blackpill103/config.h b/keyboards/kin80/blackpill103/config.h index b8be5e6481..052828fb83 100644 --- a/keyboards/kin80/blackpill103/config.h +++ b/keyboards/kin80/blackpill103/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0002 - #undef MATRIX_ROW_PINS #undef MATRIX_COL_PINS diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/kin80/blackpill103/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/kin80/blackpill401/config.h b/keyboards/kin80/blackpill401/config.h index 5f5f37c6d3..2cbca43a08 100644 --- a/keyboards/kin80/blackpill401/config.h +++ b/keyboards/kin80/blackpill401/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0003 - #undef MATRIX_ROW_PINS #undef MATRIX_COL_PINS diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json new file mode 100644 index 0000000000..b377cdff00 --- /dev/null +++ b/keyboards/kin80/blackpill401/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/kin80/blackpill411/config.h b/keyboards/kin80/blackpill411/config.h index 5f5f37c6d3..2cbca43a08 100644 --- a/keyboards/kin80/blackpill411/config.h +++ b/keyboards/kin80/blackpill411/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0003 - #undef MATRIX_ROW_PINS #undef MATRIX_COL_PINS diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json new file mode 100644 index 0000000000..b377cdff00 --- /dev/null +++ b/keyboards/kin80/blackpill411/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/kin80/micro/config.h b/keyboards/kin80/micro/config.h index 546d0bc5f5..57b9adc975 100644 --- a/keyboards/kin80/micro/config.h +++ b/keyboards/kin80/micro/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 } #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 } #define UNUSED_PINS { C7 } diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/kin80/micro/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h index 345598db44..ef20c3cdf1 100644 --- a/keyboards/kopibeng/xt60_singa/config.h +++ b/keyboards/kopibeng/xt60_singa/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B50 // 'KP' kopibeng -#define PRODUCT_ID 0x0601 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kopibeng -#define PRODUCT XT60_SINGA - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json index 6d8ec3cd21..09191eac10 100644 --- a/keyboards/kopibeng/xt60_singa/info.json +++ b/keyboards/kopibeng/xt60_singa/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "XT60_SINGA", - "maintainer": "Kopibeng", + "manufacturer": "kopibeng", "url": "", + "maintainer": "Kopibeng", + "usb": { + "vid": "0x4B50", + "pid": "0x0601", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h index 2ab9c26d2c..5c63684392 100644 --- a/keyboards/massdrop/alt/config.h +++ b/keyboards/massdrop/alt/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEED3 -#define DEVICE_VER 0x0101 - #define MANUFACTURER "Massdrop Inc." #define PRODUCT "ALT Keyboard" #define SERIAL_NUM "Unavailable" diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json index 9a820661bc..909ca8904a 100644 --- a/keyboards/massdrop/alt/info.json +++ b/keyboards/massdrop/alt/info.json @@ -2,6 +2,11 @@ "keyboard_name": "ALT", "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard", "maintainer": "Massdrop", + "usb": { + "vid": "0x04D8", + "pid": "0xEED3", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h index 15abcaa674..41808e5241 100644 --- a/keyboards/massdrop/ctrl/config.h +++ b/keyboards/massdrop/ctrl/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEED2 -#define DEVICE_VER 0x0101 - #define MANUFACTURER "Massdrop Inc." #define PRODUCT "CTRL Keyboard" #define SERIAL_NUM "Unavailable" diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json index 00d74be021..7d0810c630 100644 --- a/keyboards/massdrop/ctrl/info.json +++ b/keyboards/massdrop/ctrl/info.json @@ -2,6 +2,11 @@ "keyboard_name": "CTRL", "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard", "maintainer": "Massdrop", + "usb": { + "vid": "0x04D8", + "pid": "0xEED2", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index fac68071bb..0dbf1f694c 100644 --- a/keyboards/mechwild/puckbuddy/config.h +++ b/keyboards/mechwild/puckbuddy/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x170F -#define DEVICE_VER 0x0100 -#define MANUFACTURER MechWild -#define PRODUCT PuckBuddy - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 2bba4ba506..742438e8f5 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MechWild PuckBuddy", + "keyboard_name": "PuckBuddy", + "manufacturer": "MechWild", "url": "mechwild.com", "maintainer": "kylemccreery", + "usb": { + "vid": "0x6D77", + "pid": "0x170F", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index fc02185545..788ab878e4 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B49 -#define PRODUCT_ID 0x1306 -#define DEVICE_VER 0x0001 -#define PRODUCT Index Tab - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 13 diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 209d3044fe..604c3881e1 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -1,10 +1,14 @@ { "keyboard_name": "Index Tab", - "maintainer": "kyrremann", "url": "https://github.com/Kyrremann/index-tab", "layout_aliases": { "LAYOUT": "LAYOUT_ortho_6x13" }, + "usb": { + "vid": "0x4B49", + "pid": "0x1306", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_6x13": { "layout": [ diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index f9e9460b88..76a3de1bab 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define PRODUCT Grandiceps Split - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 6 diff --git a/keyboards/v4n4g0rth0n/v1/config.h b/keyboards/v4n4g0rth0n/v1/config.h index dd72cf6500..effd2268db 100644 --- a/keyboards/v4n4g0rth0n/v1/config.h +++ b/keyboards/v4n4g0rth0n/v1/config.h @@ -17,7 +17,5 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS { C7, C6, B6, B5, B7} #define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, F0} diff --git a/keyboards/v4n4g0rth0n/v1/info.json b/keyboards/v4n4g0rth0n/v1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/v4n4g0rth0n/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/v4n4g0rth0n/v2/config.h b/keyboards/v4n4g0rth0n/v2/config.h index 6e78e73573..2299b791ef 100644 --- a/keyboards/v4n4g0rth0n/v2/config.h +++ b/keyboards/v4n4g0rth0n/v2/config.h @@ -17,7 +17,5 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0002 - #define MATRIX_ROW_PINS { C7, C6, B6, B5, B7} #define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, B0} diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/v4n4g0rth0n/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h index 89e6fc4a14..7e71d1922e 100644 --- a/keyboards/vertex/angler2/config.h +++ b/keyboards/vertex/angler2/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x480E -#define PRODUCT_ID 0x408F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Vertex_eason -#define PRODUCT Angler2 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index 332cd27f7c..70feae3b64 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "angler2", + "keyboard_name": "Angler2", + "manufacturer": "Vertex_eason", "url": "https://github.com/Vertex-kb", "maintainer": "vertex", + "usb": { + "vid": "0x480E", + "pid": "0x408F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index 675dae1044..0a32ba8c47 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define EE_HANDS #define SOFT_SERIAL_PIN D0 -/* USB Device descriptor parameters */ -#define DEVICE_VER 0x0001 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/vitamins_included/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index 6ea80ec05a..fff3e9cccf 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B4 #define SOFT_SERIAL_PIN D0 -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/vitamins_included/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json index 4b4b59c43c..dbd017dc5c 100644 --- a/keyboards/xelus/valor_frl_tkl/info.json +++ b/keyboards/xelus/valor_frl_tkl/info.json @@ -1,12 +1,10 @@ { - "keyboard_name": "Valor FRL TKL", "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", "usb": { "vid": "0x5845", - "pid": "0x4654", - "device_version": "0.0.1" + "pid": "0x4654" }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/xelus/valor_frl_tkl/rev1/info.json b/keyboards/xelus/valor_frl_tkl/rev1/info.json new file mode 100644 index 0000000000..694c988376 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Valor FRL TKL Rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h index 04dbefb537..4f42348b56 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 -#define PRODUCT Xelus Valor FRL TKL Rev2.0 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json new file mode 100644 index 0000000000..1764cc45eb --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Valor FRL TKL Rev2.0", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h index 1cbd3e29f6..2ab1350753 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT Xelus Valor FRL TKL Rev2.1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json new file mode 100644 index 0000000000..1c7fb1dd6b --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Valor FRL TKL Rev2.2", + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/ymdk/yd60mq/12led/config.h b/keyboards/ymdk/yd60mq/12led/config.h index dde57aafec..edea795f78 100644 --- a/keyboards/ymdk/yd60mq/12led/config.h +++ b/keyboards/ymdk/yd60mq/12led/config.h @@ -1,5 +1,3 @@ #pragma once -#define DEVICE_VER 0x0001 - #define RGBLED_NUM 12 diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/ymdk/yd60mq/12led/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/ymdk/yd60mq/16led/config.h b/keyboards/ymdk/yd60mq/16led/config.h index 11ce3aeb27..00d3fcfc8c 100644 --- a/keyboards/ymdk/yd60mq/16led/config.h +++ b/keyboards/ymdk/yd60mq/16led/config.h @@ -1,5 +1,3 @@ #pragma once -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 16 diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/ymdk/yd60mq/16led/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h index bd169471af..e538ba0609 100644 --- a/keyboards/ymdk/ymd75/rev1/config.h +++ b/keyboards/ymdk/ymd75/rev1/config.h @@ -26,4 +26,3 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define BACKLIGHT_PIN D4 #define DIODE_DIRECTION COL2ROW -#define DEVICE_VER 0x0100 diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json new file mode 100644 index 0000000000..ad889c2304 --- /dev/null +++ b/keyboards/ymdk/ymd75/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h index 41a75e6271..201213c40e 100644 --- a/keyboards/ymdk/ymd75/rev2/config.h +++ b/keyboards/ymdk/ymd75/rev2/config.h @@ -7,4 +7,3 @@ #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define BACKLIGHT_PIN D4 #define DIODE_DIRECTION COL2ROW -#define DEVICE_VER 0x0200 diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json new file mode 100644 index 0000000000..3bdd63ee28 --- /dev/null +++ b/keyboards/ymdk/ymd75/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h index cbed2e00ee..41af337f4c 100644 --- a/keyboards/ymdk/ymd75/rev3/config.h +++ b/keyboards/ymdk/ymd75/rev3/config.h @@ -6,5 +6,4 @@ #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } #define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3 #define DIODE_DIRECTION ROW2COL -#define DEVICE_VER 0x0300 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4 diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json new file mode 100644 index 0000000000..775a9740ca --- /dev/null +++ b/keyboards/ymdk/ymd75/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "3.0.0" + } +} -- cgit v1.2.3