From 201f1a8f47570c83569d1b0f4851b2fddf996fe7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:48:38 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093) --- keyboards/salicylic_acid3/7skb/rev1/config.h | 7 ------- .../salicylic_acid3/7skb/{ => rev1}/info.json | 6 ++++++ .../salicylic_acid3/getta25/rev1/config.h | 7 ------- .../getta25/{ => rev1}/info.json | 8 ++++++- .../salicylic_acid3/jisplit89/rev1/config.h | 7 ------- .../jisplit89/{ => rev1}/info.json | 6 ++++++ .../salicylic_acid3/naked48/rev1/config.h | 7 ------- .../naked48/{ => rev1}/info.json | 8 ++++++- .../salicylic_acid3/naked60/rev1/config.h | 7 ------- .../naked60/{ => rev1}/info.json | 8 ++++++- .../salicylic_acid3/naked64/rev1/config.h | 7 ------- .../naked64/{ => rev1}/info.json | 8 ++++++- .../salicylic_acid3/setta21/rev1/config.h | 7 ------- .../setta21/{ => rev1}/info.json | 6 ++++++ keyboards/sentraq/s60_x/default/config.h | 7 ------- keyboards/sentraq/s60_x/default/info.json | 3 +++ keyboards/sentraq/s60_x/info.json | 7 ++++++- keyboards/sentraq/s60_x/rgb/config.h | 7 ------- keyboards/sentraq/s60_x/rgb/info.json | 3 +++ keyboards/smithrune/iron165r2/config.h | 7 ------- keyboards/smithrune/iron165r2/info.json | 11 ++++++++++ keyboards/splitkb/kyria/info.json | 6 +++++- keyboards/splitkb/kyria/rev1/config.h | 7 ------- keyboards/splitkb/kyria/rev1/info.json | 6 ++++++ keyboards/splitkb/kyria/rev2/config.h | 7 ------- keyboards/splitkb/kyria/rev2/info.json | 6 ++++++ keyboards/studiokestra/galatea/config.h | 5 ----- keyboards/studiokestra/galatea/rev1/config.h | 21 ------------------- keyboards/studiokestra/galatea/rev1/info.json | 6 ++++++ keyboards/studiokestra/galatea/rev2/config.h | 21 ------------------- keyboards/studiokestra/galatea/rev2/info.json | 6 ++++++ keyboards/takashiski/namecard2x4/info.json | 6 ++++++ .../takashiski/namecard2x4/rev1/config.h | 7 ------- .../takashiski/namecard2x4/rev2/config.h | 7 ------- keyboards/tau4/config.h | 7 ------- keyboards/tau4/info.json | 11 ++++++++++ keyboards/the_uni/info.json | 5 +++++ keyboards/the_uni/pro_micro/config.h | 7 ------- keyboards/the_uni/pro_micro/info.json | 5 +++++ keyboards/the_uni/usb_c/config.h | 7 ------- keyboards/the_uni/usb_c/info.json | 5 +++++ keyboards/thevankeyboards/jetvan/config.h | 7 ------- keyboards/thevankeyboards/jetvan/info.json | 11 ++++++++++ keyboards/tkw/grandiceps/config.h | 3 --- keyboards/tkw/grandiceps/info.json | 7 +++++-- keyboards/tkw/grandiceps/rev1/info.json | 6 ++++++ keyboards/tkw/grandiceps/rev1/rules.mk | 0 keyboards/tkw/grandiceps/rev2/config.h | 5 ----- keyboards/tkw/grandiceps/rev2/info.json | 6 ++++++ keyboards/tkw/grandiceps/rules.mk | 2 ++ keyboards/tominabox1/le_chiffre/config.h | 7 ------- keyboards/tominabox1/le_chiffre/he/config.h | 4 ---- keyboards/tominabox1/le_chiffre/he/info.json | 5 +++++ keyboards/tominabox1/le_chiffre/info.json | 7 ++++++- keyboards/tominabox1/le_chiffre/rev1/config.h | 3 --- .../tominabox1/le_chiffre/rev1/info.json | 5 +++++ keyboards/tominabox1/le_chiffre/rev2/config.h | 2 -- .../tominabox1/le_chiffre/rev2/info.json | 5 +++++ .../tronguylabs/m122_3270/blackpill/config.h | 3 --- .../tronguylabs/m122_3270/blackpill/info.json | 5 +++++ .../tronguylabs/m122_3270/bluepill/config.h | 3 --- .../tronguylabs/m122_3270/bluepill/info.json | 5 +++++ keyboards/tronguylabs/m122_3270/config.h | 5 ----- keyboards/tronguylabs/m122_3270/info.json | 7 ++++++- .../tronguylabs/m122_3270/teensy/config.h | 3 --- .../tronguylabs/m122_3270/teensy/info.json | 5 +++++ .../classic_ultracl_post_2013/info.json | 8 ++++++- .../overnumpad_1xb/config.h | 6 ------ .../classic_ultracl_pre_2013/info.json | 8 ++++++- .../overnumpad_1xb/config.h | 6 ------ .../unicomp/spacesaver_m_post_2013/info.json | 8 ++++++- .../overnumpad_1xb/config.h | 6 ------ .../unicomp/spacesaver_m_pre_2013/info.json | 8 ++++++- .../overnumpad_1xb/config.h | 6 ------ keyboards/uzu42/rev1/config.h | 7 ------- keyboards/uzu42/{ => rev1}/info.json | 6 ++++++ keyboards/westm/westm68/config.h | 6 ------ keyboards/westm/westm68/info.json | 5 +++++ keyboards/westm/westm68/rev1/config.h | 2 -- keyboards/westm/westm68/rev1/info.json | 5 +++++ keyboards/westm/westm68/rev2/config.h | 2 -- keyboards/westm/westm68/rev2/info.json | 5 +++++ keyboards/westm/westm9/config.h | 6 ------ keyboards/westm/westm9/info.json | 5 +++++ keyboards/westm/westm9/rev1/config.h | 2 -- keyboards/westm/westm9/rev1/info.json | 5 +++++ keyboards/westm/westm9/rev2/config.h | 2 -- keyboards/westm/westm9/rev2/info.json | 5 +++++ keyboards/whale/sk/config.h | 4 ---- keyboards/whale/sk/v3/config.h | 5 ----- keyboards/whale/sk/v3/info.json | 6 ++++++ keyboards/xelus/dawn60/info.json | 6 ++++++ keyboards/xelus/dawn60/rev1/config.h | 6 ------ keyboards/xelus/dawn60/rev1_qmk/config.h | 7 ------- keyboards/xelus/rs60/info.json | 5 +++++ keyboards/xelus/rs60/rev1/config.h | 7 ------- keyboards/xelus/rs60/rev1/info.json | 5 +++++ keyboards/xelus/rs60/rev2/config.h | 7 ------- keyboards/xelus/rs60/rev2/info.json | 5 +++++ keyboards/xiudi/xd004/info.json | 6 ++++++ keyboards/xiudi/xd004/v1/config.h | 8 ------- keyboards/xiudi/xd60/info.json | 6 +++++- keyboards/xiudi/xd60/rev2/config.h | 7 ------- keyboards/xiudi/xd60/rev2/info.json | 6 ++++++ keyboards/xiudi/xd60/rev3/config.h | 7 ------- keyboards/xiudi/xd60/rev3/info.json | 6 ++++++ keyboards/yandrstudio/nz64/config.h | 7 ------- keyboards/yandrstudio/zhou65/config.h | 7 ------- keyboards/yosino58/rev1/config.h | 7 ------- keyboards/yosino58/{ => rev1}/info.json | 8 ++++++- keyboards/yushakobo/navpad/10/info.json | 5 +++++ keyboards/yushakobo/navpad/10/rev0/config.h | 7 ------- keyboards/yushakobo/navpad/10/rev0/info.json | 5 +++++ keyboards/yushakobo/navpad/10/rev1/config.h | 7 ------- keyboards/yushakobo/navpad/10/rev1/info.json | 5 +++++ .../yushakobo/navpad/10_helix_r/config.h | 7 ------- .../yushakobo/navpad/10_helix_r/info.json | 8 ++++++- keyboards/yynmt/acperience12/rev1/config.h | 7 ------- .../yynmt/acperience12/{ => rev1}/info.json | 6 ++++++ 119 files changed, 351 insertions(+), 386 deletions(-) rename keyboards/salicylic_acid3/7skb/{ => rev1}/info.json (95%) rename keyboards/salicylic_acid3/getta25/{ => rev1}/info.json (89%) rename keyboards/salicylic_acid3/jisplit89/{ => rev1}/info.json (97%) rename keyboards/salicylic_acid3/naked48/{ => rev1}/info.json (97%) rename keyboards/salicylic_acid3/naked60/{ => rev1}/info.json (94%) rename keyboards/salicylic_acid3/naked64/{ => rev1}/info.json (97%) rename keyboards/salicylic_acid3/setta21/{ => rev1}/info.json (89%) create mode 100644 keyboards/sentraq/s60_x/default/info.json create mode 100644 keyboards/sentraq/s60_x/rgb/info.json create mode 100644 keyboards/smithrune/iron165r2/info.json create mode 100644 keyboards/splitkb/kyria/rev1/info.json create mode 100644 keyboards/splitkb/kyria/rev2/info.json delete mode 100644 keyboards/studiokestra/galatea/rev1/config.h delete mode 100644 keyboards/studiokestra/galatea/rev2/config.h create mode 100644 keyboards/tau4/info.json create mode 100644 keyboards/the_uni/pro_micro/info.json create mode 100644 keyboards/the_uni/usb_c/info.json create mode 100644 keyboards/thevankeyboards/jetvan/info.json create mode 100644 keyboards/tkw/grandiceps/rev1/info.json create mode 100644 keyboards/tkw/grandiceps/rev1/rules.mk create mode 100644 keyboards/tkw/grandiceps/rev2/info.json create mode 100644 keyboards/tominabox1/le_chiffre/he/info.json create mode 100644 keyboards/tominabox1/le_chiffre/rev1/info.json create mode 100644 keyboards/tominabox1/le_chiffre/rev2/info.json create mode 100644 keyboards/tronguylabs/m122_3270/blackpill/info.json create mode 100644 keyboards/tronguylabs/m122_3270/bluepill/info.json create mode 100644 keyboards/tronguylabs/m122_3270/teensy/info.json rename keyboards/uzu42/{ => rev1}/info.json (94%) create mode 100644 keyboards/westm/westm68/rev1/info.json create mode 100644 keyboards/westm/westm68/rev2/info.json create mode 100644 keyboards/westm/westm9/rev1/info.json create mode 100644 keyboards/westm/westm9/rev2/info.json create mode 100644 keyboards/xelus/rs60/rev1/info.json create mode 100644 keyboards/xelus/rs60/rev2/info.json create mode 100644 keyboards/xiudi/xd60/rev2/info.json create mode 100644 keyboards/xiudi/xd60/rev3/info.json rename keyboards/yosino58/{ => rev1}/info.json (88%) create mode 100644 keyboards/yushakobo/navpad/10/rev0/info.json create mode 100644 keyboards/yushakobo/navpad/10/rev1/info.json rename keyboards/yynmt/acperience12/{ => rev1}/info.json (78%) diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index a74cd25c2926d9c53efeb79cc12a88f451e81d24..e6cddb0a5bd50e6f8f2fd67ad44dee5d82aa3cc7 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB5F -#define DEVICE_VER 0x0007 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT 7skb - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/7skb/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json similarity index 95% rename from keyboards/salicylic_acid3/7skb/info.json rename to keyboards/salicylic_acid3/7skb/rev1/info.json index f85f32cb6db16c97ab03fdebcc2166cc5f6f2033..7bd508ed7f600980f2311332b33174c30ac6edfe 100644 --- a/keyboards/salicylic_acid3/7skb/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "7skb", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB5F", + "device_version": "0.0.7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index 740a9f3fbd06b3111bd8cc2088ea59e20847b4f2..a039848af9fbd4e5b82a1f2129a46f3196538e56 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0013 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT getta25 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/getta25/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json similarity index 89% rename from keyboards/salicylic_acid3/getta25/info.json rename to keyboards/salicylic_acid3/getta25/rev1/info.json index 980b5142db00c1634ab772a111723cafec250908..23354552ea36b09eff07bbeb7474fba1bd520cf5 100644 --- a/keyboards/salicylic_acid3/getta25/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Getta25", + "keyboard_name": "getta25", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index ee5f2ca0bce214a87424c5c403ca48356dfddd9a..9b30c9a242c17983ecadd5be362c03413b135e34 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB4F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT jisplit89 - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json similarity index 97% rename from keyboards/salicylic_acid3/jisplit89/info.json rename to keyboards/salicylic_acid3/jisplit89/rev1/info.json index 4f138a5262476a9077f18c9293771ae10d16a5eb..1279d2475e66af3b26e58cd91467cafcf9e6ce38 100644 --- a/keyboards/salicylic_acid3/jisplit89/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "jisplit89", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB4F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index faeb7190197e73fcea207e471c47d62451ddb520..2cc4a46674e166b07b5cf544590d5e9013f62687 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE8BA -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked48 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 12 diff --git a/keyboards/salicylic_acid3/naked48/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json similarity index 97% rename from keyboards/salicylic_acid3/naked48/info.json rename to keyboards/salicylic_acid3/naked48/rev1/info.json index 8186a6ba5b734e0c9ed2882a0549ca3f99b3d943..fd4639c5ccdf5c58abb85bfa49023e45fc031d8c 100644 --- a/keyboards/salicylic_acid3/naked48/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Naked48", + "keyboard_name": "naked48", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xE8BA", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h index b75409501169121a6896d0788335c5ce9a6fb5d0..3f4e663b2da3861461f170b41b47279885659f09 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/config.h +++ b/keyboards/salicylic_acid3/naked60/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB5C -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 12 diff --git a/keyboards/salicylic_acid3/naked60/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json similarity index 94% rename from keyboards/salicylic_acid3/naked60/info.json rename to keyboards/salicylic_acid3/naked60/rev1/info.json index 8ec020ae7261f0eb1a51f7108a46e972f746774e..30b1def9aa86c470d332ba0dc3185d2d854cf3f1 100644 --- a/keyboards/salicylic_acid3/naked60/info.json +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Naked60", + "keyboard_name": "naked60", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB5C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index b4699a9ca238aee6eef0d324c44b63db6448908b..0bc5656fea6f21e66fbb2fb87bc7d7f5c48a4890 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0003 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked64 - /* key matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/naked64/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json similarity index 97% rename from keyboards/salicylic_acid3/naked64/info.json rename to keyboards/salicylic_acid3/naked64/rev1/info.json index 887f43b08700f0970a221480ccad7d5001929422..c8fe578271b4bbf2af3d740322c72093848ea06a 100644 --- a/keyboards/salicylic_acid3/naked64/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Naked64", + "keyboard_name": "naked64", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 742a8d73d066818833d0474008a0f1e4e361fa54..697e7a7d49dbef3febeda2f8a5de7808185ca24f 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0011 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT setta21 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/setta21/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json similarity index 89% rename from keyboards/salicylic_acid3/setta21/info.json rename to keyboards/salicylic_acid3/setta21/rev1/info.json index 46c06613a85f6cb5f26489ab926a0e9abdb5a819..aa101e7a13b91c2ebcc8adb514639ff1b99f7147 100644 --- a/keyboards/salicylic_acid3/setta21/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "setta21", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.1" + }, "layouts": { "LAYOUT_numpad_6x4": { "layout": [ diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h index 3f08499531fa9d4a4269a9032daa09ed13e6f2af..b29c1ea3d01e56430c98d683a99f416822e053ae 100644 --- a/keyboards/sentraq/s60_x/default/config.h +++ b/keyboards/sentraq/s60_x/default/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq -#define PRODUCT S60-X - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json new file mode 100644 index 0000000000000000000000000000000000000000..3f0110679da17fc221983c7ad90386d61daab894 --- /dev/null +++ b/keyboards/sentraq/s60_x/default/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "S60-X" +} diff --git a/keyboards/sentraq/s60_x/info.json b/keyboards/sentraq/s60_x/info.json index 6d664193c52748cb4117de8dd1396a16cd21835e..424c576c7276e949b4548a5e012b3580fc42ea6c 100644 --- a/keyboards/sentraq/s60_x/info.json +++ b/keyboards/sentraq/s60_x/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "S60-X", + "manufacturer": "Sentraq", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index 63abf8cc21f9b36982a4163889cdd606a2615bee..c8611c9beac058cf353ad8674ac6eabf1fedbdd4 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq -#define PRODUCT S60-X-RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json new file mode 100644 index 0000000000000000000000000000000000000000..bcee4ef9db98f9ab3456cff2f36e305b44f28be4 --- /dev/null +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "S60-X-RGB" +} diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h index bfe83ba52caeb3535387edcfc2ac968e5cc93e06..ce3ddc7b86a95ea55738207ecf8ce356709d6b23 100644 --- a/keyboards/smithrune/iron165r2/config.h +++ b/keyboards/smithrune/iron165r2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8384 // SR for Smith and RUne -#define PRODUCT_ID 0x1652 // 165 rev 2 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SmithRune -#define PRODUCT Iron156R2 - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..0d42363728f80600f538a7c3a1e57f189033ed3a --- /dev/null +++ b/keyboards/smithrune/iron165r2/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Iron165R2", + "manufacturer": "SmithRune", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x8384", + "pid": "0x1652", + "device_version": "0.0.1" + } +} diff --git a/keyboards/splitkb/kyria/info.json b/keyboards/splitkb/kyria/info.json index d362e4ad72aeeb866767fa840cab869571d1a8a8..2bc52803b0f05b104bd7dbbde5db46e8cfedd3d7 100644 --- a/keyboards/splitkb/kyria/info.json +++ b/keyboards/splitkb/kyria/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Kyria", + "manufacturer": "splitkb", "url": "https://splitkb.com", "maintainer": "splitkb.com", + "usb": { + "vid": "0x8D1D", + "pid": "0x9D9D" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 2fc34070f433b5862ca9920b42a5b3675b88d3b3..9694c2fd0d78d2a7d600adce7790d9a54c54dc83 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8D1D -#define PRODUCT_ID 0x9D9D -#define DEVICE_VER 0x0001 -#define MANUFACTURER splitkb -#define PRODUCT Kyria rev1 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..8e34af43f55ed6862678b34b49f39916c7d3a806 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kyria rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 8ff38139646a3b4d9e59c6b14cd576ed285e89af..16c0e7dd2026260faf78468c836daa7b33814abc 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8D1D -#define PRODUCT_ID 0x9D9D -#define DEVICE_VER 0x0002 -#define MANUFACTURER splitkb -#define PRODUCT Kyria rev2 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7ff56b321ae333484cec25f7775df650624a689b --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kyria rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h index accc0d2b432d34a37ed868a14423a2b526282161..2e598b1d958a83f8baad83c8ca7471d60a0ca36b 100644 --- a/keyboards/studiokestra/galatea/config.h +++ b/keyboards/studiokestra/galatea/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define MANUFACTURER Studio Kestra -#define PRODUCT Galatea - #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/studiokestra/galatea/rev1/config.h b/keyboards/studiokestra/galatea/rev1/config.h deleted file mode 100644 index 9f8fb44f9a99e1ee3cb566e45b3e9173c2345eea..0000000000000000000000000000000000000000 --- a/keyboards/studiokestra/galatea/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define PRODUCT_ID 0x8801 -#define DEVICE_VER 0x0001 diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json index e3f31198fe11bb99df65f21148ab66805fead2bb..2b832d7fc73d1d5383596392a4becb6d94932267 100644 --- a/keyboards/studiokestra/galatea/rev1/info.json +++ b/keyboards/studiokestra/galatea/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Galatea", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/galatea", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x8801", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h deleted file mode 100644 index 4e0170a0f933c9e4a57ee996d7072fd807c8b3f0..0000000000000000000000000000000000000000 --- a/keyboards/studiokestra/galatea/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define PRODUCT_ID 0x8802 -#define DEVICE_VER 0x0002 diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index e3f31198fe11bb99df65f21148ab66805fead2bb..9954a9627437ddcbeb138abb58d69e00b7d54121 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Galatea", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/galatea", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x8802", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index 04a431f9f37fb172d6f5de4720a07fe1a33dbfb5..3c4b8dd2a8a301f476cc5a5dc900529b199246c3 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "namecard2x4", + "manufacturer": "takashiski", "url": "https://skyhigh-works.hatenablog.com/", "maintainer": "takashiski", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h index a91df15b081405896b2559078ce8795f61fecfde..665a6b4cf388f2a4a262d7d0d8e3cc6c1fab0019 100644 --- a/keyboards/takashiski/namecard2x4/rev1/config.h +++ b/keyboards/takashiski/namecard2x4/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT namecard2x4 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h index 402737dc711c30462103eb939ab73cc709b54fd5..4ce574a3ec24723370f18e82c4f29746d69bb816 100644 --- a/keyboards/takashiski/namecard2x4/rev2/config.h +++ b/keyboards/takashiski/namecard2x4/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT namecard2x4 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h index d7e6ffe1bb9650de9a7feb20adf1dbcf48a14ea6..0dd7adb03966566296b532796622351c4f0f2bc1 100755 --- a/keyboards/tau4/config.h +++ b/keyboards/tau4/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER taukeyboards -#define PRODUCT tau4 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json new file mode 100644 index 0000000000000000000000000000000000000000..9ec48383c710a331ac952eb056beb0479540b3f2 --- /dev/null +++ b/keyboards/tau4/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "tau4", + "manufacturer": "taukeyboards", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + } +} diff --git a/keyboards/the_uni/info.json b/keyboards/the_uni/info.json index a8b5a1b5cc22053cd28eb2dbe3443c4128a947eb..b7cb80957e19a76bbd5b4b70000ea53a71d696c3 100644 --- a/keyboards/the_uni/info.json +++ b/keyboards/the_uni/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "The Uni", + "manufacturer": "stenokeyboards", "url": "https://www.stenokeyboards.com", "maintainer": "qmk", + "usb": { + "vid": "0x9000", + "pid": "0x0001" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/the_uni/pro_micro/config.h b/keyboards/the_uni/pro_micro/config.h index ff965d7744e3a18ccfec1eee2af8b73e1aa95abe..1c50e4e6853acd14f9dfaf9c8f27077c5aced158 100644 --- a/keyboards/the_uni/pro_micro/config.h +++ b/keyboards/the_uni/pro_micro/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x9000 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER stenokeyboards -#define PRODUCT The Uni - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 11 diff --git a/keyboards/the_uni/pro_micro/info.json b/keyboards/the_uni/pro_micro/info.json new file mode 100644 index 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /dev/null +++ b/keyboards/the_uni/pro_micro/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/the_uni/usb_c/config.h b/keyboards/the_uni/usb_c/config.h index 3110c0d82181c413ca44e4b2c67ee30ca20235f0..47c494e0319960618b8bd34eef943c1b1dfc0e20 100644 --- a/keyboards/the_uni/usb_c/config.h +++ b/keyboards/the_uni/usb_c/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x9000 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0002 -#define MANUFACTURER stenokeyboards -#define PRODUCT The Uni - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 11 diff --git a/keyboards/the_uni/usb_c/info.json b/keyboards/the_uni/usb_c/info.json new file mode 100644 index 0000000000000000000000000000000000000000..e557e4d307635abfc959a8678b5a8cb1121f59a2 --- /dev/null +++ b/keyboards/the_uni/usb_c/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h index 74094a183a5f219f8b465fed99a184e608603de4..1e9efd634ce7725f820bf87d2d3337b7c7ac4001 100644 --- a/keyboards/thevankeyboards/jetvan/config.h +++ b/keyboards/thevankeyboards/jetvan/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8858 -#define DEVICE_VER 0x0001 -#define MANUFACTURER evangs -#define PRODUCT JetVan - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json new file mode 100644 index 0000000000000000000000000000000000000000..f017d743dd3ef5dac927658f6ffe01e3123ffada --- /dev/null +++ b/keyboards/thevankeyboards/jetvan/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "JetVan", + "manufacturer": "evangs", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEAE", + "pid": "0x8858", + "device_version": "0.0.1" + } +} diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index b2b60082407c7b4fa431a4e55e3b090079d91830..f9e9460b88c64fa2f8206c0cea8bb1162006ee88 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -18,10 +18,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7812 #define DEVICE_VER 0x0001 -#define MANUFACTURER tkw #define PRODUCT Grandiceps Split /* key matrix size */ diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 7a4324ffdc0127c53026fc3d2b4b3a9ed061e2fb..dc4cf5a0eeb703118af18a8f54011d98bc27d251 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -1,8 +1,11 @@ { - "keyboard_name": "grandiceps", + "manufacturer": "tkw", "url": "https://github.com/vattern/grandiceps", "maintainer": "vattern", - "manufacturer": "tkw", + "usb": { + "vid": "0xFEED", + "pid": "0x7812" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkw/grandiceps/rev1/info.json b/keyboards/tkw/grandiceps/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..34d2a947434cb7ddadc43245bdef2829ced1d29c --- /dev/null +++ b/keyboards/tkw/grandiceps/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Grandiceps Split", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/tkw/grandiceps/rev1/rules.mk b/keyboards/tkw/grandiceps/rev1/rules.mk new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h index 98b762087e84e6bf96417b48ac4e622a5d246fca..5810fe75bc91aa37ee4ef64887120a2428ab8165 100644 --- a/keyboards/tkw/grandiceps/rev2/config.h +++ b/keyboards/tkw/grandiceps/rev2/config.h @@ -15,10 +15,5 @@ */ #pragma once -#undef DEVICE_VER -#define DEVICE_VER 0x0002 -#undef PRODUCT -#define PRODUCT Grandiceps Split rev2 - #define SPLIT_HAND_PIN B3 #define EEPROM_I2C_24LC64 diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..786f381c4f97d367064facac807ee6cd73344344 --- /dev/null +++ b/keyboards/tkw/grandiceps/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Grandiceps Split rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 8274edd22dac0c2b5548a4b43476d543c49adf59..2220b1625292ea2d6bc3ac52059bf09cc0541144 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -26,3 +26,5 @@ OLED_ENABLE = yes OLED_DRIVER = SSD1306 WS2812_DRIVER = pwm OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE + +DEFAULT_FOLDER = tkw/grandiceps/rev1 diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h index 7abeaa18103bb341a2fecd955495d253d72777ee..e5715bdbce8e7ae63aa3da096e27417e33d66276 100644 --- a/keyboards/tominabox1/le_chiffre/config.h +++ b/keyboards/tominabox1/le_chiffre/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0xD645 - -#define MANUFACTURER tominabox1 -#define PRODUCT Le Chiffre - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/le_chiffre/he/config.h b/keyboards/tominabox1/le_chiffre/he/config.h index bfba9b96becf846166da09e5cb623b70bd8534fe..4d726e86b8b508ff9fbc5e32187dc3c16343253d 100644 --- a/keyboards/tominabox1/le_chiffre/he/config.h +++ b/keyboards/tominabox1/le_chiffre/he/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 - - /* COL2ROW, ROW2COL*/ #undef DIODE_DIRECTION #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json new file mode 100644 index 0000000000000000000000000000000000000000..b377cdff008eae46735686ee73af7bf33c957876 --- /dev/null +++ b/keyboards/tominabox1/le_chiffre/he/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json index afcbc752a5f8f7e078e68a469251fae84fd8b0b0..6a7e10fad7d43a2a0485aac727048dd07a9b9dbf 100644 --- a/keyboards/tominabox1/le_chiffre/info.json +++ b/keyboards/tominabox1/le_chiffre/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "le_chiffre", + "keyboard_name": "Le Chiffre", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0xD645" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0, "w":1}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, diff --git a/keyboards/tominabox1/le_chiffre/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h index 0e5b6887cd2f7cda18554544eb5973202597f0b7..c3a478601a213442a68476fbf4f097ee92df8ac3 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/config.h +++ b/keyboards/tominabox1/le_chiffre/rev1/config.h @@ -17,9 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /dev/null +++ b/keyboards/tominabox1/le_chiffre/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/tominabox1/le_chiffre/rev2/config.h b/keyboards/tominabox1/le_chiffre/rev2/config.h index c37f4775aa8aeb430f430ad70c666d9291110ef6..2ccbdb031f6c4976d9b24e139f2f213d13fb6650 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/config.h +++ b/keyboards/tominabox1/le_chiffre/rev2/config.h @@ -17,8 +17,6 @@ #include "config_common.h" -#define DEVICE_VER 0x0002 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..e557e4d307635abfc959a8678b5a8cb1121f59a2 --- /dev/null +++ b/keyboards/tominabox1/le_chiffre/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tronguylabs/m122_3270/blackpill/config.h b/keyboards/tronguylabs/m122_3270/blackpill/config.h index 53c3ad73e42ad542b8aa3ac485296d0751a3f366..03d97de30ee976fba96cd776f0753bc9072faafd 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/config.h +++ b/keyboards/tronguylabs/m122_3270/blackpill/config.h @@ -22,6 +22,3 @@ // rows are inputs). Note that every usable I/O pin is used. #define MATRIX_COL_PINS { B0, B1, B10, B12, B13, B14, B15, A8, A7, A10, A6, A5, A15, B3, B4, B5, B6, B7, B8, B9 } #define MATRIX_ROW_PINS { C13, C14, C15, A0, A1, A2, A3, A4 } - -// The BlackPill version is version 2 -#define DEVICE_VER 0x0002 diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json new file mode 100644 index 0000000000000000000000000000000000000000..e557e4d307635abfc959a8678b5a8cb1121f59a2 --- /dev/null +++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tronguylabs/m122_3270/bluepill/config.h b/keyboards/tronguylabs/m122_3270/bluepill/config.h index f59eaaacb6ff76e94f5b1b75067a03eb093fe5da..c8cf8523f68ae56f55cb219a933f3de822e843e1 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/config.h +++ b/keyboards/tronguylabs/m122_3270/bluepill/config.h @@ -24,6 +24,3 @@ // rows are inputs). Note that every usable I/O pin is used. #define MATRIX_COL_PINS { B1, B10, B11, B12, B13, B14, B15, A8, B0, A10, A7, A6, A15, B3, B4, B5, B6, B7, B8, B9 } #define MATRIX_ROW_PINS { C13, C14, C15, A1, A2, A3, A4, A5 } - -// The BluePill version is version 3 -#define DEVICE_VER 0x0003 diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json new file mode 100644 index 0000000000000000000000000000000000000000..b377cdff008eae46735686ee73af7bf33c957876 --- /dev/null +++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h index 98359e6cc46bc800a4adf7c812ffd5819e9428aa..801fc9ee507f5440614fd6e3c625d6638cb38b18 100644 --- a/keyboards/tronguylabs/m122_3270/config.h +++ b/keyboards/tronguylabs/m122_3270/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0x3270 -#define MANUFACTURER IBM -#define PRODUCT Model M PC/3270 122 key - // Both controllers draw 100 mA or less #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json index cddc24ea9c5073a9df6c38f22ca3a4c5206c7743..f6fba523d621fe0c6e55983fc4b29734e905ac5a 100644 --- a/keyboards/tronguylabs/m122_3270/info.json +++ b/keyboards/tronguylabs/m122_3270/info.json @@ -1,6 +1,11 @@ { - "keyboard_name": "IBM Model M PC/3270 122 key", + "keyboard_name": "Model M PC/3270 122 key", + "manufacturer": "IBM", "maintainer": "jmaynard", + "usb": { + "vid": "0x1209", + "pid": "0x3270" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tronguylabs/m122_3270/teensy/config.h b/keyboards/tronguylabs/m122_3270/teensy/config.h index 33590b40641e4007c5f8f08959f29b689b4669d7..b105ecad529407b651af0564f148ef9f9368a132 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/config.h +++ b/keyboards/tronguylabs/m122_3270/teensy/config.h @@ -20,6 +20,3 @@ // avoiding the LED on PD6 #define MATRIX_COL_PINS { B5, B6, B7, D0, D1, D2, D3, D4, D5, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 } #define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 } - -// The Teensy version is version 1 -#define DEVICE_VER 0x0001 diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json new file mode 100644 index 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /dev/null +++ b/keyboards/tronguylabs/m122_3270/teensy/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index 08f4d5ebf7ad34790c70303a936050c57361ba51..fa1a5639708143a6981a9ea46a829e3b6405613e 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/classic_ultracl_post_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h index feb2e32d570998db1209b07c4575e0ee317c61d1..4fe76d778663307d633ecc0a8c75cf0ccfea8c13 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index bedbca4f3651c4c8f4b29c7de8fdf1203dcef106..d7f8e9dcbf8f9a0a78cb92fd75bf2dfe1f99a74c 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/classic_ultracl_pre_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5, "w":1.25}, {"x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.25}, {"x":12.25, "y":5.5, "w":1.25}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h index feb2e32d570998db1209b07c4575e0ee317c61d1..4fe76d778663307d633ecc0a8c75cf0ccfea8c13 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index 766a93e6c6173358df7c1f3f9ae1d194a91743e3..bfc60adfafab76c3f0a568b49522d6ba1f65465e 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/spacesaver_m_post_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h index 597d287b077c2e8a7413bb05116035673070fa44..952f9a5c9db0169e25d1862059c214536319b225 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index e912d82ead5104a72d2290a045d338a6f36ac2b8..3ce16d2c09e218a723975f2d4e8ba01ee00d29b6 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/spacesaver_m_pre_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5, "w":1.25}, {"x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.25}, {"x":12.25, "y":5.5, "w":1.25}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h index 597d287b077c2e8a7413bb05116035673070fa44..952f9a5c9db0169e25d1862059c214536319b225 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 815442ed211ee1c86f725c6b7dab977a62c3c4e4..43a5b13f84d1a9f2678b540acb9ca04153527f1d 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER nrtkbb -#define PRODUCT uzu42 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/uzu42/info.json b/keyboards/uzu42/rev1/info.json similarity index 94% rename from keyboards/uzu42/info.json rename to keyboards/uzu42/rev1/info.json index a4903077cae28fc829d53746f4b94dabde42b79f..f96564f36b42797c573160c82e85c9cbd5c3a949 100644 --- a/keyboards/uzu42/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "uzu42", + "manufacturer": "nrtkbb", "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42", "maintainer": "nrtkbb", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h index 96534c80c718e115db56219a67e557b3524af8e3..1d4d028e9fd8904ee7f8be96fe8bef2cba1004a5 100644 --- a/keyboards/westm/westm68/config.h +++ b/keyboards/westm/westm68/config.h @@ -21,12 +21,6 @@ /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x574D // WM -#define DEVICE_VER 0x0001 -#define MANUFACTURER WestM -#define PRODUCT WestM68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json index 58378c1b430bd557a9732f021a942d288403ae88..f7f67d45a0ca449dc8e0c8004edc1d80853b8889 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "WestM68", + "manufacturer": "WestM", "url": "https://github.com/WestMProducts", "maintainer": "WestM", + "usb": { + "vid": "0x574D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h index 488d644c3e859d9183a34b39e53207ec98de0b64..054b47cca254ba56073db12beb90014b82b0f573 100644 --- a/keyboards/westm/westm68/rev1/config.h +++ b/keyboards/westm/westm68/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0101 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN A8 #define RGBLED_NUM 16 diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..a4736b30a42677100110c482d2a1c9844f55e32e --- /dev/null +++ b/keyboards/westm/westm68/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0101" + } +} diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h index 94ce14d3f9bceb1325299b83366a2f288febfda0..054b47cca254ba56073db12beb90014b82b0f573 100644 --- a/keyboards/westm/westm68/rev2/config.h +++ b/keyboards/westm/westm68/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0102 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN A8 #define RGBLED_NUM 16 diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..0b36e6dd582f88a291958dfc75d08fdcf5998103 --- /dev/null +++ b/keyboards/westm/westm68/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0102" + } +} diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h index 4175b5b3f83eb3ef93c6854a185ea3ebc5b61c42..6d0bf729ac0498c69ba81d042117a524916c7cb6 100644 --- a/keyboards/westm/westm9/config.h +++ b/keyboards/westm/westm9/config.h @@ -21,12 +21,6 @@ /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x574D // WM -#define DEVICE_VER 0x0001 -#define MANUFACTURER WestM -#define PRODUCT WestM9 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 5c36e74ab4447dffbb2280122b9e4e7e483bb145..3beb8b232f93d89bbcb84fcb32701dc67e9f61bc 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "WestM9", + "manufacturer": "WestM", "url": "https://github.com/WestMProducts", "maintainer": "WestM", + "usb": { + "vid": "0x574D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_macropad": { "layout": [ diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h index 48ed5d6869f307801947c0c9ae99ec4e75fae4b1..fcc9ddb99d2005bf9aa280d62138992ef2a46107 100644 --- a/keyboards/westm/westm9/rev1/config.h +++ b/keyboards/westm/westm9/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0301 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN F1 #define RGBLED_NUM 14 diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..99343372275e81d28d76ae0e83ac387a5df6fb2e --- /dev/null +++ b/keyboards/westm/westm9/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0301" + } +} diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h index 84a7589360999d3f63ac9a3377057be560cf3387..fcc9ddb99d2005bf9aa280d62138992ef2a46107 100644 --- a/keyboards/westm/westm9/rev2/config.h +++ b/keyboards/westm/westm9/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0302 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN F1 #define RGBLED_NUM 14 diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..3b2f2199482df0ba537aca005681106ea4b0fb73 --- /dev/null +++ b/keyboards/westm/westm9/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0302" + } +} diff --git a/keyboards/whale/sk/config.h b/keyboards/whale/sk/config.h index a3989df890be9a3ba677ae826d525c779d2f01ba..4c2b9c23ff9196df8795fca19990d6e7ee19f216 100644 --- a/keyboards/whale/sk/config.h +++ b/keyboards/whale/sk/config.h @@ -17,7 +17,3 @@ #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0495 diff --git a/keyboards/whale/sk/v3/config.h b/keyboards/whale/sk/v3/config.h index fc1e4ffeff85665583720ee88de0e8dc570269a8..64fc622203fa24afa26e1f609ec096fa5aff9b08 100644 --- a/keyboards/whale/sk/v3/config.h +++ b/keyboards/whale/sk/v3/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define MANUFACTURER Whale Mo -#define PRODUCT Splite Keyboard v3 - /* key matrix size */ /* Notice: HALF of row on the slave side */ #define MATRIX_ROWS 12 diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json index b0a07088b132ce7240aac9e3bf6daade44b983ee..8ba2a343118c1570b9e09fc49c727befa156b96f 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Splite Keyboard v3", + "manufacturer": "Whale Mo", "url": "https://github.com/ncwhale/Keyboard_Design/tree/master/Splite-Keyboard-v3", "maintainer": "ncwhale", + "usb": { + "vid": "0xFEED", + "pid": "0x0495", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json index 346422b92add0e118659b6f60db362417000947e..24eba75384d34b048d5c32a72edc4f4cc7ffbd35 100644 --- a/keyboards/xelus/dawn60/info.json +++ b/keyboards/xelus/dawn60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dawn60", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x0060", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_60_all": "LAYOUT_all" }, diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h index 52dab44f48c33b69ffd4af061e044aaa26a032f5..73c6569be9a9c7b78bf039c552b82f6b56b8e429 100644 --- a/keyboards/xelus/dawn60/rev1/config.h +++ b/keyboards/xelus/dawn60/rev1/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x0060 // Dawn60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Dawn60 // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h index 67c88efb4ca865d91a6a34e37cf96e60db88fe0c..d7074a9a31ce7bc9871048ddef68434f966b3eee 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/config.h +++ b/keyboards/xelus/dawn60/rev1_qmk/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x0060 // Dawn60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Dawn60 - // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json index 3a0582fc7fce1bf63a42caca4dac071973c434bf..241f1cbe44833c7cdfa8a85afa0afdf8f490fa48 100644 --- a/keyboards/xelus/rs60/info.json +++ b/keyboards/xelus/rs60/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "RS60", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5253" + }, "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h index ce0c2e1d027dc8a7946d8a6b55fdf22fb28b17b6..346dd8b10905dcbb95f1dd1ea29fb33f37040ba1 100644 --- a/keyboards/xelus/rs60/rev1/config.h +++ b/keyboards/xelus/rs60/rev1/config.h @@ -15,13 +15,6 @@ */ #pragma once -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5253 // RS60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT RS60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /dev/null +++ b/keyboards/xelus/rs60/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/xelus/rs60/rev2/config.h b/keyboards/xelus/rs60/rev2/config.h index 74258b1289ac1604c4cbe4bf1b26097fee08e1ee..3f4ab9efeb9348de4b6ce28ff466c68ab518c22f 100644 --- a/keyboards/xelus/rs60/rev2/config.h +++ b/keyboards/xelus/rs60/rev2/config.h @@ -15,13 +15,6 @@ */ #pragma once -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5253 // RS60 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Xelus -#define PRODUCT RS60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/rev2/info.json b/keyboards/xelus/rs60/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..e557e4d307635abfc959a8678b5a8cb1121f59a2 --- /dev/null +++ b/keyboards/xelus/rs60/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 26e418943fecd7313cdc02018a05ae95d75b6fb9..e9876f8c645662c26252c97c058e42639c47bc2a 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "XD004", + "manufacturer": "XIUDI", "maintainer": "qmk", + "usb": { + "vid": "0x7844", + "pid": "0x0404", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}] diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 826540de4c041dce50f1e895e74faeb0b8a5c10e..81f5830dbc8d60233c4dda12004a2b5ef884b412 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -25,14 +25,6 @@ where some things are disabled to save space as well. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x0404 -#define DEVICE_VER 0x0001 -// Note: unsure about manufacturer -#define MANUFACTURER XIUDI -#define PRODUCT XD004 v1 - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 4 diff --git a/keyboards/xiudi/xd60/info.json b/keyboards/xiudi/xd60/info.json index 8ea3d6a4ff15694f8ed81551fe19c4a8ca001388..04e863a3bcf5e6b16564fa4b9009e14f234106a4 100644 --- a/keyboards/xiudi/xd60/info.json +++ b/keyboards/xiudi/xd60/info.json @@ -1,6 +1,10 @@ { - "keyboard_name": "XD60", + "manufacturer": "XIUDI", "maintainer": "qmk", + "usb": { + "vid": "0x7844", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3}, {"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"label":"Menu", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h index 38cfa415ff838641ff854ec0229045ec7cef1c7a..5b0af569f39dffaeaa63403f3a303e6d471db7a1 100644 --- a/keyboards/xiudi/xd60/rev2/config.h +++ b/keyboards/xiudi/xd60/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER XIUDI -#define PRODUCT XD60v2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..bceb5bc6cb33322edb4234673b2356fd1b89ad36 --- /dev/null +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "XD60 Rev 2", + "usb": { + "pid": "0x6060" + } +} diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h index 8af56851ff84d1c6ef3a749bb7056ed1fe08df85..b6c9f289cad53e1d9b6474f2807a7a9cb5a78419 100644 --- a/keyboards/xiudi/xd60/rev3/config.h +++ b/keyboards/xiudi/xd60/rev3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x6363 -#define DEVICE_VER 0x0001 -#define MANUFACTURER XIUDI -#define PRODUCT XD60rev3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json new file mode 100644 index 0000000000000000000000000000000000000000..a03a344a28d2db05b47dcbba4ab38e8e78cbcde6 --- /dev/null +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "XD60 Rev 3", + "usb": { + "pid": "0x6363" + } +} diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 2abdae1d31644c636471b0d62606a8a265649394..665cc962756d584811aa0945dea46c37fd893a2c 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAA96 -#define PRODUCT_ID 0xAAAF -#define DEVICE_VER 0x0001 -#define MANUFACTURER Y&R -#define PRODUCT nz64 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 3dbfd3b4365105bd2cc5e65e1313fc48b60d76eb..23638206f7d358ae9441a5446a92ba7561ff8ea3 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAA96 -#define PRODUCT_ID 0xAAAD -#define DEVICE_VER 0x0001 -#define MANUFACTURER ZHOU_Y&R -#define PRODUCT zhou65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h index b7bbace5d98fd708055e6e8e30b5a9b796e289b3..1ff856c8d863520b569391677e1bd46db0e7aa1e 100644 --- a/keyboards/yosino58/rev1/config.h +++ b/keyboards/yosino58/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0F6A -#define PRODUCT_ID 0x01B8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sakuranbo0046 -#define PRODUCT yosino58 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/yosino58/info.json b/keyboards/yosino58/rev1/info.json similarity index 88% rename from keyboards/yosino58/info.json rename to keyboards/yosino58/rev1/info.json index 5762f5ab89b6b361e2897003bb1e0f8a67593d69..aa2fe726eeba4113d37ee60ef31ebc39463f5594 100644 --- a/keyboards/yosino58/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "yosino58 rev. 1", + "keyboard_name": "yosino58", + "manufacturer": "sakuranbo0046", "url": "https://github.com/sakurachari/yosino58", "maintainer": "sakuranbo0046", + "usb": { + "vid": "0x0F6A", + "pid": "0x01B8", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index 370b7623f20c528706e136aa233ded7ae5c6299c..095b6b39ebb0b24383a743359e064433e3c19ba6 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "navpad 1.0", + "manufacturer": "yushakobo", "url": "https://shop.yushakobo.jp/products/navpad-10", "maintainer": "yushakobo", + "usb": { + "vid": "0x3265", + "pid": "0x0008" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h index 5ebdda599acf643fa92702e49b8fe7fe35ad55ea..9d2906fa302ee89ac3933d089e4b4452bd910a38 100644 --- a/keyboards/yushakobo/navpad/10/rev0/config.h +++ b/keyboards/yushakobo/navpad/10/rev0/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0000 -#define MANUFACTURER yushakobo -#define PRODUCT navpad 1.0 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5baab67dbad40946d14ffabcb73460903acf93db --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.0" + } +} diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h index 40bb31b156ce1e362ee318ddcfba2b7ab1877fc4..65f9944db9f1b0d58751befde20acba113439120 100644 --- a/keyboards/yushakobo/navpad/10/rev1/config.h +++ b/keyboards/yushakobo/navpad/10/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yushakobo -#define PRODUCT "navpad 1.0" - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..90ac25f360b6768fc13054a9c41b3c45ce5b476d --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 3d463549dfaef26285aeeb824b318b816ce88d87..09809dada909c8f0be9ce526fa51338b65a07b9f 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yushakobo -#define PRODUCT "navpad 1.0 with helix keyboard" - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 7 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 98e2314c915d4671fb5a8c319490388310971c3c..e2c44de4dabcf78bfda13a2215a0088c6ef03a73 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "navpad 1.0 w/ helix right hand side", + "keyboard_name": "navpad 1.0 with helix keyboard", + "manufacturer": "yushakobo", "url": "", "maintainer": "yushakobo", + "usb": { + "vid": "0x3265", + "pid": "0x0008", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yynmt/acperience12/rev1/config.h b/keyboards/yynmt/acperience12/rev1/config.h index d1adb8106ceda70020bc8f0d0b585ac9ff17a1f0..73a8ef461ba2a96be9a761affac60a2096cb9a37 100644 --- a/keyboards/yynmt/acperience12/rev1/config.h +++ b/keyboards/yynmt/acperience12/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 //Sublicense from Microchip Technology -#define PRODUCT_ID 0xEA51 //Sublicense from Microchip Technology -#define DEVICE_VER 0x0001 -#define MANUFACTURER yynmt -#define PRODUCT Acperience12 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 2 diff --git a/keyboards/yynmt/acperience12/info.json b/keyboards/yynmt/acperience12/rev1/info.json similarity index 78% rename from keyboards/yynmt/acperience12/info.json rename to keyboards/yynmt/acperience12/rev1/info.json index c21faf109a31aa835aedd3f4d19c561147d3672f..7d4dbb40ce285fefbdac52608958b0ba5e1a18a0 100644 --- a/keyboards/yynmt/acperience12/info.json +++ b/keyboards/yynmt/acperience12/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Acperience12", + "manufacturer": "yynmt", "url": "http://yynmt.com", "maintainer": "yynmt", + "usb": { + "vid": "0x04D8", + "pid": "0xEA51", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [