From 50c2b151b203b776bacdf48deb7606f1d6c516fd Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 26 Jul 2022 01:20:19 +1000 Subject: Move keyboard USB IDs and strings to data driven: B (#17782) --- keyboards/b_sides/rev41lp/config.h | 7 ------- keyboards/b_sides/rev41lp/info.json | 6 ++++++ keyboards/bacca70/config.h | 7 ------- keyboards/bacca70/info.json | 6 ++++++ keyboards/baguette/config.h | 7 ------- keyboards/baguette/info.json | 6 ++++++ keyboards/bandominedoni/config.h | 7 ------- keyboards/bandominedoni/info.json | 6 ++++++ keyboards/bantam44/config.h | 7 ------- keyboards/bantam44/info.json | 8 +++++++- keyboards/barleycorn_smd/config.h | 6 ------ keyboards/barleycorn_smd/info.json | 6 ++++++ keyboards/barracuda/config.h | 7 ------- keyboards/barracuda/info.json | 6 ++++++ keyboards/basekeys/trifecta/config.h | 7 ------- keyboards/basekeys/trifecta/info.json | 6 ++++++ keyboards/basketweave/config.h | 6 ------ keyboards/basketweave/info.json | 6 ++++++ keyboards/bastardkb/scylla/config.h | 5 ----- keyboards/bastardkb/scylla/info.json | 8 +++++++- keyboards/bastardkb/skeletyl/config.h | 5 ----- keyboards/bastardkb/skeletyl/info.json | 6 ++++++ keyboards/bastardkb/tbk/config.h | 5 ----- keyboards/bastardkb/tbk/info.json | 6 ++++++ keyboards/bastardkb/tbkmini/config.h | 5 ----- keyboards/bastardkb/tbkmini/info.json | 6 ++++++ keyboards/bbrfkr/dynamis/config.h | 7 ------- keyboards/bbrfkr/dynamis/info.json | 6 ++++++ keyboards/beatervan/config.h | 7 ------- keyboards/beatervan/info.json | 6 ++++++ keyboards/bfake/config.h | 6 ------ keyboards/bfake/info.json | 8 +++++++- keyboards/biacco42/meishi/config.h | 7 ------- keyboards/biacco42/meishi/info.json | 6 ++++++ keyboards/biacco42/meishi2/config.h | 7 ------- keyboards/biacco42/meishi2/info.json | 6 ++++++ keyboards/binepad/bn003/config.h | 7 ------- keyboards/binepad/bn003/info.json | 6 ++++++ keyboards/binepad/bn009/config.h | 7 ------- keyboards/binepad/bn009/info.json | 6 ++++++ keyboards/bioi/f60/config.h | 7 ------- keyboards/bioi/f60/info.json | 8 +++++++- keyboards/bioi/g60/config.h | 8 -------- keyboards/bioi/g60/info.json | 6 ++++++ keyboards/bioi/g60ble/config.h | 7 ------- keyboards/bioi/g60ble/info.json | 6 ++++++ keyboards/bioi/morgan65/config.h | 8 -------- keyboards/bioi/morgan65/info.json | 6 ++++++ keyboards/bioi/s65/config.h | 8 -------- keyboards/bioi/s65/info.json | 6 ++++++ keyboards/blackplum/config.h | 7 ------- keyboards/blackplum/info.json | 8 +++++++- keyboards/blank/blank01/config.h | 7 ------- keyboards/blank/blank01/info.json | 8 +++++++- keyboards/blank_tehnologii/manibus/config.h | 6 ------ keyboards/blank_tehnologii/manibus/info.json | 6 ++++++ keyboards/blaster75/config.h | 6 ------ keyboards/blaster75/info.json | 6 ++++++ keyboards/blockey/config.h | 7 ------- keyboards/blockey/info.json | 6 ++++++ keyboards/boardrun/bizarre/config.h | 7 ------- keyboards/boardrun/bizarre/info.json | 6 ++++++ keyboards/boardrun/classic/config.h | 7 ------- keyboards/boardrun/classic/info.json | 6 ++++++ keyboards/boardsource/holiday/spooky/config.h | 7 ------- keyboards/boardsource/holiday/spooky/info.json | 6 ++++++ keyboards/boardsource/lulu/config.h | 6 ------ keyboards/boardsource/lulu/info.json | 6 ++++++ keyboards/boardwalk/config.h | 7 ------- keyboards/boardwalk/info.json | 6 ++++++ keyboards/bobpad/config.h | 7 ------- keyboards/bobpad/info.json | 6 ++++++ keyboards/bolsa/damapad/config.h | 8 -------- keyboards/bolsa/damapad/info.json | 6 ++++++ keyboards/bop/config.h | 7 ------- keyboards/bop/info.json | 6 ++++++ keyboards/boston/config.h | 6 ------ keyboards/boston/info.json | 8 +++++++- keyboards/botanicalkeyboards/fm2u/config.h | 7 ------- keyboards/botanicalkeyboards/fm2u/info.json | 8 +++++++- keyboards/box75/config.h | 7 ------- keyboards/box75/info.json | 6 ++++++ keyboards/bpiphany/four_banger/config.h | 7 ------- keyboards/bpiphany/four_banger/info.json | 6 ++++++ keyboards/bpiphany/ghost_squid/config.h | 7 ------- keyboards/bpiphany/ghost_squid/info.json | 8 +++++++- keyboards/bpiphany/hid_liber/config.h | 7 ------- keyboards/bpiphany/hid_liber/info.json | 8 +++++++- keyboards/bpiphany/kitten_paw/config.h | 7 ------- keyboards/bpiphany/kitten_paw/info.json | 6 ++++++ keyboards/bpiphany/sixshooter/config.h | 7 ------- keyboards/bpiphany/sixshooter/info.json | 6 ++++++ keyboards/bpiphany/tiger_lily/config.h | 7 ------- keyboards/bpiphany/tiger_lily/info.json | 6 ++++++ keyboards/bpiphany/unloved_bastard/config.h | 7 ------- keyboards/bpiphany/unloved_bastard/info.json | 8 +++++++- keyboards/bt66tech/bt66tech60/config.h | 7 ------- keyboards/bt66tech/bt66tech60/info.json | 8 +++++++- keyboards/bthlabs/geekpad/config.h | 7 ------- keyboards/bthlabs/geekpad/info.json | 8 +++++++- keyboards/buildakb/potato65/config.h | 7 ------- keyboards/buildakb/potato65/info.json | 6 ++++++ keyboards/buildakb/potato65hs/config.h | 7 ------- keyboards/buildakb/potato65hs/info.json | 6 ++++++ keyboards/buildakb/potato65s/config.h | 7 ------- keyboards/buildakb/potato65s/info.json | 6 ++++++ 106 files changed, 331 insertions(+), 373 deletions(-) diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/config.h index 899fa9a6bf..b2c9c01959 100644 --- a/keyboards/b_sides/rev41lp/config.h +++ b/keyboards/b_sides/rev41lp/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 0x5F10 -#define DEVICE_VER 0x0001 -#define MANUFACTURER cyril279 -#define PRODUCT rev41lp - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 6 diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json index ba287efff9..fb5b0c17c1 100644 --- a/keyboards/b_sides/rev41lp/info.json +++ b/keyboards/b_sides/rev41lp/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "rev41lp", + "manufacturer": "cyril279", "url": "https://github.com/cyril279/keyboards/tree/main/revlp/41_1350", "maintainer": "cyril279", + "usb": { + "vid": "0xFEED", + "pid": "0x5F10", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_rev41lp": { "layout": [ diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h index 703baaaf3a..9fd41650fb 100644 --- a/keyboards/bacca70/config.h +++ b/keyboards/bacca70/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBACA -#define PRODUCT_ID 0x6970 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Viktus Design LLC -#define PRODUCT Bacca70 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json index ddc2f894ac..57840b4e12 100644 --- a/keyboards/bacca70/info.json +++ b/keyboards/bacca70/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Bacca70", + "manufacturer": "Viktus Design LLC", "url": "https://3dkeebs.com/", "maintainer": "keebnewb", + "usb": { + "vid": "0xBACA", + "pid": "0x6970", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h index b4937579a3..2db6f08c52 100644 --- a/keyboards/baguette/config.h +++ b/keyboards/baguette/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 0x5050 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Yiancar -#define PRODUCT Baguette - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json index cad167381f..2c6b09fc09 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/info.json @@ -1,8 +1,14 @@ { "keyboard_name": "Baguette", + "manufacturer": "Yiancar", "url": "", "maintainer": "qmk", "bootloader": "atmel-dfu", + "usb": { + "vid": "0xFEED", + "pid": "0x5050", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index d95b600536..0e37d96d41 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xF4B5 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 3araht -#define PRODUCT bandominedoni - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 7 diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index 82fcc559c9..040526b39c 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "bandominedoni", + "manufacturer": "3araht", "url": "https://github.com/3araht", "maintainer": "3araht", + "usb": { + "vid": "0xFEED", + "pid": "0xF4B5", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h index 2745f5c045..9933ec2fb3 100644 --- a/keyboards/bantam44/config.h +++ b/keyboards/bantam44/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 Bantam Keyboards -#define PRODUCT Bantam44 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/bantam44/info.json b/keyboards/bantam44/info.json index 6092898327..4531a7e28e 100644 --- a/keyboards/bantam44/info.json +++ b/keyboards/bantam44/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Bantam-44", + "keyboard_name": "Bantam44", + "manufacturer": "Bantam Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3, "w":1.25}, {"label":"K32", "x":2.5, "y":3, "w":1.25}, {"label":"K33", "x":3.75, "y":3, "w":1.25}, {"label":"K34", "x":5, "y":3, "w":2.75}, {"label":"K35", "x":7.75, "y":3, "w":1.25}, {"label":"K36", "x":9, "y":3}, {"label":"K37", "x":10, "y":3}, {"label":"K38", "x":11, "y":3}] diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h index e56992f1fc..ba9e2b9185 100644 --- a/keyboards/barleycorn_smd/config.h +++ b/keyboards/barleycorn_smd/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x7033 -#define PRODUCT_ID 0x4749 -#define DEVICE_VER 0x0001 -#define MANUFACTURER P3D Store -#define PRODUCT Barleycorn SMD - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json index c0094d20ac..caa0af6213 100644 --- a/keyboards/barleycorn_smd/info.json +++ b/keyboards/barleycorn_smd/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Barleycorn SMD", + "manufacturer": "P3D Store", "maintainer": "matthewdias", + "usb": { + "vid": "0x7033", + "pid": "0x4749", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h index 9b83522b1a..ea974876c7 100644 --- a/keyboards/barracuda/config.h +++ b/keyboards/barracuda/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6B6E -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER knaruo -#define PRODUCT barracuda - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/info.json index 4bb18fb911..aad3ac3bb2 100644 --- a/keyboards/barracuda/info.json +++ b/keyboards/barracuda/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "barracuda", + "manufacturer": "knaruo", "url": "https://github.com/knaruo/barracuda", "maintainer": "knaruo", + "usb": { + "vid": "0x6B6E", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_3x11": { "layout": [ diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h index ffdf6d2d28..753e3d5a41 100644 --- a/keyboards/basekeys/trifecta/config.h +++ b/keyboards/basekeys/trifecta/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEAF3 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Swiftrax -#define PRODUCT Trifecta - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index 86c45a7df2..f8819e51e4 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Trifecta", + "manufacturer": "Swiftrax", "url": "https://www.basekeys.com", "maintainer": "Swiftrax", + "usb": { + "vid": "0x04D8", + "pid": "0xEAF3", + "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":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "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":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"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":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}] diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h index 6f6e325e28..ee8604b8ba 100644 --- a/keyboards/basketweave/config.h +++ b/keyboards/basketweave/config.h @@ -18,12 +18,6 @@ #include "config_common.h" -#define VENDOR_ID 0x6B62 -#define PRODUCT_ID 0x8989 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Clackery -#define PRODUCT Basketweave - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json index 8be02555e8..c26fecaf1b 100644 --- a/keyboards/basketweave/info.json +++ b/keyboards/basketweave/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Basketweave", + "manufacturer": "Clackery", "url": "https://github.com/null-ll/basketweave", "maintainer": "null-ll", + "usb": { + "vid": "0x6B62", + "pid": "0x8989", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h index d876b5d018..3e582c4275 100644 --- a/keyboards/bastardkb/scylla/config.h +++ b/keyboards/bastardkb/scylla/config.h @@ -17,11 +17,6 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1829 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT Scylla #define MATRIX_ROWS 10 #define MATRIX_COLS 6 diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json index 104932e471..1d3dd39030 100644 --- a/keyboards/bastardkb/scylla/info.json +++ b/keyboards/bastardkb/scylla/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "The Bastard Keyboard", + "keyboard_name": "Scylla", + "manufacturer": "Bastard Keyboards", "url": "https://bastardkb.com/", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1829", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_4x6_5": { "layout": [ diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h index fae8e2ec03..45886a260f 100644 --- a/keyboards/bastardkb/skeletyl/config.h +++ b/keyboards/bastardkb/skeletyl/config.h @@ -17,11 +17,6 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1830 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT Skeletyl #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index 54c14da330..c06e23ba22 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Skeletyl", + "manufacturer": "Bastard Keyboards", "url": "https://www.bastardkb.com", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1830", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h index f6e3ebef7b..9ce37939b5 100644 --- a/keyboards/bastardkb/tbk/config.h +++ b/keyboards/bastardkb/tbk/config.h @@ -17,11 +17,6 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1828 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT The Bastard Keyboard #define MATRIX_ROWS 10 #define MATRIX_COLS 6 diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 104932e471..d16014c48a 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "The Bastard Keyboard", + "manufacturer": "Bastard Keyboards", "url": "https://bastardkb.com/", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1828", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_4x6_5": { "layout": [ diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h index 094544de9a..9c0de7ea16 100644 --- a/keyboards/bastardkb/tbkmini/config.h +++ b/keyboards/bastardkb/tbkmini/config.h @@ -17,11 +17,6 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1828 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT TBK Mini #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index d7fddeb7e6..549879328b 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TBK Mini", + "manufacturer": "Bastard Keyboards", "url": "https://www.bastardkb.com", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1828", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x6_3": { "layout": [ diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h index 0c11416612..c888afb25e 100644 --- a/keyboards/bbrfkr/dynamis/config.h +++ b/keyboards/bbrfkr/dynamis/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6262 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER bbrfkr -#define PRODUCT dynamis - /* key matrix */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json index 1e4d7154e1..b29666b98e 100644 --- a/keyboards/bbrfkr/dynamis/info.json +++ b/keyboards/bbrfkr/dynamis/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "dynamis", + "manufacturer": "bbrfkr", "url": "https://github.com/bbrfkr/keyboards", "maintainer": "bbrfkr", + "usb": { + "vid": "0x6262", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h index a8973ab4a6..15f1ea2c39 100644 --- a/keyboards/beatervan/config.h +++ b/keyboards/beatervan/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6F6A // "oj" -#define PRODUCT_ID 0x6276 // "bv" -#define DEVICE_VER 0x0001 -#define MANUFACTURER OJ -#define PRODUCT beatervan - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/beatervan/info.json b/keyboards/beatervan/info.json index c3030a411c..beeffae7a5 100644 --- a/keyboards/beatervan/info.json +++ b/keyboards/beatervan/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "beatervan", + "manufacturer": "OJ", "url": "", "maintainer": "OJ", + "usb": { + "vid": "0x6F7A", + "pid": "0x6276", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h index 54e01ad3db..79fe4a739a 100644 --- a/keyboards/bfake/config.h +++ b/keyboards/bfake/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x20A0 -#define PRODUCT_ID 0x422D -#define DEVICE_VER 0x0200 -#define MANUFACTURER NotWinkeyless -#define PRODUCT B.fake - #define RGBLED_NUM 16 #define MATRIX_ROWS 8 diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json index 576c470b88..be03a2da1a 100644 --- a/keyboards/bfake/info.json +++ b/keyboards/bfake/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "b.fake", + "keyboard_name": "B.fake", + "manufacturer": "NotWinkeyless", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x20A0", + "pid": "0x422D", + "device_version": "2.0.0" + }, "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}, {"label":"Enter", "x":12.75, "y":2, "w":2.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/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h index ff6c22dc56..3420c30035 100644 --- a/keyboards/biacco42/meishi/config.h +++ b/keyboards/biacco42/meishi/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBC42 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Biacco42 -#define PRODUCT meishi - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 4 diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json index 8241541c72..cc7bb4f713 100644 --- a/keyboards/biacco42/meishi/info.json +++ b/keyboards/biacco42/meishi/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Meishi", + "manufacturer": "Biacco42", "url": "", "maintainer": "Biacco42", + "usb": { + "vid": "0xBC42", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h index 57a4e226a3..723aae73ff 100644 --- a/keyboards/biacco42/meishi2/config.h +++ b/keyboards/biacco42/meishi2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBC42 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Biacco42 -#define PRODUCT meishi2 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 2 diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json index 8e277716ea..e63b586b69 100644 --- a/keyboards/biacco42/meishi2/info.json +++ b/keyboards/biacco42/meishi2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "meishi2", + "manufacturer": "Biacco42", "url": "", "maintainer": "biacco42", + "usb": { + "vid": "0xBC42", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h index de5fb533a0..72051f3c39 100644 --- a/keyboards/binepad/bn003/config.h +++ b/keyboards/binepad/bn003/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4249 // Binepad -#define PRODUCT_ID 0x4287 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Binepad -#define PRODUCT BN003 - /* Key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 3 diff --git a/keyboards/binepad/bn003/info.json b/keyboards/binepad/bn003/info.json index 6bb5724e47..aeff56fb01 100644 --- a/keyboards/binepad/bn003/info.json +++ b/keyboards/binepad/bn003/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BN003", + "manufacturer": "Binepad", "url": "https://binepad.com", "maintainer": "binepad", + "usb": { + "vid": "0x4249", + "pid": "0x4287", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/binepad/bn009/config.h b/keyboards/binepad/bn009/config.h index 0b12f54c75..8fb7182d91 100644 --- a/keyboards/binepad/bn009/config.h +++ b/keyboards/binepad/bn009/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4249 // Binepad -#define PRODUCT_ID 0x4295 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Binepad -#define PRODUCT BN009 - /* Key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json index 2d439c8257..528cf57016 100644 --- a/keyboards/binepad/bn009/info.json +++ b/keyboards/binepad/bn009/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BN009", + "manufacturer": "Binepad", "url": "https://binepad.com", "maintainer": "binepad", + "usb": { + "vid": "0x4249", + "pid": "0x4295", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 40a7f6250f..e2b6fca5a4 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8101 -#define PRODUCT_ID 0x4660 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Basic IO Instruments -#define PRODUCT BIOI F60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index dda3ffa690..06b0176bee 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "f60", + "keyboard_name": "BIOI F60", + "manufacturer": "Basic IO Instruments", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0x8101", + "pid": "0x4660", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index 561cbc863b..a3831f8dd8 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0x8101 // 8101 = "BIOI" -#define PRODUCT_ID 0x6080 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Basic IO Instruments -#define PRODUCT BIOI G60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index e14021a3eb..a171f68c13 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BIOI G60", + "manufacturer": "Basic IO Instruments", "url": "https://scottywei.github.io/bioi-g60ble/", "maintainer": "scottywei", + "usb": { + "vid": "0x8101", + "pid": "0x6080", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index 4aa806eb41..c87292c635 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6583 -#define PRODUCT_ID 0x6080 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Basic IO Instruments -#define PRODUCT BIOI G60 BLE - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index f8a453773f..f47a09d3f2 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BIOI G60 BLE", + "manufacturer": "Basic IO Instruments", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x6583", + "pid": "0x6080", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index e4a2e4f93c..e4ad58c3a7 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0x8101 // 8101 = "BIOI" -#define PRODUCT_ID 0x6581 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Basic IO Instruments -#define PRODUCT BIOI MORGAN65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 925f7af15d..8ed769c616 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Morgan65", + "manufacturer": "Basic IO Instruments", "url": "", "maintainer": "scottywei", + "usb": { + "vid": "0x8101", + "pid": "0x6581", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 77960a4db3..fabd6c84a2 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8101 // 8101 = "BIOI" -#define PRODUCT_ID 0x5365 // "S"65 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Basic IO Instruments -#define PRODUCT BIOI S65 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index e87437a267..fba9940ffb 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BIOI S65", + "manufacturer": "Basic IO Instruments", "url": "", "maintainer": "scottywei", + "usb": { + "vid": "0x8101", + "pid": "0x5365", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h index dc92f416f3..9c9805d423 100644 --- a/keyboards/blackplum/config.h +++ b/keyboards/blackplum/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5058 // "PX" -#define PRODUCT_ID 0x4250 // "BP" -#define DEVICE_VER 0x1001 -#define MANUFACTURER Pixlup -#define PRODUCT Blackplum Keeb - /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 8 diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json index 63230de4f8..8982213f2f 100644 --- a/keyboards/blackplum/info.json +++ b/keyboards/blackplum/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "blackplum", + "keyboard_name": "Blackplum Keeb", + "manufacturer": "Pixlup", "url": "www.tokopedia.com/pixlup", "maintainer": "eriqadams", + "usb": { + "vid": "0x5058", + "pid": "0x4250", + "device_version": "10.0.1" + }, "layouts": { "LAYOUT_68_ansi": { "layout": [{"label":"Esc", "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}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15.25, "y":0}, {"label":"PgUp", "x":16.25, "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":"Delete", "x":15.25, "y":1}, {"label":"PgDn", "x":16.25, "y":1}, {"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}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"OS", "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":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}] diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h index 5ebf8c774a..4ee950216a 100644 --- a/keyboards/blank/blank01/config.h +++ b/keyboards/blank/blank01/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x424C // "BL" -#define PRODUCT_ID 0x4B01 // "K01" -#define DEVICE_VER 0x0001 -#define MANUFACTURER BLANK -#define PRODUCT BLANK.01 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/blank/blank01/info.json b/keyboards/blank/blank01/info.json index af79aa7e8b..e03421d82b 100644 --- a/keyboards/blank/blank01/info.json +++ b/keyboards/blank/blank01/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "blank01", + "keyboard_name": "BLANK.01", + "manufacturer": "BLANK", "url": "", "maintainer": "gkeyboard", + "usb": { + "vid": "0x424C", + "pid": "0x4B01", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/blank_tehnologii/manibus/config.h b/keyboards/blank_tehnologii/manibus/config.h index e5f1caf24a..f739334e0d 100644 --- a/keyboards/blank_tehnologii/manibus/config.h +++ b/keyboards/blank_tehnologii/manibus/config.h @@ -18,12 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Blank Tehnologii -#define PRODUCT Manibus #define EE_HANDS /* key matrix size */ diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json index ab8d9b923e..43e28db7e9 100644 --- a/keyboards/blank_tehnologii/manibus/info.json +++ b/keyboards/blank_tehnologii/manibus/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Manibus", + "manufacturer": "Blank Tehnologii", "url": "https://blank.computer/", "maintainer": "SamuraiKek", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h index 61a9a754fb..cad1d20ea8 100644 --- a/keyboards/blaster75/config.h +++ b/keyboards/blaster75/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xA122 -#define PRODUCT_ID 0xB075 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Altain -#define PRODUCT Blaster75 - /* Matrix Size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 13f4669d6c..332c5a5f12 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Blaster 75", + "manufacturer": "Altain", "url": "", "maintainer": "Altain", + "usb": { + "vid": "0xA122", + "pid": "0xB075", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h index d954be2d7e..e543ab16d9 100644 --- a/keyboards/blockey/config.h +++ b/keyboards/blockey/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 Eucalyn -#define PRODUCT Blockey - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json index 473bf288a0..4e584d24bb 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BlocKey", + "manufacturer": "Eucalyn", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0}, {"label":"Tab", "x":0.16, "y":1}, {"label":"Q", "x":1.16, "y":1}, {"label":"W", "x":2.16, "y":1}, {"label":"E", "x":3.16, "y":1}, {"label":"R", "x":4.16, "y":1}, {"label":"T", "x":5.16, "y":1}, {"label":"Y", "x":6.16, "y":1}, {"label":"U", "x":7.16, "y":1}, {"label":"I", "x":8.16, "y":1}, {"label":"O", "x":9.16, "y":1}, {"label":"P", "x":10.16, "y":1}, {"label":"[", "x":11.16, "y":1}, {"label":"]", "x":12.16, "y":1}, {"label":"\\", "x":13.16, "y":1}, {"label":"LCtrl", "x":0.33, "y":2}, {"label":"A", "x":1.33, "y":2}, {"label":"S", "x":2.33, "y":2}, {"label":"D", "x":3.33, "y":2}, {"label":"F", "x":4.33, "y":2}, {"label":"G", "x":5.33, "y":2}, {"label":"H", "x":6.33, "y":2}, {"label":"J", "x":7.33, "y":2}, {"label":"K", "x":8.33, "y":2}, {"label":"L", "x":9.33, "y":2}, {"label":";", "x":10.33, "y":2}, {"label":"\"", "x":11.33, "y":2}, {"label":"Enter", "x":12.66, "y":2}, {"label":"LShift", "x":0.5, "y":3}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":",", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"Up", "x":11.5, "y":3}, {"label":"Fn", "x":12.83, "y":3}, {"label":"Esc", "x":0, "y":4}, {"label":"Caps Lock", "x":1, "y":4}, {"label":"LAlt", "x":2, "y":4}, {"label":"LGUI", "x":3, "y":4}, {"label":"Space", "x":4, "y":4, "w":6}, {"label":"Left", "x":10.5, "y":4}, {"label":"Down", "x":11.5, "y":4}, {"label":"Right", "x":12.5, "y":4}] diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h index 9f4b91e2b5..4034ced4e8 100644 --- a/keyboards/boardrun/bizarre/config.h +++ b/keyboards/boardrun/bizarre/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCDCD -#define PRODUCT_ID 0x5339 -#define DEVICE_VER 0x0001 -#define MANUFACTURER shensmobile -#define PRODUCT Boardrun Bizarre - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json index 066095aa34..aa35ff24d9 100644 --- a/keyboards/boardrun/bizarre/info.json +++ b/keyboards/boardrun/bizarre/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Boardrun Bizarre", + "manufacturer": "shensmobile", "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/bizarre", "maintainer": "QMK Community", + "usb": { + "vid": "0xCDCD", + "pid": "0x5339", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h index 754c42975f..f6ac6ee88e 100644 --- a/keyboards/boardrun/classic/config.h +++ b/keyboards/boardrun/classic/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCDCD -#define PRODUCT_ID 0x5338 -#define DEVICE_VER 0x0001 -#define MANUFACTURER shensmobile -#define PRODUCT Boardrun Classic - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json index 538814f36f..70ff145c06 100644 --- a/keyboards/boardrun/classic/info.json +++ b/keyboards/boardrun/classic/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Boardrun Classic", + "manufacturer": "shensmobile", "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/classic", "maintainer": "QMK Community", + "usb": { + "vid": "0xCDCD", + "pid": "0x5338", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_classic": { "layout": [ diff --git a/keyboards/boardsource/holiday/spooky/config.h b/keyboards/boardsource/holiday/spooky/config.h index 87d63b0d9e..e2c0600a10 100644 --- a/keyboards/boardsource/holiday/spooky/config.h +++ b/keyboards/boardsource/holiday/spooky/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4273 -#define PRODUCT_ID 0x1031 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Boardsource -#define PRODUCT spooky - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json index c942b2af11..b8964d881e 100644 --- a/keyboards/boardsource/holiday/spooky/info.json +++ b/keyboards/boardsource/holiday/spooky/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "spooky", + "manufacturer": "Boardsource", "url": "https://boardsource.xyz/store/5f783f6da2c1b43e37ca0795", "maintainer": "boardsource", + "usb": { + "vid": "0x4273", + "pid": "0x1031", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x3": { "layout": [ diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h index 8cd240179e..d4fea42b33 100644 --- a/keyboards/boardsource/lulu/config.h +++ b/keyboards/boardsource/lulu/config.h @@ -5,12 +5,6 @@ #include "config_common.h" -#define VENDOR_ID 0x4273 -#define PRODUCT_ID 0x7685 -#define DEVICE_VER 0x0000 -#define MANUFACTURER Boardsource -#define PRODUCT lulu - #define MATRIX_ROWS 10 #define MATRIX_COLS 6 #define MATRIX_ROW_PINS {C6, D7, E6, B4, B5} diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json index 156a7cea98..4cfc688740 100644 --- a/keyboards/boardsource/lulu/info.json +++ b/keyboards/boardsource/lulu/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Lulu", + "manufacturer": "Boardsource", "url": "https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb", "maintainer": "boardsource", + "usb": { + "vid": "0x4273", + "pid": "0x7685", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h index 03e481ce62..62e75b36dd 100644 --- a/keyboards/boardwalk/config.h +++ b/keyboards/boardwalk/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCDCD -#define PRODUCT_ID 0x5337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER shensmobile -#define PRODUCT Boardwalk - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json index 63630cae8a..4d7d2ae4af 100644 --- a/keyboards/boardwalk/info.json +++ b/keyboards/boardwalk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Boardwalk", + "manufacturer": "shensmobile", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xCDCD", + "pid": "0x5337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x14": { "layout": [ diff --git a/keyboards/bobpad/config.h b/keyboards/bobpad/config.h index c744a455e3..a0ae8612b8 100644 --- a/keyboards/bobpad/config.h +++ b/keyboards/bobpad/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x416B -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Desiboards -#define PRODUCT bobpad - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json index 53ac20e9dc..cbb6b70268 100644 --- a/keyboards/bobpad/info.json +++ b/keyboards/bobpad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "bobPad", + "manufacturer": "Desiboards", "url": "", "maintainer": "Ananya Kirti", + "usb": { + "vid": "0x416B", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x3": { "layout": [ diff --git a/keyboards/bolsa/damapad/config.h b/keyboards/bolsa/damapad/config.h index b829a8a998..fd3db403f5 100644 --- a/keyboards/bolsa/damapad/config.h +++ b/keyboards/bolsa/damapad/config.h @@ -20,14 +20,6 @@ along with this program. If not, see . #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D64 -#define PRODUCT_ID 0x6470 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bolsa Keyboard Supply -#define PRODUCT Damapad - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 6 diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json index 28d0c4fc82..00e11799fe 100644 --- a/keyboards/bolsa/damapad/info.json +++ b/keyboards/bolsa/damapad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Damapad", + "manufacturer": "Bolsa Keyboard Supply", "url": "", "maintainer": "matthewdias", + "usb": { + "vid": "0x6D64", + "pid": "0x6470", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_wkl": { "layout": [{ diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h index fa646a582f..c1a6078cb4 100644 --- a/keyboards/bop/config.h +++ b/keyboards/bop/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x666B // fk -#define PRODUCT_ID 0x626F // bo -#define DEVICE_VER 0x0001 // rev 1 -#define MANUFACTURER fruitykeeb -#define PRODUCT bop - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 20 diff --git a/keyboards/bop/info.json b/keyboards/bop/info.json index 398e9c32e9..874e797763 100644 --- a/keyboards/bop/info.json +++ b/keyboards/bop/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "bop", + "manufacturer": "fruitykeeb", "url": "https://github.com/blewis308/BOP-Keyboard", "maintainer": "Fruit", + "usb": { + "vid": "0x666B", + "pid": "0x626F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h index 247616d3da..ebaa7ae640 100644 --- a/keyboards/boston/config.h +++ b/keyboards/boston/config.h @@ -16,12 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAC12 -#define PRODUCT_ID 0x4176 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Pylon -#define PRODUCT Boston /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 19 diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json index 82e4915176..f0d832afbf 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "boston", + "keyboard_name": "Boston", + "manufacturer": "Pylon", "url": "https://github.com/bluepylons/Boston", "maintainer": "bluepylons", + "usb": { + "vid": "0xAC12", + "pid": "0x4176", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/botanicalkeyboards/fm2u/config.h b/keyboards/botanicalkeyboards/fm2u/config.h index 87f865b63a..23e4ad208b 100644 --- a/keyboards/botanicalkeyboards/fm2u/config.h +++ b/keyboards/botanicalkeyboards/fm2u/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6969 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER botanicalkeyboards -#define PRODUCT fm2u - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json index 5fceadb1fb..d6b521f24d 100644 --- a/keyboards/botanicalkeyboards/fm2u/info.json +++ b/keyboards/botanicalkeyboards/fm2u/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Botanical Keyboards FM2U", + "keyboard_name": "FM2U", + "manufacturer": "Botanical Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x6969", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_1u": { "layout": [ diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h index b6bcc31b0a..53e717fa86 100644 --- a/keyboards/box75/config.h +++ b/keyboards/box75/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7668 // LD for LinDesign -#define PRODUCT_ID 0xB075 // For BOX75 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Lin Design -#define PRODUCT BOX75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/box75/info.json b/keyboards/box75/info.json index 9fe35289cf..af7e75360b 100644 --- a/keyboards/box75/info.json +++ b/keyboards/box75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "BOX75", + "manufacturer": "Lin Design", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x7668", + "pid": "0xB075", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h index 7ad7a5c369..ec8a0956be 100644 --- a/keyboards/bpiphany/four_banger/config.h +++ b/keyboards/bpiphany/four_banger/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x2004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 1up Keyboards -#define PRODUCT Four Banger - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 2 diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json index 48fc16cebe..5750b19a6b 100644 --- a/keyboards/bpiphany/four_banger/info.json +++ b/keyboards/bpiphany/four_banger/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Four Banger", + "manufacturer": "1up Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x2004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x2": { "layout": [ diff --git a/keyboards/bpiphany/ghost_squid/config.h b/keyboards/bpiphany/ghost_squid/config.h index bb8535b177..a57767cae9 100644 --- a/keyboards/bpiphany/ghost_squid/config.h +++ b/keyboards/bpiphany/ghost_squid/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 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Bathroom Epiphanies -#define PRODUCT ghost_squid - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json index 698e3c21de..3617c7efaf 100644 --- a/keyboards/bpiphany/ghost_squid/info.json +++ b/keyboards/bpiphany/ghost_squid/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Bathroom Epiphanies Ghost Squid", + "keyboard_name": "Ghost Squid", + "manufacturer": "Bathroom Epiphanies", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6050", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h index 95e617f562..af3936dcdb 100755 --- a/keyboards/bpiphany/hid_liber/config.h +++ b/keyboards/bpiphany/hid_liber/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xB919 -#define DEVICE_VER 0x0001 -#define MANUFACTURER "bpiphany" -#define PRODUCT "HIDLiberation" - /* key matrix size */ #define MATRIX_ROWS 18 #define MATRIX_COLS 8 diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json index 9399b276c5..0caa64e525 100644 --- a/keyboards/bpiphany/hid_liber/info.json +++ b/keyboards/bpiphany/hid_liber/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "bpiphany HIDLiberation", + "keyboard_name": "HIDLiberation", + "manufacturer": "bpiphany", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0xB919", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h index b357289e69..819b68e40f 100644 --- a/keyboards/bpiphany/kitten_paw/config.h +++ b/keyboards/bpiphany/kitten_paw/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 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Costar -#define PRODUCT Majestouch - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json index f9c517ca48..a5d7fc54e7 100644 --- a/keyboards/bpiphany/kitten_paw/info.json +++ b/keyboards/bpiphany/kitten_paw/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kitten Paw", + "manufacturer": "bpiphany", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6050", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"KC_NUBS", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h index 74acfac9b0..a943bcc249 100644 --- a/keyboards/bpiphany/sixshooter/config.h +++ b/keyboards/bpiphany/sixshooter/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6666 -#define DEVICE_VER 0x0001 -#define MANUFACTURER bpiphany -#define PRODUCT sixshooter - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json index f45419746a..016568067e 100644 --- a/keyboards/bpiphany/sixshooter/info.json +++ b/keyboards/bpiphany/sixshooter/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "SixShooter", + "manufacturer": "bpiphany", "maintainer": "qmk", "url": "https://geekhack.org/index.php?topic=70033.0", + "usb": { + "vid": "0xFEED", + "pid": "0x6666", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}] diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h index 1831e3e4d4..2d185e0c28 100644 --- a/keyboards/bpiphany/tiger_lily/config.h +++ b/keyboards/bpiphany/tiger_lily/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4245 //BE -#define PRODUCT_ID 0x544C //TL -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bathroom Epiphanies -#define PRODUCT tiger_lily - /* * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies * Ported from the Bathroom Epiphanies TMK Firmware: diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json index aacd06dcb4..2c03cb0b7f 100644 --- a/keyboards/bpiphany/tiger_lily/info.json +++ b/keyboards/bpiphany/tiger_lily/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "tiger_lily", + "manufacturer": "Bathroom Epiphanies", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4245", + "pid": "0x544C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h index 1f1cf72a18..9b00e97104 100644 --- a/keyboards/bpiphany/unloved_bastard/config.h +++ b/keyboards/bpiphany/unloved_bastard/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 0x1337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER BathroomEpiphanies -#define PRODUCT Unloved Bastard - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json index 0fe42d3197..33fe46f209 100644 --- a/keyboards/bpiphany/unloved_bastard/info.json +++ b/keyboards/bpiphany/unloved_bastard/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "unloved_bastard", + "keyboard_name": "Unloved Bastard", + "manufacturer": "Bathroom Epiphanies", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x1337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h index 18a7a2d85e..62b9f34a66 100644 --- a/keyboards/bt66tech/bt66tech60/config.h +++ b/keyboards/bt66tech/bt66tech60/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4254 -#define PRODUCT_ID 0x7070 -#define DEVICE_VER 0x0001 -#define MANUFACTURER bt66tech -#define PRODUCT bt66tech 60% - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json index c4011c3439..0f65b6f57e 100644 --- a/keyboards/bt66tech/bt66tech60/info.json +++ b/keyboards/bt66tech/bt66tech60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "bt66tech60", + "keyboard_name": "bt66tech 60%", + "manufacturer": "bt66tech", "url": "", "maintainer": "bt66tech", + "usb": { + "vid": "0x4254", + "pid": "0x7070", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h index 5dad96a7b4..c8d3039202 100644 --- a/keyboards/bthlabs/geekpad/config.h +++ b/keyboards/bthlabs/geekpad/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 0x4257 -#define DEVICE_VER 0x0001 -#define MANUFACTURER BTHLabs -#define PRODUCT GeekPad - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json index 52ecd7a693..270ce3a567 100644 --- a/keyboards/bthlabs/geekpad/info.json +++ b/keyboards/bthlabs/geekpad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "BTHLabs GeekPad", + "keyboard_name": "GeekPad", + "manufacturer": "BTHLabs", "url": "https://git.bthlabs.pl/tomekwojcik/geekpad", "maintainer": "Tomek Wójcik ", + "usb": { + "vid": "0xFEED", + "pid": "0x4257", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h index 4a0a17ace0..1c9b6f1549 100644 --- a/keyboards/buildakb/potato65/config.h +++ b/keyboards/buildakb/potato65/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 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Maelkk -#define PRODUCT Potato 65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json index a7713ef1bd..54b560b9a5 100644 --- a/keyboards/buildakb/potato65/info.json +++ b/keyboards/buildakb/potato65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Potato 65", + "manufacturer": "Maelkk", "url": "https://github.com/Aeonstrife/potato65", "maintainer": "Maelkk", + "usb": { + "vid": "0x4A56", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi_split_bs": { "layout": [ diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h index cf565d8176..dc83f4456e 100644 --- a/keyboards/buildakb/potato65hs/config.h +++ b/keyboards/buildakb/potato65hs/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4A56 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Maelkk -#define PRODUCT Potato 65 Hotswap - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json index 52ea416fa2..0ef7e9e01a 100644 --- a/keyboards/buildakb/potato65hs/info.json +++ b/keyboards/buildakb/potato65hs/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Potato 65 Hotswap", + "manufacturer": "Maelkk", "url": "https://github.com/Aeonstrife/potato65hotswap", "maintainer": "Maelkk", + "usb": { + "vid": "0x4A56", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h index c1374558c9..6ad3183c84 100644 --- a/keyboards/buildakb/potato65s/config.h +++ b/keyboards/buildakb/potato65s/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4A56 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Maelkk -#define PRODUCT Potato 65 Solderable - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json index 257ed6022d..1920861946 100644 --- a/keyboards/buildakb/potato65s/info.json +++ b/keyboards/buildakb/potato65s/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Potato 65 Solderable", + "manufacturer": "Maelkk", "url": "https://github.com/Aeonstrife/potato65solderable", "maintainer": "Maelkk", + "usb": { + "vid": "0x4A56", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.1