From be5b1a24bf650d9bc0bff4cf3b27a9c641d262fd Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 04:39:00 +1000 Subject: Move keyboard USB IDs and strings to data driven: O (#17874) --- keyboards/obosob/arch_36/config.h | 8 -------- keyboards/obosob/arch_36/info.json | 6 ++++++ keyboards/obosob/steal_this_keyboard/config.h | 7 ------- keyboards/obosob/steal_this_keyboard/info.json | 8 +++++++- keyboards/ocean/addon/config.h | 6 ------ keyboards/ocean/addon/info.json | 6 ++++++ keyboards/ocean/gin_v2/config.h | 6 ------ keyboards/ocean/gin_v2/info.json | 6 ++++++ keyboards/ocean/slamz/config.h | 6 ------ keyboards/ocean/slamz/info.json | 6 ++++++ keyboards/ocean/stealth/config.h | 6 ------ keyboards/ocean/stealth/info.json | 6 ++++++ keyboards/ocean/sus/config.h | 6 ------ keyboards/ocean/sus/info.json | 8 +++++++- keyboards/ocean/wang_ergo/config.h | 6 ------ keyboards/ocean/wang_ergo/info.json | 6 ++++++ keyboards/ocean/wang_v2/config.h | 6 ------ keyboards/ocean/wang_v2/info.json | 6 ++++++ keyboards/ocean/yuri/config.h | 6 ------ keyboards/ocean/yuri/info.json | 6 ++++++ keyboards/oddball/config.h | 7 ------- keyboards/oddball/info.json | 6 ++++++ keyboards/oddforge/vea/config.h | 7 ------- keyboards/oddforge/vea/info.json | 6 ++++++ keyboards/odelia/config.h | 7 ------- keyboards/odelia/info.json | 8 +++++++- keyboards/ogre/ergo_single/config.h | 7 ------- keyboards/ogre/ergo_single/info.json | 6 ++++++ keyboards/ogre/ergo_split/config.h | 7 ------- keyboards/ogre/ergo_split/info.json | 6 ++++++ keyboards/ok60/config.h | 7 ------- keyboards/ok60/info.json | 6 ++++++ keyboards/omkbd/ergodash/mini/config.h | 7 ------- keyboards/omkbd/ergodash/mini/info.json | 8 +++++++- keyboards/omkbd/ergodash/rev1/config.h | 7 ------- keyboards/omkbd/ergodash/rev1/info.json | 6 ++++++ keyboards/omkbd/runner3680/3x6/config.h | 7 ------- keyboards/omkbd/runner3680/3x6/info.json | 6 ++++++ keyboards/omkbd/runner3680/3x7/config.h | 7 ------- keyboards/omkbd/runner3680/3x7/info.json | 6 ++++++ keyboards/omkbd/runner3680/3x8/config.h | 7 ------- keyboards/omkbd/runner3680/3x8/info.json | 6 ++++++ keyboards/omkbd/runner3680/4x6/config.h | 7 ------- keyboards/omkbd/runner3680/4x6/info.json | 6 ++++++ keyboards/omkbd/runner3680/4x7/config.h | 7 ------- keyboards/omkbd/runner3680/4x7/info.json | 6 ++++++ keyboards/omkbd/runner3680/4x8/config.h | 7 ------- keyboards/omkbd/runner3680/4x8/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x6/config.h | 7 ------- keyboards/omkbd/runner3680/5x6/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x6_5x8/config.h | 7 ------- keyboards/omkbd/runner3680/5x6_5x8/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x7/config.h | 7 ------- keyboards/omkbd/runner3680/5x7/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x8/config.h | 7 ------- keyboards/omkbd/runner3680/5x8/info.json | 6 ++++++ keyboards/omnikeyish/config.h | 7 ------- keyboards/omnikeyish/info.json | 6 ++++++ keyboards/onekeyco/dango40/config.h | 6 ------ keyboards/onekeyco/dango40/info.json | 6 ++++++ keyboards/orange75/config.h | 7 ------- keyboards/orange75/info.json | 6 ++++++ keyboards/org60/config.h | 7 ------- keyboards/org60/info.json | 6 ++++++ keyboards/ortho5by12/config.h | 9 --------- keyboards/ortho5by12/info.json | 6 ++++++ keyboards/orthocode/config.h | 7 ------- keyboards/orthocode/info.json | 6 ++++++ keyboards/orthodox/rev1/config.h | 7 ------- keyboards/orthodox/rev1/info.json | 6 ++++++ keyboards/orthodox/rev3/config.h | 7 ------- keyboards/orthodox/rev3/info.json | 6 ++++++ keyboards/orthodox/rev3_teensy/config.h | 7 ------- keyboards/orthodox/rev3_teensy/info.json | 6 ++++++ keyboards/owlab/jelly_epoch/hotswap/config.h | 7 ------- keyboards/owlab/jelly_epoch/hotswap/info.json | 8 +++++++- keyboards/owlab/jelly_epoch/soldered/config.h | 7 ------- keyboards/owlab/jelly_epoch/soldered/info.json | 8 +++++++- keyboards/owlab/spring/config.h | 8 -------- keyboards/owlab/spring/info.json | 6 ++++++ keyboards/owlab/suit80/ansi/config.h | 7 ------- keyboards/owlab/suit80/ansi/info.json | 8 +++++++- keyboards/owlab/suit80/iso/config.h | 7 ------- keyboards/owlab/suit80/iso/info.json | 8 +++++++- keyboards/owlab/voice65/hotswap/config.h | 7 ------- keyboards/owlab/voice65/hotswap/info.json | 8 +++++++- keyboards/owlab/voice65/soldered/config.h | 7 ------- keyboards/owlab/voice65/soldered/info.json | 8 +++++++- 88 files changed, 274 insertions(+), 313 deletions(-) diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h index be4a0a9830..6ec4b2a26c 100644 --- a/keyboards/obosob/arch_36/config.h +++ b/keyboards/obosob/arch_36/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x9CE3 -#define DEVICE_VER 0x0001 -#define MANUFACTURER obosob -#define PRODUCT Arch-36 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 344674a426..c5d9077237 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Arch-36", + "manufacturer": "obosob", "url": "", "maintainer": "obosob", + "usb": { + "vid": "0xFEED", + "pid": "0x9CE3", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/obosob/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h index ea637d0c2f..d5f21482aa 100644 --- a/keyboards/obosob/steal_this_keyboard/config.h +++ b/keyboards/obosob/steal_this_keyboard/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC2AB -#define PRODUCT_ID 0x50AD -#define DEVICE_VER 0x0001 -#define MANUFACTURER Obosob -#define PRODUCT Steal This Keyboard! - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json index 7a4eabdb55..a20119208d 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "steal this keyboard", + "keyboard_name": "Steal This Keyboard!", + "manufacturer": "Obosob", "url": "https://github.com/obosob/steal_this_keyboard", "maintainer": "@obosob", + "usb": { + "vid": "0xC2AB", + "pid": "0x50AD", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ diff --git a/keyboards/ocean/addon/config.h b/keyboards/ocean/addon/config.h index 1b221b65bd..9380a36eb6 100644 --- a/keyboards/ocean/addon/config.h +++ b/keyboards/ocean/addon/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0012 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT AddOn - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json index 75e1eb2c48..05d41ab59a 100644 --- a/keyboards/ocean/addon/info.json +++ b/keyboards/ocean/addon/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AddOn", + "manufacturer": "Ocean", "url": "tokopedia.com/kbdksp", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ocean/gin_v2/config.h b/keyboards/ocean/gin_v2/config.h index 2f70ad3f5e..e1d7b9a74d 100644 --- a/keyboards/ocean/gin_v2/config.h +++ b/keyboards/ocean/gin_v2/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0005 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Gin V2 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/info.json index cd9d809419..d7493b39c3 100644 --- a/keyboards/ocean/gin_v2/info.json +++ b/keyboards/ocean/gin_v2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Gin V2", + "manufacturer": "Ocean", "url": "", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0005", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ocean/slamz/config.h b/keyboards/ocean/slamz/config.h index 5f27a3a6d0..aff184b243 100644 --- a/keyboards/ocean/slamz/config.h +++ b/keyboards/ocean/slamz/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0011 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Slamz - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json index 4d5fe17dc3..6534007c3b 100644 --- a/keyboards/ocean/slamz/info.json +++ b/keyboards/ocean/slamz/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Slamz", + "manufacturer": "Ocean", "url": "", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0011", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/ocean/stealth/config.h b/keyboards/ocean/stealth/config.h index ab1860332e..2661b00c55 100644 --- a/keyboards/ocean/stealth/config.h +++ b/keyboards/ocean/stealth/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Stealth - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 3 diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json index 3342319c8e..7b45dcd520 100644 --- a/keyboards/ocean/stealth/info.json +++ b/keyboards/ocean/stealth/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Stealth", + "manufacturer": "Ocean", "url": "", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0010", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}] diff --git a/keyboards/ocean/sus/config.h b/keyboards/ocean/sus/config.h index c3e2a3263a..4b2306d387 100644 --- a/keyboards/ocean/sus/config.h +++ b/keyboards/ocean/sus/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0009 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Sus - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json index 3665038b6f..580379f25a 100644 --- a/keyboards/ocean/sus/info.json +++ b/keyboards/ocean/sus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "SUS", + "keyboard_name": "Sus", + "manufacturer": "Ocean", "url": " ", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0009", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/ocean/wang_ergo/config.h b/keyboards/ocean/wang_ergo/config.h index 62c9d2fca2..a9a0d11791 100644 --- a/keyboards/ocean/wang_ergo/config.h +++ b/keyboards/ocean/wang_ergo/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Wang Ergo - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json index 5ade58c54c..04065cdb07 100644 --- a/keyboards/ocean/wang_ergo/info.json +++ b/keyboards/ocean/wang_ergo/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Wang Ergo", + "manufacturer": "Ocean", "url": "", "maintainer": "oceeean", + "usb": { + "vid": "0x9624", + "pid": "0x0008", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/ocean/wang_v2/config.h b/keyboards/ocean/wang_v2/config.h index f5f1e9231c..a2cd557720 100644 --- a/keyboards/ocean/wang_v2/config.h +++ b/keyboards/ocean/wang_v2/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Wang V2 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json index 310f448956..7a04f23e1b 100644 --- a/keyboards/ocean/wang_v2/info.json +++ b/keyboards/ocean/wang_v2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Wang V2", + "manufacturer": "Ocean", "url": "", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0.75, "y":1, "w":1.25}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1, "w":1.75}, {"x":0.25, "y":2, "w":1.75}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/ocean/yuri/config.h b/keyboards/ocean/yuri/config.h index d8313fd71f..e04d70a50b 100644 --- a/keyboards/ocean/yuri/config.h +++ b/keyboards/ocean/yuri/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x9624 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ocean -#define PRODUCT Yuri - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json index 68d9668579..458c11d091 100644 --- a/keyboards/ocean/yuri/info.json +++ b/keyboards/ocean/yuri/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Yuri", + "manufacturer": "Ocean", "url": "tokopedia.com/strat0s", "maintainer": "Ocean", + "usb": { + "vid": "0x9624", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h index cfb134c4e3..d56a1f8f26 100644 --- a/keyboards/oddball/config.h +++ b/keyboards/oddball/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xCA49 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alexander Tulloh -#define PRODUCT Oddball - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index ab1eb1f2e7..84e512dbdc 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Oddball", + "manufacturer": "Alexander Tulloh", "url": "https://atulloh.github.io/oddball", "maintainer": "Alexander Tulloh", + "usb": { + "vid": "0xFEED", + "pid": "0xCA49", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h index 44f5264017..43a75a7f03 100644 --- a/keyboards/oddforge/vea/config.h +++ b/keyboards/oddforge/vea/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFFFE -#define PRODUCT_ID 0x4155 -#define DEVICE_VER 0x0100 -#define MANUFACTURER OddForge -#define PRODUCT VE.A - /* matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 15 diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json index 471d04068d..e2ab0d97a3 100644 --- a/keyboards/oddforge/vea/info.json +++ b/keyboards/oddforge/vea/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "VE.A", + "manufacturer": "OddForge", "url": "https://drop.com/buy/ve-a", "maintainer": "MajorKoos", + "usb": { + "vid": "0xFFFE", + "pid": "0x4155", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [{"label":"5,0", "x":2.25, "y":0}, {"label":"5,1", "x":3.25, "y":0}, {"label":"5,2", "x":4.25, "y":0}, {"label":"5,3", "x":5.25, "y":0}, {"label":"5,4", "x":6.25, "y":0}, {"label":"5,5", "x":7.25, "y":0}, {"label":"5,6", "x":8.25, "y":0}, {"label":"5,8", "x":10.75, "y":0}, {"label":"5,9", "x":11.75, "y":0}, {"label":"5,10", "x":12.75, "y":0}, {"label":"5,11", "x":13.75, "y":0}, {"label":"5,12", "x":14.75, "y":0}, {"label":"5,13", "x":15.75, "y":0}, {"label":"6,11", "x":16.75, "y":0}, {"label":"7,11", "x":17.75, "y":0}, {"label":"6,13", "x":18.75, "y":0}, {"label":"6,1", "x":0, "y":1}, {"label":"7,1", "x":1, "y":1}, {"label":"4,0", "x":2.25, "y":1}, {"label":"4,1", "x":3.25, "y":1}, {"label":"4,2", "x":4.25, "y":1}, {"label":"4,3", "x":5.25, "y":1}, {"label":"4,4", "x":6.25, "y":1}, {"label":"4,5", "x":7.25, "y":1}, {"label":"4,6", "x":8.25, "y":1}, {"label":"4,8", "x":10.75, "y":1}, {"label":"4,9", "x":11.75, "y":1}, {"label":"4,10", "x":12.75, "y":1}, {"label":"4,11", "x":13.75, "y":1}, {"label":"4,12", "x":14.75, "y":1}, {"label":"4,13", "x":15.75, "y":1}, {"label":"4,14", "x":16.75, "y":1, "w":2}, {"label":"6,10", "x":18.75, "y":1}, {"label":"6,2", "x":0, "y":2}, {"label":"7,2", "x":1, "y":2}, {"label":"3,0", "x":2.25, "y":2, "w":1.5}, {"label":"3,1", "x":3.75, "y":2}, {"label":"3,2", "x":4.75, "y":2}, {"label":"3,3", "x":5.75, "y":2}, {"label":"3,4", "x":6.75, "y":2}, {"label":"3,5", "x":7.75, "y":2}, {"label":"1,8", "x":10.25, "y":2}, {"label":"1,9", "x":11.25, "y":2}, {"label":"1,10", "x":12.25, "y":2}, {"label":"1,11", "x":13.25, "y":2}, {"label":"1,12", "x":14.25, "y":2}, {"label":"1,13", "x":15.25, "y":2}, {"label":"1,14", "x":16.25, "y":2}, {"label":"2,14", "x":17.25, "y":2, "w":1.5}, {"label":"7,10", "x":18.75, "y":2}, {"label":"6,3", "x":0, "y":3}, {"label":"7,3", "x":1, "y":3}, {"label":"2,0", "x":2.25, "y":3, "w":1.75}, {"label":"2,1", "x":4, "y":3}, {"label":"2,2", "x":5, "y":3}, {"label":"2,3", "x":6, "y":3}, {"label":"2,4", "x":7, "y":3}, {"label":"2,5", "x":8, "y":3}, {"label":"2,8", "x":10.5, "y":3}, {"label":"2,9", "x":11.5, "y":3}, {"label":"2,10", "x":12.5, "y":3}, {"label":"2,11", "x":13.5, "y":3}, {"label":"2,12", "x":14.5, "y":3}, {"label":"2,13", "x":15.5, "y":3}, {"label":"3,13", "x":16.5, "y":3, "w":2.25}, {"label":"6,12", "x":18.75, "y":3}, {"label":"6,4", "x":0, "y":4}, {"label":"7,4", "x":1, "y":4}, {"label":"1,0", "x":2.25, "y":4, "w":2.25}, {"label":"1,1", "x":4.5, "y":4}, {"label":"1,2", "x":5.5, "y":4}, {"label":"1,3", "x":6.5, "y":4}, {"label":"1,4", "x":7.5, "y":4}, {"label":"1,5", "x":8.5, "y":4}, {"label":"3,8", "x":11, "y":4}, {"label":"3,9", "x":12, "y":4}, {"label":"3,10", "x":13, "y":4}, {"label":"3,11", "x":14, "y":4}, {"label":"3,12", "x":15, "y":4}, {"label":"3,14", "x":16, "y":4, "w":1.75}, {"label":"6,8", "x":17.75, "y":4}, {"label":"7,12", "x":18.75, "y":4}, {"label":"6,5", "x":0, "y":5}, {"label":"7,5", "x":1, "y":5}, {"label":"0,0", "x":2.25, "y":5, "w":1.25}, {"label":"0,1", "x":3.5, "y":5, "w":1.25}, {"label":"0,2", "x":4.75, "y":5, "w":1.25}, {"label":"7,7", "x":6, "y":5, "w":2}, {"label":"6,6", "x":8, "y":5}, {"label":"6,14", "x":10.5, "y":5, "w":2.75}, {"label":"0,10", "x":13.25, "y":5, "w":1.25}, {"label":"0,9", "x":14.5, "y":5}, {"label":"0,8", "x":15.5, "y":5, "w":1.25}, {"label":"7,8", "x":16.75, "y":5}, {"label":"6,9", "x":17.75, "y":5}, {"label":"7,9", "x":18.75, "y":5}] diff --git a/keyboards/odelia/config.h b/keyboards/odelia/config.h index 10803b81a1..c3351725a6 100644 --- a/keyboards/odelia/config.h +++ b/keyboards/odelia/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6BE3 -#define PRODUCT_ID 0xA129 -#define DEVICE_VER 0x0001 -#define MANUFACTURER InterpolKeeb -#define PRODUCT Odelia - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 10 diff --git a/keyboards/odelia/info.json b/keyboards/odelia/info.json index b204795952..dacdc49760 100644 --- a/keyboards/odelia/info.json +++ b/keyboards/odelia/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "odelia", + "keyboard_name": "Odelia", + "manufacturer": "InterpolKeeb", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0x6BE3", + "pid": "0xA129", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h index 5c0c09b3c7..788ace6f5c 100644 --- a/keyboards/ogre/ergo_single/config.h +++ b/keyboards/ogre/ergo_single/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 ctrlshiftba -#define PRODUCT ergo_single - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index ca9223545d..fd446099f5 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ogre Ergo Single", + "manufacturer": "ctrlshiftba", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h index 4bf45c05e7..43a9894f3d 100644 --- a/keyboards/ogre/ergo_split/config.h +++ b/keyboards/ogre/ergo_split/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 ctrlshiftba -#define PRODUCT ergo_split - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index eaf5c4e389..2e3e2f73a8 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ogre Ergo Split", + "manufacturer": "ctrlshiftba", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h index faccfcc646..612fa7cecc 100644 --- a/keyboards/ok60/config.h +++ b/keyboards/ok60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B36 // K6 - ok60 -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OK60 -#define PRODUCT OK60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json index 8207604dda..19144808e2 100644 --- a/keyboards/ok60/info.json +++ b/keyboards/ok60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "OK60", + "manufacturer": "OK60", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4B36", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index b936e0f54e..67fe7e1603 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -20,13 +20,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 0x0100 -#define MANUFACTURER Omkbd -#define PRODUCT ErgoDashmini - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 1a0c1766f6..d8e9bc634f 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ErgoDash mini", + "keyboard_name": "ErgoDash Mini", + "manufacturer": "Omkbd", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [{"label":"L00", "x":0, "y":1.375}, {"label":"L01", "x":1, "y":1.375}, {"label":"L02", "x":2, "y":1.125}, {"label":"L03", "x":3, "y":1}, {"label":"L04", "x":4, "y":1.125}, {"label":"L05", "x":5, "y":1.25}, {"label":"L06", "x":6, "y":1.75}, {"label":"R00", "x":11, "y":1.75}, {"label":"R01", "x":12, "y":1.25}, {"label":"R02", "x":13, "y":1.125}, {"label":"R03", "x":14, "y":1}, {"label":"R04", "x":15, "y":1.125}, {"label":"R05", "x":16, "y":1.375}, {"label":"R06", "x":17, "y":1.375}, {"label":"L10", "x":0, "y":2.375}, {"label":"L11", "x":1, "y":2.375}, {"label":"L12", "x":2, "y":2.125}, {"label":"L13", "x":3, "y":2}, {"label":"L14", "x":4, "y":2.125}, {"label":"L15", "x":5, "y":2.25}, {"label":"L16", "x":6, "y":2.75}, {"label":"R10", "x":11, "y":2.75}, {"label":"R11", "x":12, "y":2.25}, {"label":"R12", "x":13, "y":2.125}, {"label":"R13", "x":14, "y":2}, {"label":"R14", "x":15, "y":2.125}, {"label":"R15", "x":16, "y":2.375}, {"label":"R16", "x":17, "y":2.375}, {"label":"L20", "x":0, "y":3.375}, {"label":"L21", "x":1, "y":3.375}, {"label":"L22", "x":2, "y":3.125}, {"label":"L23", "x":3, "y":3}, {"label":"L24", "x":4, "y":3.125}, {"label":"L25", "x":5, "y":3.25}, {"label":"L26", "x":6.5, "y":4.25}, {"label":"R20", "x":10.5, "y":4.25}, {"label":"R21", "x":12, "y":3.25}, {"label":"R22", "x":13, "y":3.125}, {"label":"R23", "x":14, "y":3}, {"label":"R24", "x":15, "y":3.125}, {"label":"R25", "x":16, "y":3.375}, {"label":"R26", "x":17, "y":3.375}, {"label":"L30", "x":0, "y":4.375}, {"label":"L31", "x":1, "y":4.375}, {"label":"L32", "x":2, "y":4.125}, {"label":"L33", "x":3, "y":4}, {"label":"L34", "x":5.5, "y":5.25}, {"label":"L35", "x":6.5, "y":5.25}, {"label":"L36", "x":7.5, "y":4.25, "h":2}, {"label":"R30", "x":9.5, "y":4.25, "h":2}, {"label":"R31", "x":10.5, "y":5.25}, {"label":"R32", "x":11.5, "y":5.25}, {"label":"R33", "x":14, "y":4}, {"label":"R34", "x":15, "y":4.125}, {"label":"R35", "x":16, "y":4.375}, {"label":"R36", "x":17, "y":4.375}] diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 07282cdad2..56fe46f52a 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -20,13 +20,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 0x0100 -#define MANUFACTURER Omkbd -#define PRODUCT ErgoDash - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index bb491b5f50..1d78f82bd7 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ErgoDash rev1.2", + "manufacturer": "Omkbd", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_4key": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index af8e6eb32b..33a4bcc8a2 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index c54fe46106..404fda2b92 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 3x6", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index 789dda45fd..44c54091e5 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index 1a5ac8221e..f19b5a2a1e 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 3x7", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index b1d1db1171..307916f645 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index d8e71f97e0..8e7ddf00ff 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 3x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index 12596acd9a..9b9d7a578a 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index 41ea3e0061..de912073ee 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 4x6", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index bbfdd383c0..74541c0d3f 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index 43876dd57e..2c587c38e6 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 4x7", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index 82e2dc7ee8..401ad2ddb6 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index 4502a86404..e955ea4178 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 4x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index d2f288546d..7c127c22e0 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index 02c65ec7cc..58c399e07b 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x6", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 815da24950..6348f10eb1 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3680 -#define PRODUCT_ID 0x5658 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index e8fb4c0927..eebbfe11fb 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x6+5x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0x3680", + "pid": "0x5658", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index 6bcbeeda54..9a1a0a4110 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index c60177d38c..d103c8949a 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x7", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index 29cfba78d1..c8a65dd171 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index 70e3cc7833..4556ae7520 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h index 008f6b753b..6d02623b21 100644 --- a/keyboards/omnikeyish/config.h +++ b/keyboards/omnikeyish/config.h @@ -4,13 +4,6 @@ #define KEYBOARD_PCB_REV 11 -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0666 -#define DEVICE_VER 0x1337 -#define MANUFACTURER Henrik O. Sørensen -#define PRODUCT Omnikey(-ish) Keyboard - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 23 diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json index 62a342d13e..e56e9dfa1a 100644 --- a/keyboards/omnikeyish/info.json +++ b/keyboards/omnikeyish/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Omnikey-(ish)", + "manufacturer": "Henrik O. Sørensen", "url": "https://github.com/henrikosorensen/keyboard_pcbs/tree/master/omnikeyish_pcb", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0666", + "device_version": "13.3.7" + }, "layouts": { "LAYOUT_all": { "layout": [ {"label":"P11", "x":0, "y":0}, {"label":"P12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"F1", "x":4.6667, "y":0}, {"label":"F2", "x":5.6667, "y":0}, {"label":"F3", "x":6.6667, "y":0}, {"label":"F4", "x":7.6667, "y":0}, {"label":"F5", "x":9.1667, "y":0}, {"label":"F6", "x":10.1667, "y":0}, {"label":"F7", "x":11.1667, "y":0}, {"label":"F8", "x":12.1667, "y":0}, {"label":"F9", "x":13.6667, "y":0}, {"label":"F10", "x":14.6667, "y":0}, {"label":"F11", "x":15.6667, "y":0}, {"label":"F12", "x":16.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0}, {"x":21.6667, "y":0}, {"x":22.6667, "y":0}, {"x":23.6667, "y":0}, {"x":24.6667, "y":0}, diff --git a/keyboards/onekeyco/dango40/config.h b/keyboards/onekeyco/dango40/config.h index fceb8fb252..8ab7a5b183 100644 --- a/keyboards/onekeyco/dango40/config.h +++ b/keyboards/onekeyco/dango40/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE9B9 -#define DEVICE_VER 0x0001 -#define MANUFACTURER One Key Company -#define PRODUCT Dango40 /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/onekeyco/dango40/info.json b/keyboards/onekeyco/dango40/info.json index e26e92697b..4305346827 100644 --- a/keyboards/onekeyco/dango40/info.json +++ b/keyboards/onekeyco/dango40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dango40", + "manufacturer": "One Key Company", "url": "https://github.com/swiftrax", "maintainer": "Swiftrax", + "usb": { + "vid": "0x04D8", + "pid": "0xE9B9", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h index 2ebaeb3e73..4a867334f9 100644 --- a/keyboards/orange75/config.h +++ b/keyboards/orange75/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEEB -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Fox-Lab -#define PRODUCT Orange75 - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 6 diff --git a/keyboards/orange75/info.json b/keyboards/orange75/info.json index 3cfd040d0f..1fe4752635 100644 --- a/keyboards/orange75/info.json +++ b/keyboards/orange75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Orange75", + "manufacturer": "Fox-Lab", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEEB", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index 42dbb83169..6f151c2f1c 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/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 大橘子外设 (Large orange peripherals) -#define PRODUCT Org60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index 2327468632..a889730258 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Org60", + "manufacturer": "大橘子外设 (Large orange peripherals)", "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":"K0C", "x":12, "y":0}, {"label":"K0D", "x":13, "y":0}, {"label":"K49", "x":14, "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}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K1D", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2}, {"label":"K2D", "x":13.75, "y":2, "w":1.25}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}, {"label":"K34", "x":4, "y":3}, {"label":"K35", "x":5, "y":3}, {"label":"K36", "x":6, "y":3}, {"label":"K37", "x":7, "y":3}, {"label":"K38", "x":8, "y":3}, {"label":"K39", "x":9, "y":3}, {"label":"K3A", "x":10, "y":3}, {"label":"K3B", "x":11, "y":3}, {"label":"K47", "x":12, "y":3}, {"label":"K3D", "x":13, "y":3}, {"label":"K3C", "x":14, "y":3}, {"label":"K40", "x":0, "y":4, "w":1.25}, {"label":"K41", "x":1.25, "y":4, "w":1.25}, {"label":"K42", "x":2.5, "y":4, "w":1.25}, {"label":"K45", "x":3.75, "y":4, "w":6.25}, {"label":"K4A", "x":10, "y":4}, {"label":"K4B", "x":11, "y":4}, {"label":"K48", "x":12, "y":4}, {"label":"K4C", "x":13, "y":4}, {"label":"K4D", "x":14, "y":4}] diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h index 61719eb295..2254999b02 100644 --- a/keyboards/ortho5by12/config.h +++ b/keyboards/ortho5by12/config.h @@ -16,15 +16,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -/* VID & PID from vusb project, see tmk_core/protocol/vusb/USB-IDs-for-free.txt"*/ -// These VID/PID is not verified. Use at your own risk. -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0002 -#define MANUFACTURER /u/squeezeonein -#define PRODUCT ortho5by12 - /* key matrix size, duplex 10x6 */ #define MATRIX_ROWS 10 #define MATRIX_COLS 6 diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json index 56a4a09372..5bda0d68fb 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ortho5by12", + "manufacturer": "/u/squeezeonein", "url": "https://github.com/itsnoteasy/misc/blob/master/ortho5by12.zip", "maintainer": "itsnoteasy", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_ortho_5x12_1x2uC": { "layout": [ diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h index e548fe1d4e..9bab689618 100644 --- a/keyboards/orthocode/config.h +++ b/keyboards/orthocode/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x3415 // orthocodekb.com -#define PRODUCT_ID 0x0001 // orthocode -#define DEVICE_VER 0x0001 -#define MANUFACTURER Jrodna -#define PRODUCT OrthoCode - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json index c193ab44f9..92058b2654 100644 --- a/keyboards/orthocode/info.json +++ b/keyboards/orthocode/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "OrthoCode", + "manufacturer": "Jrodna", "url": "https://github.com/Jrodna/OrthoCode", "maintainer": "Jrodna", + "usb": { + "vid": "0x3415", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h index db45e2d75d..1f536aa6f6 100644 --- a/keyboards/orthodox/rev1/config.h +++ b/keyboards/orthodox/rev1/config.h @@ -23,13 +23,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER deductivemonkee -#define PRODUCT Monkeebs Orthodox Rev.1 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json index 49ca9b31b8..d539fc8be2 100644 --- a/keyboards/orthodox/rev1/info.json +++ b/keyboards/orthodox/rev1/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Monkeebs Orthodox Rev.1", + "manufacturer": "deductivemonkee", "maintainer": "drashna", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h index 678a3603f1..b69aa4b109 100644 --- a/keyboards/orthodox/rev3/config.h +++ b/keyboards/orthodox/rev3/config.h @@ -23,13 +23,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER deductivemonkee -#define PRODUCT Monkeebs Orthodox Rev.3 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json index 309769c626..6769fe7a30 100644 --- a/keyboards/orthodox/rev3/info.json +++ b/keyboards/orthodox/rev3/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Monkeebs Orthodox Rev.3", + "manufacturer": "deductivemonkee", "maintainer": "drashna", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/orthodox/rev3_teensy/config.h b/keyboards/orthodox/rev3_teensy/config.h index d21d50e579..5cd92b005c 100644 --- a/keyboards/orthodox/rev3_teensy/config.h +++ b/keyboards/orthodox/rev3_teensy/config.h @@ -23,13 +23,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER deductivemonkee -#define PRODUCT Monkeebs Orthodox Rev.3 (Teensy) - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json index a89c370396..91a73c5cb3 100644 --- a/keyboards/orthodox/rev3_teensy/info.json +++ b/keyboards/orthodox/rev3_teensy/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Monkeebs Orthodox Rev.3 (Teensy)", + "manufacturer": "deductivemonkee", "maintainer": "drashna", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h index eb2998de7a..54aa5978e2 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/config.h +++ b/keyboards/owlab/jelly_epoch/hotswap/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter*/ -#define VENDOR_ID 0x4F53 //0x4F53 OS for owl studio -#define PRODUCT_ID 0x4A4C //0x4A4C JL for jelly, 0x4A53 JS for jelly solder -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Jelly Epoch - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json index 01af496bb2..c5ee4ff522 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "jelly epoch", + "keyboard_name": "Jelly Epoch Hotswap", + "manufacturer": "OwLab", "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer", "maintainer": "Owlab", + "usb": { + "vid": "0x4F53", + "pid": "0x4A4C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h index cd27b71dd4..54aa5978e2 100644 --- a/keyboards/owlab/jelly_epoch/soldered/config.h +++ b/keyboards/owlab/jelly_epoch/soldered/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter*/ -#define VENDOR_ID 0x4F53 //0x4F53 OS for owl studio -#define PRODUCT_ID 0x4A53 //0x4A4C JL for jelly, 0x4A53 JS for jelly solder -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Jelly Epoch - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json index 357634b481..59358ae99f 100644 --- a/keyboards/owlab/jelly_epoch/soldered/info.json +++ b/keyboards/owlab/jelly_epoch/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "jelly", + "keyboard_name": "Jelly Epoch Soldered", + "manufacturer": "OwLab", "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer", "maintainer": "Owlab", + "usb": { + "vid": "0x4F53", + "pid": "0x4A53", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h index d4eef1e021..8b2f9b6340 100644 --- a/keyboards/owlab/spring/config.h +++ b/keyboards/owlab/spring/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F53 //0x4F53 for OwLab -#define PRODUCT_ID 0x5350 //0x514B SP for Spring -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Spring - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index bbeee6628b..2664c4ba3c 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Spring", + "manufacturer": "OwLab", "url": "", "maintainer": "OwLab", + "usb": { + "vid": "0x4F53", + "pid": "0x5350", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_spring": { "layout": [ diff --git a/keyboards/owlab/suit80/ansi/config.h b/keyboards/owlab/suit80/ansi/config.h index 02c44da212..46cc4d82f7 100644 --- a/keyboards/owlab/suit80/ansi/config.h +++ b/keyboards/owlab/suit80/ansi/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F53 //0x4F53 OS for owl studio -#define PRODUCT_ID 0x5355 //0x5355 SU for SUIT -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT SUIT80 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json index b5833c6a60..bdfaccacb8 100644 --- a/keyboards/owlab/suit80/ansi/info.json +++ b/keyboards/owlab/suit80/ansi/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "suit80", + "keyboard_name": "Suit80 ANSI", + "manufacturer": "OwLab", "url": "", "maintainer": "Owlab", + "usb": { + "vid": "0x4F53", + "pid": "0x5355", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/owlab/suit80/iso/config.h b/keyboards/owlab/suit80/iso/config.h index 22968bac15..9aa3f00fb7 100644 --- a/keyboards/owlab/suit80/iso/config.h +++ b/keyboards/owlab/suit80/iso/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F53 // 0x4F53 OS for owl studio -#define PRODUCT_ID 0x5349 //0x5355 SI for SUIT ISO -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT SUIT80 ISO - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json index 7c911fe361..0818212330 100644 --- a/keyboards/owlab/suit80/iso/info.json +++ b/keyboards/owlab/suit80/iso/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "suit80", + "keyboard_name": "Suit80 ISO", + "manufacturer": "OwLab", "url": "", "maintainer": "Owlab", + "usb": { + "vid": "0x4F53", + "pid": "0x5349", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h index 42f97036b3..507b1f75e2 100644 --- a/keyboards/owlab/voice65/hotswap/config.h +++ b/keyboards/owlab/voice65/hotswap/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F53 -#define PRODUCT_ID 0x564F -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Voice65 Hotswap - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json index 0481d1acea..006d87749a 100644 --- a/keyboards/owlab/voice65/hotswap/info.json +++ b/keyboards/owlab/voice65/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "voice65 hotswap", + "keyboard_name": "Voice65 Hotswap", + "manufacturer": "OwLab", "url": "https://www.popkeyboard.com/products/67968vn00mzx", "maintainer": "kb-elmo", + "usb": { + "vid": "0x4F53", + "pid": "0x564F", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h index f0c68dc25b..74ab2db520 100644 --- a/keyboards/owlab/voice65/soldered/config.h +++ b/keyboards/owlab/voice65/soldered/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F53 -#define PRODUCT_ID 0x5657 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Voice65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json index ce33ffc083..7412c89546 100644 --- a/keyboards/owlab/voice65/soldered/info.json +++ b/keyboards/owlab/voice65/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "voice65 soldered", + "keyboard_name": "Voice65 Soldered", + "manufacturer": "OwLab", "url": "https://www.popkeyboard.com/products/67968vn00mzx", "maintainer": "kb-elmo", + "usb": { + "vid": "0x4F53", + "pid": "0x5657", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.3