diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
| commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
| tree | 1258cf3619698326cbbd4f28bd3ee502517821fb | |
| parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
| parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) | |
| download | qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip | |
Merge remote-tracking branch 'upstream/master' into develop
550 files changed, 1689 insertions, 1819 deletions
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index b7f754c3de..a3fd5a0fa7 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -18,19 +18,9 @@ #include "config_common.h" -#define VENDOR_ID 0x4A4B -#define PRODUCT_ID 0xEF6A -#define DEVICE_VER 0x0001 -#define MANUFACTURER JadooKB -#define PRODUCT JKB65 RGB - #define MATRIX_ROWS 5 #define MATRIX_COLS 16 -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 } - - #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN F0 diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index 8bb0ab7524..394b53027a 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "jkb65", + "manufacturer": "JadooKB", "url": "https://jadookb.com/", "maintainer": "Wizard-GG", + "usb": { + "vid": "0x4A4B", + "pid": "0xEF6A" + }, "layouts": { "LAYOUT_67_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":"~", "x":15, "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, "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":"PgUp", "x":15, "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}, {"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}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "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":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/jadookb/jkb65/r1/config.h b/keyboards/jadookb/jkb65/r1/config.h new file mode 100644 index 0000000000..78f13414c9 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/config.h @@ -0,0 +1,20 @@ + /* Copyright 2022 Wizad-GG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } +#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/info.json new file mode 100644 index 0000000000..4bfe3aa763 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "JKB65 RGB R1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/jadookb/jkb65/r1/rules.mk b/keyboards/jadookb/jkb65/r1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/rules.mk diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h index a0039001a8..5db93f75cb 100644 --- a/keyboards/jadookb/jkb65/r2/config.h +++ b/keyboards/jadookb/jkb65/r2/config.h @@ -16,12 +16,5 @@ #pragma once -#undef DEVICE_VER -#define DEVICE_VER 0x0002 - -#undef PRODUCT -#define PRODUCT JKB65 RGB R2 - - -#undef MATRIX_COL_PINS +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } #define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/info.json new file mode 100644 index 0000000000..8a23a21d5f --- /dev/null +++ b/keyboards/jadookb/jkb65/r2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "JKB65 RGB R2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/jadookb/jkb65/r2/rules.mk b/keyboards/jadookb/jkb65/r2/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/jadookb/jkb65/r2/rules.mk diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk index 239ea39a74..f230e8ae9f 100644 --- a/keyboards/jadookb/jkb65/rules.mk +++ b/keyboards/jadookb/jkb65/rules.mk @@ -19,3 +19,5 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes + +DEFAULT_FOLDER = jadookb/jkb65/r1 diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h index ebcda62f44..055568b06c 100644 --- a/keyboards/jian/handwired/config.h +++ b/keyboards/jian/handwired/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0010 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Huma - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 4 diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json new file mode 100644 index 0000000000..120c6c4a24 --- /dev/null +++ b/keyboards/jian/handwired/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Huma", + "usb": { + "device_version": "0.1.0" + } +} diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json index e9c875e792..2e59944921 100644 --- a/keyboards/jian/info.json +++ b/keyboards/jian/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "jian", + "manufacturer": "KgOfHedgehogs", "url": "t.me/s/kgofhedgehogs", "maintainer": "KGOH", + "usb": { + "vid": "0xC0DE", + "pid": "0x1337" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 7a2cabeb4c..6b36049f94 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0210 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Huma - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json new file mode 100644 index 0000000000..06fbfeb833 --- /dev/null +++ b/keyboards/jian/nsrev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Huma", + "usb": { + "device_version": "2.1.0" + } +} diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 5758115035..988b6d5176 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0100 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Jian - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json new file mode 100644 index 0000000000..32540b3f78 --- /dev/null +++ b/keyboards/jian/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Jian", + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index ec3c206d46..52c8b6ad0e 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0DE -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0200 -#define MANUFACTURER KgOfHedgehogs -#define PRODUCT Jian - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json new file mode 100644 index 0000000000..db130bf467 --- /dev/null +++ b/keyboards/jian/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Jian", + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 89f1ce29e9..81483f04cc 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,14 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4753 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER joric -#define PRODUCT Jorne Keyboard - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/jorne/info.json b/keyboards/jorne/rev1/info.json index a28af0a320..9e0cf7be41 100644 --- a/keyboards/jorne/info.json +++ b/keyboards/jorne/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Jorne", + "manufacturer": "joric", "url": "https://github.com/joric/jorne/wiki", "maintainer": "joric", + "usb": { + "vid": "0x4753", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h index 23f64f5376..ae74b25e1a 100644 --- a/keyboards/kakunpc/angel17/alpha/config.h +++ b/keyboards/kakunpc/angel17/alpha/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT angel17 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json index 24a6c6be08..f3532f8fb6 100644 --- a/keyboards/kakunpc/angel17/info.json +++ b/keyboards/kakunpc/angel17/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "angel17", + "manufacturer": "kakunpc", "url": "https://kakunpc.booth.pm/", "maintainer": "kakunpc", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h index f3ee158546..0d5f8d597f 100644 --- a/keyboards/kakunpc/angel17/rev1/config.h +++ b/keyboards/kakunpc/angel17/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT angel17 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h index df5a855671..b58b370e66 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/config.h +++ b/keyboards/kakunpc/suihankey/split/alpha/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT Suihankey - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 2f40949f6b..c440c905fa 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "suihankey_split", + "keyboard_name": "Suihankey", + "manufacturer": "kakunpc", "url": "https://kakunpc.booth.pm/", "maintainer": "kakunpc", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h index 097a80a39d..14b5b2ad9d 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/config.h +++ b/keyboards/kakunpc/suihankey/split/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kakunpc -#define PRODUCT Suihankey - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 4 diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h index 2b7d6e363a..5b36ee1113 100644 --- a/keyboards/kapcave/paladinpad/config.h +++ b/keyboards/kapcave/paladinpad/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B43 -#define PRODUCT_ID 0x5050 -#define MANUFACTURER KapCave -#define PRODUCT paladinpad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index 7d1afccf60..23aacf4456 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "PaladinPad", + "manufacturer": "KapCave", "url": "https://kapcave.com/products/paladinpad-pcb", "maintainer": "nachie", + "usb": { + "vid": "0x4B43", + "pid": "0x5050" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/kapcave/paladinpad/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/kapcave/paladinpad/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h index 4984459275..ef6e5449f6 100644 --- a/keyboards/kapl/rev1/config.h +++ b/keyboards/kapl/rev1/config.h @@ -2,14 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C41 // "LA" Lozyuk Alexander -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER keyzog -#define PRODUCT Kapl Keyboard - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 10 diff --git a/keyboards/kapl/info.json b/keyboards/kapl/rev1/info.json index 67e5470288..2b497b9848 100644 --- a/keyboards/kapl/info.json +++ b/keyboards/kapl/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kapl", + "manufacturer": "keyzog", "url": "https://github.com/keyzog/kapl", "maintainer": "keyzog", + "usb": { + "vid": "0x4C41", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json index 7010ba59d9..34e29bca8e 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "kbd67mkiirgb", + "manufacturer": "KBDfans", "url": "", "maintainer": "moyi4681", + "usb": { + "vid": "0x4B42" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "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":15, "y":0}, {"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":15, "y":1}, {"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":15, "y":2}, {"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":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h index d88d384f98..a6a56cdced 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h @@ -1,10 +1,5 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0x4B42 // KB -#define PRODUCT_ID 0x1224 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDfans -#define PRODUCT kbd67mkiirgb v1 #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json new file mode 100644 index 0000000000..88d1bb38f4 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v1", + "usb": { + "pid": "0x1224", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h index ffdace7a5f..a5dfdae5ed 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h @@ -1,10 +1,5 @@ #pragma once #include "config_common.h" -#define VENDOR_ID 0x4B42 // KB -#define PRODUCT_ID 0x1225 -#define DEVICE_VER 0x0002 -#define MANUFACTURER KBDfans -#define PRODUCT kbd67mkiirgb v2 #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json new file mode 100644 index 0000000000..62f1bf6cbb --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v2", + "usb": { + "pid": "0x1225", + "device_version": "0.0.2" + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h index b2b4ec3ce6..cb847e9b45 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 // KB -#define PRODUCT_ID 0x1226 -#define DEVICE_VER 0x0002 -#define MANUFACTURER KBDfans -#define PRODUCT kbd67mkiirgb v3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json new file mode 100644 index 0000000000..496016ea8c --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v3", + "usb": { + "pid": "0x1226", + "device_version": "0.0.3" + } +} diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index b6311715fd..f7e0e06278 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 -#define PRODUCT_ID 0x1227 -#define DEVICE_VER 0x0004 -#define MANUFACTURER KBDFANS -#define PRODUCT KBD67 MKII RGB V4 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json new file mode 100644 index 0000000000..1bb937c0c2 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "kbd67mkiirgb v4", + "usb": { + "pid": "0x1227", + "device_version": "0.0.4" + } +} diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index ae8a1ee478..a743691e70 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -5,11 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 -#define MANUFACTURER qmkbuilder -#define PRODUCT KBD75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/kbdfans/kbd75/rev1/config.h b/keyboards/kbdfans/kbd75/rev1/config.h deleted file mode 100644 index 9e036b5839..0000000000 --- a/keyboards/kbdfans/kbd75/rev1/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2020 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index 499b9e9a43..fe1541b78f 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "KBD75 rev1", + "manufacturer": "KBDfans", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4B42", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev2/config.h b/keyboards/kbdfans/kbd75/rev2/config.h deleted file mode 100644 index c65ac48677..0000000000 --- a/keyboards/kbdfans/kbd75/rev2/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2020 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define PRODUCT_ID 0x6061 -#define DEVICE_VER 0x0002 diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 8518527eed..ac07971b59 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "KBD75 rev2", + "manufacturer": "KBDfans", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4B42", + "pid": "0x6061", + "device_version": "0.0.2" + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index 85ad8150da..eff9c8eae1 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B42 -#define PRODUCT_ID 0x6063 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDFANS -#define PRODUCT KBD75RGB - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json new file mode 100644 index 0000000000..4c008f0310 --- /dev/null +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "KBD75RGB", + "manufacturer": "KBDfans", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4B42", + "pid": "0x6063", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h index be555417d7..d2b6b5712b 100644 --- a/keyboards/kbnordic/nordic60/rev_a/config.h +++ b/keyboards/kbnordic/nordic60/rev_a/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4445 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBNORDIC -#define PRODUCT Nordic60 Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/kbnordic/nordic60/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json index aa5a82a002..99d8fe874c 100644 --- a/keyboards/kbnordic/nordic60/info.json +++ b/keyboards/kbnordic/nordic60/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Nordic60 Rev A", + "manufacturer": "KBNORDIC", "url": "kbnordic.se", "maintainer": "4pplet", + "usb": { + "vid": "0x4445", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/keebio/bdn9/info.json b/keyboards/keebio/bdn9/info.json index e383395eea..4bb378ea7a 100644 --- a/keyboards/keebio/bdn9/info.json +++ b/keyboards/keebio/bdn9/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Keebio BDN9", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h index ed5d5953f7..a674477d99 100644 --- a/keyboards/keebio/bdn9/rev1/config.h +++ b/keyboards/keebio/bdn9/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1133 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT BDN9 Rev. 1 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json new file mode 100644 index 0000000000..768ad3ad9b --- /dev/null +++ b/keyboards/keebio/bdn9/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDN9 Rev. 1", + "usb": { + "pid": "0x1133", + "device_version": "1.0.0" + } +} diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h index f9eb3babca..56d6235ec9 100644 --- a/keyboards/keebio/bdn9/rev2/config.h +++ b/keyboards/keebio/bdn9/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2133 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT BDN9 Rev. 2 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json new file mode 100644 index 0000000000..2a610ba304 --- /dev/null +++ b/keyboards/keebio/bdn9/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDN9 Rev. 2", + "usb": { + "pid": "0x2133", + "device_version": "2.0.0" + } +} diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h index 753af5ce2f..88dec69f59 100644 --- a/keyboards/keebio/dsp40/rev1/config.h +++ b/keyboards/keebio/dsp40/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x144C -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT DSP40 Rev. 1 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/keebio/dsp40/info.json b/keyboards/keebio/dsp40/rev1/info.json index e595a4d2a6..3d5ce68f5f 100644 --- a/keyboards/keebio/dsp40/info.json +++ b/keyboards/keebio/dsp40/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DSP40", + "keyboard_name": "DSP40 Rev. 1", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x144C", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h index ab4751f1f3..7985c3eb42 100644 --- a/keyboards/keebio/foldkb/rev1/config.h +++ b/keyboards/keebio/foldkb/rev1/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1258 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT FoldKB Rev. 1 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/foldkb/info.json b/keyboards/keebio/foldkb/rev1/info.json index e94389ef4e..da06fadac1 100644 --- a/keyboards/keebio/foldkb/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "FoldKB", + "keyboard_name": "FoldKB Rev. 1", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1258", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json index ec52ef04d1..8641eed9c1 100644 --- a/keyboards/keebio/iris/info.json +++ b/keyboards/keebio/iris/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Iris", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h index c1d39cfbe7..6e0e720175 100644 --- a/keyboards/keebio/iris/rev1/config.h +++ b/keyboards/keebio/iris/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1256 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Iris Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json new file mode 100644 index 0000000000..414db5ad6a --- /dev/null +++ b/keyboards/keebio/iris/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 1", + "usb": { + "pid": "0x1256", + "device_version": "1.0.0" + } +} diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h index 02bc73021c..2d88d72ac9 100644 --- a/keyboards/keebio/iris/rev1_led/config.h +++ b/keyboards/keebio/iris/rev1_led/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1256 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Iris Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json new file mode 100644 index 0000000000..38b09bbe35 --- /dev/null +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 1", + "usb": { + "pid": "0x1256", + "device_version": "1.1.0" + } +} diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h index 793d653c0b..0c795940cd 100644 --- a/keyboards/keebio/iris/rev2/config.h +++ b/keyboards/keebio/iris/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2256 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT Keebio Iris Rev. 2 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json new file mode 100644 index 0000000000..dd223d4f94 --- /dev/null +++ b/keyboards/keebio/iris/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 2", + "usb": { + "pid": "0x2256", + "device_version": "2.0.0" + } +} diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h index 921627382c..e08660612d 100644 --- a/keyboards/keebio/iris/rev3/config.h +++ b/keyboards/keebio/iris/rev3/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1256 -#define DEVICE_VER 0x0300 -#define MANUFACTURER Keebio -#define PRODUCT Keebio Iris Rev. 3 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json new file mode 100644 index 0000000000..af6215b201 --- /dev/null +++ b/keyboards/keebio/iris/rev3/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 3", + "usb": { + "pid": "0x3256", + "device_version": "3.0.0" + } +} diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h index 0ad59b9774..0af962ac52 100644 --- a/keyboards/keebio/iris/rev4/config.h +++ b/keyboards/keebio/iris/rev4/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x4256 -#define DEVICE_VER 0x0400 -#define MANUFACTURER Keebio -#define PRODUCT Keebio Iris Rev. 4 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json new file mode 100644 index 0000000000..aa42788154 --- /dev/null +++ b/keyboards/keebio/iris/rev4/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 4", + "usb": { + "pid": "0x4256", + "device_version": "4.0.0" + } +} diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h index 15eed8349f..2d06626486 100644 --- a/keyboards/keebio/iris/rev5/config.h +++ b/keyboards/keebio/iris/rev5/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x5256 -#define DEVICE_VER 0x0500 -#define MANUFACTURER Keebio -#define PRODUCT Iris Rev. 5 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json new file mode 100644 index 0000000000..60a73d4252 --- /dev/null +++ b/keyboards/keebio/iris/rev5/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 5", + "usb": { + "pid": "0x5256", + "device_version": "5.0.0" + } +} diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h index e26dc5fa50..7bc8c4132b 100644 --- a/keyboards/keebio/iris/rev6/config.h +++ b/keyboards/keebio/iris/rev6/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x6256 -#define DEVICE_VER 0x0600 -#define MANUFACTURER Keebio -#define PRODUCT Iris Rev. 6 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json new file mode 100644 index 0000000000..86dc585c81 --- /dev/null +++ b/keyboards/keebio/iris/rev6/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 6", + "usb": { + "pid": "0x6256", + "device_version": "6.0.0" + } +} diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index d846891d92..71ba638852 100644 --- a/keyboards/keebio/iris/rev6a/config.h +++ b/keyboards/keebio/iris/rev6a/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x6356 -#define DEVICE_VER 0x0610 -#define MANUFACTURER Keebio -#define PRODUCT Iris Rev. 6a - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json new file mode 100644 index 0000000000..c580018ea7 --- /dev/null +++ b/keyboards/keebio/iris/rev6a/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 6a", + "usb": { + "pid": "0x6356", + "device_version": "6.1.0" + } +} diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h index 118a641240..8673d83a07 100644 --- a/keyboards/keebio/iris/rev7/config.h +++ b/keyboards/keebio/iris/rev7/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x7256 -#define DEVICE_VER 0x0700 -#define MANUFACTURER Keebio -#define PRODUCT Iris Rev. 7 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json new file mode 100644 index 0000000000..b0ba3ca359 --- /dev/null +++ b/keyboards/keebio/iris/rev7/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 7", + "usb": { + "pid": "0x7256", + "device_version": "7.0.0" + } +} diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h index 5d065fe1c2..3d3253d2c3 100644 --- a/keyboards/keebio/kbo5000/rev1/config.h +++ b/keyboards/keebio/kbo5000/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x126A -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT KBO-5000 Rev. 1 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/keebio/kbo5000/info.json b/keyboards/keebio/kbo5000/rev1/info.json index f4d37e012d..b07e73f17e 100644 --- a/keyboards/keebio/kbo5000/info.json +++ b/keyboards/keebio/kbo5000/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KBO-5000", + "keyboard_name": "KBO-5000 Rev. 1", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x126A", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json index 1d98ca9f4e..7a21ac0efa 100644 --- a/keyboards/keebio/levinson/info.json +++ b/keyboards/keebio/levinson/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "Levinson", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "Keebio", + "usb": { + "vid": "0xCB10" + }, "layouts": { "LAYOUT": { "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h index 2b10dcec0c..59781590d7 100644 --- a/keyboards/keebio/levinson/rev1/config.h +++ b/keyboards/keebio/levinson/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1146 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Levinson - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json new file mode 100644 index 0000000000..cd51368b09 --- /dev/null +++ b/keyboards/keebio/levinson/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Levinson Rev. 1", + "usb": { + "pid": "0x1146", + "device_version": "1.0.0" + } +} diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h index c993861b82..01c901c234 100644 --- a/keyboards/keebio/levinson/rev2/config.h +++ b/keyboards/keebio/levinson/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2146 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT Levinson - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json new file mode 100644 index 0000000000..ec18ce1898 --- /dev/null +++ b/keyboards/keebio/levinson/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Levinson Rev. 2", + "usb": { + "pid": "0x2146", + "device_version": "2.0.0" + } +} diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h index 60e6c150f5..a5144ec9fb 100644 --- a/keyboards/keebio/levinson/rev3/config.h +++ b/keyboards/keebio/levinson/rev3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x3146 -#define DEVICE_VER 0x0300 -#define MANUFACTURER Keebio -#define PRODUCT Levinson - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json new file mode 100644 index 0000000000..c814ce24e3 --- /dev/null +++ b/keyboards/keebio/levinson/rev3/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Levinson Rev. 3", + "usb": { + "pid": "0x3146", + "device_version": "3.0.0" + } +} diff --git a/keyboards/keebio/nyquist/info.json b/keyboards/keebio/nyquist/info.json index 43561a553f..449c779b69 100644 --- a/keyboards/keebio/nyquist/info.json +++ b/keyboards/keebio/nyquist/info.json @@ -1,6 +1,9 @@ { - "keyboard_name": "Nyquist", + "manufacturer": "Keebio", "maintainer": "qmk", + "usb": { + "vid": "0xCB10" + }, "layouts": { "LAYOUT": { "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}] diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h index 47622ba1e9..02d5a0510e 100644 --- a/keyboards/keebio/nyquist/rev1/config.h +++ b/keyboards/keebio/nyquist/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1156 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT The Nyquist Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json new file mode 100644 index 0000000000..76affd233c --- /dev/null +++ b/keyboards/keebio/nyquist/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Nyquist Rev. 1", + "usb": { + "pid": "0x1156", + "device_version": "1.0.0" + } +} diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h index e47110b8a5..82f4778992 100644 --- a/keyboards/keebio/nyquist/rev2/config.h +++ b/keyboards/keebio/nyquist/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2156 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT The Nyquist Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json new file mode 100644 index 0000000000..579fa5acb2 --- /dev/null +++ b/keyboards/keebio/nyquist/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Nyquist Rev. 2", + "usb": { + "pid": "0x2156", + "device_version": "2.0.0" + } +} diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h index 3536f5c629..8d70316b55 100644 --- a/keyboards/keebio/nyquist/rev3/config.h +++ b/keyboards/keebio/nyquist/rev3/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x3156 -#define DEVICE_VER 0x0300 -#define MANUFACTURER Keebio -#define PRODUCT The Nyquist Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json new file mode 100644 index 0000000000..1de3fe17c5 --- /dev/null +++ b/keyboards/keebio/nyquist/rev3/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Nyquist Rev. 3", + "usb": { + "pid": "0x3156", + "device_version": "3.0.0" + } +} diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h index fa93d82de0..77db35cc9b 100644 --- a/keyboards/keebio/rorschach/rev1/config.h +++ b/keyboards/keebio/rorschach/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1246 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Rorschach Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/rorschach/info.json b/keyboards/keebio/rorschach/rev1/info.json index 9675f96b8a..8e04c211dd 100644 --- a/keyboards/keebio/rorschach/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rorschach", + "keyboard_name": "Rorschach Rev. 1", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10", + "pid": "0x1246", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json index 9b89484bba..a8d346ebe5 100644 --- a/keyboards/keebio/sinc/info.json +++ b/keyboards/keebio/sinc/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Sinc", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10" + }, "layouts": { "LAYOUT_75": { "layout": [ diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h index 92a9eb5675..0d31d1ad80 100644 --- a/keyboards/keebio/sinc/rev1/config.h +++ b/keyboards/keebio/sinc/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1267 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT Sinc Rev. 1 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json new file mode 100644 index 0000000000..d7a119807f --- /dev/null +++ b/keyboards/keebio/sinc/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Sinc Rev. 1", + "usb": { + "pid": "0x1267", + "device_version": "1.0.0" + } +} diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h index d78e0316f3..800400e905 100644 --- a/keyboards/keebio/sinc/rev2/config.h +++ b/keyboards/keebio/sinc/rev2/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2267 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT Sinc Rev. 2 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 12 diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json new file mode 100644 index 0000000000..378b02d2e7 --- /dev/null +++ b/keyboards/keebio/sinc/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Sinc Rev. 2", + "usb": { + "pid": "0x2267", + "device_version": "2.0.0" + } +} diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json index f28a7410d1..1c42bd8f87 100644 --- a/keyboards/keebio/viterbi/info.json +++ b/keyboards/keebio/viterbi/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Viterbi", + "manufacturer": "Keebio", "url": "https://keeb.io", "maintainer": "nooges", + "usb": { + "vid": "0xCB10" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h index 15dea932f3..5aa5ef234c 100644 --- a/keyboards/keebio/viterbi/rev1/config.h +++ b/keyboards/keebio/viterbi/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x1157 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keebio -#define PRODUCT The Viterbi Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json new file mode 100644 index 0000000000..5801f5f638 --- /dev/null +++ b/keyboards/keebio/viterbi/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Viterbi Rev. 1", + "usb": { + "pid": "0x1157", + "device_version": "1.0.0" + } +} diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h index ed4f87abab..9d87517c0a 100644 --- a/keyboards/keebio/viterbi/rev2/config.h +++ b/keyboards/keebio/viterbi/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x2157 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Keebio -#define PRODUCT The Viterbi Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json new file mode 100644 index 0000000000..9759016521 --- /dev/null +++ b/keyboards/keebio/viterbi/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Viterbi Rev. 2", + "usb": { + "pid": "0x2157", + "device_version": "2.0.0" + } +} diff --git a/keyboards/keycapsss/kimiko/kimiko.h b/keyboards/keycapsss/kimiko/kimiko.h index a67496eb50..513922373e 100644 --- a/keyboards/keycapsss/kimiko/kimiko.h +++ b/keyboards/keycapsss/kimiko/kimiko.h @@ -16,24 +16,3 @@ #pragma once #include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L40, R40, R30, R31, R32, R33, R34, R35, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L41, L42, L43, L44, L45, L40 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } - diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 502eaa1e4a..5ba2fd4abf 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7983 -#define PRODUCT_ID 0x4B69 //Ki -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keycapsss -#define PRODUCT Kimiko - /* key matrix size */ // rows are doubled-up for split-keyboard #define MATRIX_ROWS 10 diff --git a/keyboards/keycapsss/kimiko/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index 7b3749f503..2aef1306ec 100644 --- a/keyboards/keycapsss/kimiko/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kimiko", + "manufacturer": "Keycapsss", "url": "https://keycapsss.com", "maintainer": "@ben_roe Keycapsss", + "usb": { + "vid": "0x7983", + "pid": "0x4B69", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h index 373d3de14f..fd9c63f339 100644 --- a/keyboards/keycapsss/plaid_pad/config.h +++ b/keyboards/keycapsss/plaid_pad/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7983 -#define PRODUCT_ID 0x5050 // "PP" -#define MANUFACTURER Keycapsss - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 1ccac5d2cc..c223b88065 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Plaid-Pad", + "manufacturer": "Keycapsss", "url": "https://keycapsss.com/diy-kits/104/plaid-pad-4x4-numpad", "maintainer": "BenRoe", + "usb": { + "vid": "0x7983", + "pid": "0x5050" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/keycapsss/plaid_pad/rev1/config.h b/keyboards/keycapsss/plaid_pad/rev1/config.h index 1178c7f7e3..5956835a0b 100644 --- a/keyboards/keycapsss/plaid_pad/rev1/config.h +++ b/keyboards/keycapsss/plaid_pad/rev1/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT Plaid-Pad Rev1 -#define DEVICE_VER 0x0001 - - #define ENCODERS_PAD_A { D1, B2 } #define ENCODERS_PAD_B { D0, B1 } diff --git a/keyboards/keycapsss/plaid_pad/rev1/info.json b/keyboards/keycapsss/plaid_pad/rev1/info.json new file mode 100644 index 0000000000..3d98c4cb57 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Plaid-Pad Rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/keycapsss/plaid_pad/rev2/config.h b/keyboards/keycapsss/plaid_pad/rev2/config.h index aaa954271e..efb2609edd 100644 --- a/keyboards/keycapsss/plaid_pad/rev2/config.h +++ b/keyboards/keycapsss/plaid_pad/rev2/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT Plaid-Pad Rev2 -#define DEVICE_VER 0x0002 - - #define ENCODERS_PAD_A { D1, B2, B4, D4 } #define ENCODERS_PAD_B { D0, B1, B3, B5 } diff --git a/keyboards/keycapsss/plaid_pad/rev2/info.json b/keyboards/keycapsss/plaid_pad/rev2/info.json new file mode 100644 index 0000000000..0a1da66f73 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Plaid-Pad Rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/keycapsss/plaid_pad/rev3/config.h b/keyboards/keycapsss/plaid_pad/rev3/config.h index 7159059a80..7e4786c5bc 100644 --- a/keyboards/keycapsss/plaid_pad/rev3/config.h +++ b/keyboards/keycapsss/plaid_pad/rev3/config.h @@ -16,9 +16,5 @@ #pragma once -#define PRODUCT Plaid-Pad Rev3 -#define DEVICE_VER 0x0003 - - #define ENCODERS_PAD_A { D1, B2, B4, D4 } #define ENCODERS_PAD_B { D0, B1, B3, B5 } diff --git a/keyboards/keycapsss/plaid_pad/rev3/info.json b/keyboards/keycapsss/plaid_pad/rev3/info.json new file mode 100644 index 0000000000..2f5b474c4d --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Plaid-Pad Rev3", + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h index de69b9e929..cda8799a79 100644 --- a/keyboards/keychron/q1/config.h +++ b/keyboards/keychron/q1/config.h @@ -16,11 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3434 -#define MANUFACTURER Keychron -#define PRODUCT Keychron Q1 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/keychron/q1/rev_0100/config.h b/keyboards/keychron/q1/rev_0100/config.h index 435f386a59..1b8c65165c 100644 --- a/keyboards/keychron/q1/rev_0100/config.h +++ b/keyboards/keychron/q1/rev_0100/config.h @@ -16,11 +16,6 @@ #pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0100 -#define DEVICE_VER 0x0100 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/keychron/q1/rev_0100/info.json b/keyboards/keychron/q1/rev_0100/info.json index dba3320ba7..b708f15994 100644 --- a/keyboards/keychron/q1/rev_0100/info.json +++ b/keyboards/keychron/q1/rev_0100/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q1", + "keyboard_name": "Q1", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0100", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_82": { "layout": [{"label":"Esc", "x":0, "y":0}, diff --git a/keyboards/keychron/q1/rev_0101/config.h b/keyboards/keychron/q1/rev_0101/config.h index c127a3630a..58d77477ca 100644 --- a/keyboards/keychron/q1/rev_0101/config.h +++ b/keyboards/keychron/q1/rev_0101/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0101 -#define DEVICE_VER 0x0100 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/keychron/q1/rev_0101/info.json b/keyboards/keychron/q1/rev_0101/info.json index 75fb2d04e8..b4e5d002b7 100644 --- a/keyboards/keychron/q1/rev_0101/info.json +++ b/keyboards/keychron/q1/rev_0101/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q1", + "keyboard_name": "Q1", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0101", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/q1/rev_0102/config.h b/keyboards/keychron/q1/rev_0102/config.h index a537ab4e0d..7aa0ae8662 100644 --- a/keyboards/keychron/q1/rev_0102/config.h +++ b/keyboards/keychron/q1/rev_0102/config.h @@ -16,11 +16,6 @@ #pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0102 -#define DEVICE_VER 0x0100 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/keychron/q1/rev_0102/info.json b/keyboards/keychron/q1/rev_0102/info.json index a71e0b24f0..9ee606b34e 100644 --- a/keyboards/keychron/q1/rev_0102/info.json +++ b/keyboards/keychron/q1/rev_0102/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q1", + "keyboard_name": "Q1", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0102", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h index e513536056..511cc4f5ac 100644 --- a/keyboards/keychron/q2/config.h +++ b/keyboards/keychron/q2/config.h @@ -16,11 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3434 -#define MANUFACTURER Keychron -#define PRODUCT Keychron Q2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/keychron/q2/rev_0110/config.h b/keyboards/keychron/q2/rev_0110/config.h index e41857d9b2..f30b81b3af 100644 --- a/keyboards/keychron/q2/rev_0110/config.h +++ b/keyboards/keychron/q2/rev_0110/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0110 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 33 diff --git a/keyboards/keychron/q2/rev_0110/info.json b/keyboards/keychron/q2/rev_0110/info.json index fb34a2427a..65e6c22519 100644 --- a/keyboards/keychron/q2/rev_0110/info.json +++ b/keyboards/keychron/q2/rev_0110/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0110", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/q2/rev_0111/config.h b/keyboards/keychron/q2/rev_0111/config.h index 76cd5d0e78..249e589019 100644 --- a/keyboards/keychron/q2/rev_0111/config.h +++ b/keyboards/keychron/q2/rev_0111/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0111 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 33 diff --git a/keyboards/keychron/q2/rev_0111/info.json b/keyboards/keychron/q2/rev_0111/info.json index f6ce1d9b27..875937baec 100644 --- a/keyboards/keychron/q2/rev_0111/info.json +++ b/keyboards/keychron/q2/rev_0111/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0111", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/q2/rev_0112/config.h b/keyboards/keychron/q2/rev_0112/config.h index 70a60fd026..4bab401a01 100644 --- a/keyboards/keychron/q2/rev_0112/config.h +++ b/keyboards/keychron/q2/rev_0112/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0112 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 34 diff --git a/keyboards/keychron/q2/rev_0112/info.json b/keyboards/keychron/q2/rev_0112/info.json index 5f0d4ab249..3670c87688 100644 --- a/keyboards/keychron/q2/rev_0112/info.json +++ b/keyboards/keychron/q2/rev_0112/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0112", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h index 486d3fd3b8..8f7fbef73a 100644 --- a/keyboards/keychron/q2/rev_0113/config.h +++ b/keyboards/keychron/q2/rev_0113/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0113 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 34 diff --git a/keyboards/keychron/q2/rev_0113/info.json b/keyboards/keychron/q2/rev_0113/info.json index 151f42455d..297096aac3 100644 --- a/keyboards/keychron/q2/rev_0113/info.json +++ b/keyboards/keychron/q2/rev_0113/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0113", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json index e3fc49fbed..ecafbeb089 100644 --- a/keyboards/keyhive/navi10/info.json +++ b/keyboards/keyhive/navi10/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Navi10", + "manufacturer": "emdarcher", "url": "", "maintainer": "emdarcher", + "usb": { + "vid": "0xFEED", + "pid": "0x0000" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}] diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h index 0d4685b17f..3d64b02771 100644 --- a/keyboards/keyhive/navi10/rev0/config.h +++ b/keyboards/keyhive/navi10/rev0/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER emdarcher -#define PRODUCT Navi10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/keyhive/navi10/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h index c128e8ecdc..8d3217d65c 100644 --- a/keyboards/keyhive/navi10/rev2/config.h +++ b/keyboards/keyhive/navi10/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0002 -#define MANUFACTURER emdarcher -#define PRODUCT Navi10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/keyhive/navi10/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h index 74cf7f77ca..7336abb6d6 100644 --- a/keyboards/keyhive/navi10/rev3/config.h +++ b/keyboards/keyhive/navi10/rev3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0003 -#define MANUFACTURER emdarcher -#define PRODUCT Navi10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json new file mode 100644 index 0000000000..b377cdff00 --- /dev/null +++ b/keyboards/keyhive/navi10/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/keyhive/uno/info.json b/keyboards/keyhive/uno/info.json index d426f9e426..9d39163a1b 100644 --- a/keyboards/keyhive/uno/info.json +++ b/keyboards/keyhive/uno/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Uno", + "manufacturer": "Broekhuijsen", "url": "https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/", "maintainer": "Snipeye", + "usb": { + "vid": "0xFEED", + "pid": "0xACC8" + }, "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }] diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h index cbd2306106..6e9298e261 100644 --- a/keyboards/keyhive/uno/rev1/config.h +++ b/keyboards/keyhive/uno/rev1/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xACC8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Broekhuijsen -#define PRODUCT Uno rev1 - #define RGBLIGHT_EFFECT_RAINBOW_MOOD // #define RGBLIGHT_ANIMATIONS diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json new file mode 100644 index 0000000000..69d6dfba0d --- /dev/null +++ b/keyboards/keyhive/uno/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Uno rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h index 0539c124b7..f53e38b617 100644 --- a/keyboards/keyhive/uno/rev2/config.h +++ b/keyboards/keyhive/uno/rev2/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xACC8 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Broekhuijsen -#define PRODUCT Uno rev2 - #define RGBLIGHT_EFFECT_RAINBOW_MOOD /* ENCODER */ diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json new file mode 100644 index 0000000000..787f306351 --- /dev/null +++ b/keyboards/keyhive/uno/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Uno rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h index 8667d2d132..c77eebb577 100644 --- a/keyboards/kinesis/alvicstep/config.h +++ b/keyboards/kinesis/alvicstep/config.h @@ -3,10 +3,6 @@ #include "../config.h" #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 - /* key matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json new file mode 100644 index 0000000000..1db31a0429 --- /dev/null +++ b/keyboards/kinesis/alvicstep/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Kinesis Classic/Advantage/Contoured", + "manufacturer": "QMK", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h index 271625ebd1..aa42ade2a7 100644 --- a/keyboards/kinesis/config.h +++ b/keyboards/kinesis/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define MANUFACTURER You -#define PRODUCT Kinesis Classic/Advantage/Contoured - // Mouse #define MOUSEKEY_DELAY 60 #define MOUSEKEY_INTERVAL 20 diff --git a/keyboards/kinesis/info.json b/keyboards/kinesis/info.json index 93259d06bf..5b9baafae4 100644 --- a/keyboards/kinesis/info.json +++ b/keyboards/kinesis/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Kinesis", "url": "", "maintainer": "qmk", "layouts": { diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h index baef45e32b..4bbc59e44c 100644 --- a/keyboards/kinesis/kint2pp/config.h +++ b/keyboards/kinesis/kint2pp/config.h @@ -1,9 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0002 - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 7 diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json new file mode 100644 index 0000000000..b44abddfdf --- /dev/null +++ b/keyboards/kinesis/kint2pp/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Kinesis Classic/Advantage/Contoured", + "manufacturer": "QMK", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.2" + } +} diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h index 88f28d0fe2..9b45484b55 100644 --- a/keyboards/kinesis/kint36/config.h +++ b/keyboards/kinesis/kint36/config.h @@ -16,18 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#undef VENDOR_ID -#define VENDOR_ID 0x1209 -#undef PRODUCT_ID -#define PRODUCT_ID 0x345C -#undef DEVICE_VER -#define DEVICE_VER 0x0001 -#undef MANUFACTURER -#define MANUFACTURER "https://github.com/stapelberg" -#undef PRODUCT -#define PRODUCT "kinT (kint36)" - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 7 diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json new file mode 100644 index 0000000000..2fbfcc5661 --- /dev/null +++ b/keyboards/kinesis/kint36/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "kinT (kint36)", + "manufacturer": "https://github.com/stapelberg", + "usb": { + "vid": "0x1209", + "pid": "0x345C", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h index 6a21e8efad..6df789d631 100644 --- a/keyboards/kinesis/kint41/config.h +++ b/keyboards/kinesis/kint41/config.h @@ -16,18 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#undef VENDOR_ID -#define VENDOR_ID 0x1209 -#undef PRODUCT_ID -#define PRODUCT_ID 0x345C -#undef DEVICE_VER -#define DEVICE_VER 0x0001 -#undef MANUFACTURER -#define MANUFACTURER "https://github.com/stapelberg" -#undef PRODUCT -#define PRODUCT "kinT (kint41)" - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 7 diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json new file mode 100644 index 0000000000..45481a5b84 --- /dev/null +++ b/keyboards/kinesis/kint41/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "kinT (kint41)", + "manufacturer": "https://github.com/stapelberg", + "usb": { + "vid": "0x1209", + "pid": "0x345C", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h index 5eb397856e..4ee9f9ca6f 100644 --- a/keyboards/kinesis/kintlc/config.h +++ b/keyboards/kinesis/kintlc/config.h @@ -16,18 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#undef VENDOR_ID -#define VENDOR_ID 0x1209 -#undef PRODUCT_ID -#define PRODUCT_ID 0x345C -#undef DEVICE_VER -#define DEVICE_VER 0x0001 -#undef MANUFACTURER -#define MANUFACTURER "https://github.com/stapelberg" -#undef PRODUCT -#define PRODUCT "kinT (kintlc)" - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 7 diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json new file mode 100644 index 0000000000..721ebbfe82 --- /dev/null +++ b/keyboards/kinesis/kintlc/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "kinT (kintlc)", + "manufacturer": "https://github.com/stapelberg", + "usb": { + "vid": "0x1209", + "pid": "0x345C", + "device_version": "0.0.1" + } +} diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h index b518456e27..399d10e81d 100644 --- a/keyboards/kinesis/nguyenvietyen/config.h +++ b/keyboards/kinesis/nguyenvietyen/config.h @@ -1,9 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0003 - /* key matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json new file mode 100644 index 0000000000..4035bb8e11 --- /dev/null +++ b/keyboards/kinesis/nguyenvietyen/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Kinesis Classic/Advantage/Contoured", + "manufacturer": "QMK", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.3" + } +} diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h index 1ef92a604d..ccf6a20e7a 100644 --- a/keyboards/kinesis/stapelberg/config.h +++ b/keyboards/kinesis/stapelberg/config.h @@ -3,10 +3,6 @@ #include "../config.h" #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0002 - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 7 diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json new file mode 100644 index 0000000000..b44abddfdf --- /dev/null +++ b/keyboards/kinesis/stapelberg/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Kinesis Classic/Advantage/Contoured", + "manufacturer": "QMK", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.2" + } +} diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h index 0776d1ba08..98e958533c 100644 --- a/keyboards/kingly_keys/ave/config.h +++ b/keyboards/kingly_keys/ave/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B4B // "KK" -#define PRODUCT_ID 0x1225 -#define DEVICE_VER 0x0011 -#define MANUFACTURER Kingly-Keys -#define PRODUCT The Ave. - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json index e45a3bbe44..bc8b83334f 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "The Ave. (Ortholinear Ed. PCB)", + "keyboard_name": "The Ave. Ortholinear", + "manufacturer": "Kingly-Keys", "url": "", "maintainer": "the-royal", + "usb": { + "vid": "0x4B4B", + "pid": "0x1225", + "device_version": "0.1.1" + }, "layouts": { "LAYOUT_ortho_all": { "layout": [ diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json index bb720b196b..9757472b9f 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "The Ave. (Staggered Ed. PCB)", + "keyboard_name": "The Ave. Staggered", + "manufacturer": "Kingly-Keys", "url": "", "maintainer": "the-royal", + "usb": { + "vid": "0x4B4B", + "pid": "0x1225", + "device_version": "0.1.1" + }, "layouts": { "LAYOUT_staggered": { "layout": [ diff --git a/keyboards/kudox_game/info.json b/keyboards/kudox_game/info.json index 47fdd84b34..4cfc75850a 100644 --- a/keyboards/kudox_game/info.json +++ b/keyboards/kudox_game/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "Kudox Game Keyboard", + "keyboard_name": "The Kudox Game Keyboard", + "manufacturer": "Kumao Kobo", "url": "", "maintainer": "Kumao Kobo", + "usb": { + "vid": "0xABBA", + "pid": "0x9696" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h index 821a6af8bb..1fc6411359 100644 --- a/keyboards/kudox_game/rev1/config.h +++ b/keyboards/kudox_game/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xABBA -#define PRODUCT_ID 0x9696 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Kumao Kobo -#define PRODUCT The Kudox Game Keyboard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json new file mode 100644 index 0000000000..ad889c2304 --- /dev/null +++ b/keyboards/kudox_game/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h index e1907bf29f..f61b42eb7f 100644 --- a/keyboards/kudox_game/rev2/config.h +++ b/keyboards/kudox_game/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xABBA -#define PRODUCT_ID 0x9696 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Kumao Kobo -#define PRODUCT The Kudox Game Keyboard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json new file mode 100644 index 0000000000..3bdd63ee28 --- /dev/null +++ b/keyboards/kudox_game/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/late9/config.h b/keyboards/late9/config.h index a4dc07a7c4..6057518955 100644 --- a/keyboards/late9/config.h +++ b/keyboards/late9/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3777 -#define MANUFACTURER rookiebwoy -#define PRODUCT LATE-9 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL diff --git a/keyboards/late9/rev1/config.h b/keyboards/late9/rev1/config.h index 20d1a553cc..7521f34330 100644 --- a/keyboards/late9/rev1/config.h +++ b/keyboards/late9/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 6 #define MATRIX_COLS 3 diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json index 66175c9afa..b439b05347 100644 --- a/keyboards/late9/rev1/info.json +++ b/keyboards/late9/rev1/info.json @@ -1,8 +1,13 @@ { "keyboard_name": "LATE-9", - "keyboard_folder": "late9/rev1", + "manufacturer": "rookiebwoy", "url": "https://github.com/rookiebwoy/late-9)", "maintainer": "rookiebwoy", + "usb": { + "vid": "0xFEED", + "pid": "0x3777", + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h index c9200e2d18..4a8f7a1dce 100644 --- a/keyboards/lazydesigners/dimple/config.h +++ b/keyboards/lazydesigners/dimple/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C44 // "LD" -#define PRODUCT_ID 0x0040 -#define DEVICE_VER 0x0001 -#define MANUFACTURER LazyDesigners -#define PRODUCT Dimple - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json index dbe70f821f..752f8293d4 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dimple", + "manufacturer": "LazyDesigners", "url": "http://lazydesigners.cn", "maintainer": "Jacky@LAZYDESIGNERS", + "usb": { + "vid": "0x4C44", + "pid": "0x0040", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2u": { "layout": [ diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json index 4cfa1e6f18..36be5aefeb 100644 --- a/keyboards/lazydesigners/dimple/staggered/info.json +++ b/keyboards/lazydesigners/dimple/staggered/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dimple", + "manufacturer": "LazyDesigners", "url": "http://lazydesigners.cn", "maintainer": "Erovia", + "usb": { + "vid": "0x4C44", + "pid": "0x0040", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json index aa47a84834..0bb8f31219 100644 --- a/keyboards/lets_split/info.json +++ b/keyboards/lets_split/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Let's Split", "url": "", "maintainer": "qmk", "layouts": { diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h index fc9e348a86..77b0c3b095 100644 --- a/keyboards/lets_split/rev1/config.h +++ b/keyboards/lets_split/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Wootpatoot -#define PRODUCT Lets Split v1 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json new file mode 100644 index 0000000000..ae781da15f --- /dev/null +++ b/keyboards/lets_split/rev1/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Lets Split v1", + "manufacturer": "Wootpatoot", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + } +} diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index 7d8dff4f2f..6fbfaba982 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6F77 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Wootpatoot -#define PRODUCT Lets Split v2 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json new file mode 100644 index 0000000000..fd9960697b --- /dev/null +++ b/keyboards/lets_split/rev2/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Lets Split v2", + "manufacturer": "Wootpatoot", + "usb": { + "vid": "0x6F77", + "pid": "0x0002", + "device_version": "0.0.2" + } +} diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h index 70cbc18cd5..0adf933032 100644 --- a/keyboards/lets_split/sockets/config.h +++ b/keyboards/lets_split/sockets/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0BEE -#define DEVICE_VER 0x0001 -#define MANUFACTURER Duckle29 -#define PRODUCT Lets Split Sockets - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json new file mode 100644 index 0000000000..700fffb622 --- /dev/null +++ b/keyboards/lets_split/sockets/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Lets Split Sockets", + "manufacturer": "Duckle29", + "usb": { + "vid": "0xFEED", + "pid": "0x0BEE", + "device_version": "0.0.1" + } +} diff --git a/keyboards/lfkeyboards/smk65/info.json b/keyboards/lfkeyboards/smk65/info.json index 038893c8f3..5522d1bbb7 100644 --- a/keyboards/lfkeyboards/smk65/info.json +++ b/keyboards/lfkeyboards/smk65/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "SMK65", + "keyboard_name": "SMK65v2", + "manufacturer": "LFKeyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4C46", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT_65_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":15, "y":0}, {"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":15, "y":1}, {"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":15, "y":2}, {"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":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h index 26fcc540f4..13846be9a8 100644 --- a/keyboards/lfkeyboards/smk65/revb/config.h +++ b/keyboards/lfkeyboards/smk65/revb/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C46 // "LF" -#define PRODUCT_ID 0x565B // "s65b" -#define DEVICE_VER 0x0006 -#define MANUFACTURER LFKeyboards -#define PRODUCT SMK65v2 - // RevA // #define DIODE_DIRECTION COL2ROW // #define MATRIX_ROWS 5 diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json new file mode 100644 index 0000000000..8790e7e33a --- /dev/null +++ b/keyboards/lfkeyboards/smk65/revb/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x565B" + } +} diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h index 40d4e8cb79..6281324c5c 100644 --- a/keyboards/lfkeyboards/smk65/revf/config.h +++ b/keyboards/lfkeyboards/smk65/revf/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C46 // "LF" -#define PRODUCT_ID 0x565F // "s65f" -#define DEVICE_VER 0x0006 -#define MANUFACTURER LFKeyboards -#define PRODUCT SMK65v2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json new file mode 100644 index 0000000000..071eab2f47 --- /dev/null +++ b/keyboards/lfkeyboards/smk65/revf/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x565F" + } +} diff --git a/keyboards/maple_computing/christmas_tree/V2017/config.h b/keyboards/maple_computing/christmas_tree/V2017/config.h deleted file mode 100644 index abc94749a8..0000000000 --- a/keyboards/maple_computing/christmas_tree/V2017/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "config_common.h" - -#define DEVICE_VER 0x2017 diff --git a/keyboards/maple_computing/christmas_tree/V2017/info.json b/keyboards/maple_computing/christmas_tree/V2017/info.json new file mode 100644 index 0000000000..6d00c2519f --- /dev/null +++ b/keyboards/maple_computing/christmas_tree/V2017/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "20.1.7" + } +} diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h index 984debea4b..8ffcd5c25a 100644 --- a/keyboards/maple_computing/christmas_tree/config.h +++ b/keyboards/maple_computing/christmas_tree/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3070 -#define MANUFACTURER Maple Computing -#define PRODUCT Christmas Tree - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 1 diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index 5d24218c70..2f5dfef702 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Christmas Tree", + "manufacturer": "Maple Computing", "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", "maintainer": "That-Canadian", + "usb": { + "vid": "0xFEED", + "pid": "0x3070" + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h index 130f2e0b61..96fb23736c 100644 --- a/keyboards/maple_computing/ivy/config.h +++ b/keyboards/maple_computing/ivy/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1337 -#define PRODUCT_ID 0x6012 -#define MANUFACTURER Maple Computing -#define PRODUCT Ivy - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h index 70747bdcaf..902f807051 100644 --- a/keyboards/maple_computing/ivy/rev1/config.h +++ b/keyboards/maple_computing/ivy/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { F1, B2, D3 } #define MATRIX_COL_PINS { F5, B3, D5 } diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index c5045bd80f..4bacbdb9b9 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IVY", + "keyboard_name": "Ivy", + "manufacturer": "Maple Computing", "url": "", "maintainer": "That-Canadian", + "usb": { + "vid": "0x1337", + "pid": "0x6012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index 901c63c93b..92d597508a 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1337 -#define PRODUCT_ID 0x6007 -#define MANUFACTURER Maple Computing -#define PRODUCT Launch Pad - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 2 diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index baceaa43f7..427e04618c 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "../config.h" -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { C6, B1, B3, D7 } #define MATRIX_COL_PINS { D2, F7 } diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index c8ba35c966..4931670cb4 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Launch Pad rev1", + "keyboard_name": "Launch Pad", + "manufacturer": "Maple Computing", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x1337", + "pid": "0x6007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/lets_split_eh/config.h b/keyboards/maple_computing/lets_split_eh/config.h index 787b9783b8..671cd4d34a 100644 --- a/keyboards/maple_computing/lets_split_eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xE401 -#define DEVICE_VER 0x0100 -#define MANUFACTURER That-Canadian -#define PRODUCT Lets Split Eh? - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index c241fa3813..352461ae50 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Let's Split", + "keyboard_name": "Lets Split Eh?", + "manufacturer": "That-Canadian", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0xE401", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h index 613e45977c..9b3adc2602 100644 --- a/keyboards/maple_computing/minidox/config.h +++ b/keyboards/maple_computing/minidox/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define MANUFACTURER That-Canadian -#define PRODUCT MiniDox - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h index 734ca562fd..6867fee4b5 100644 --- a/keyboards/maple_computing/minidox/rev1/config.h +++ b/keyboards/maple_computing/minidox/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 - // wiring of each half #define MATRIX_ROW_PINS { B2, B6, B4, B5 } #define MATRIX_COL_PINS { F4, D3, D2, D1, D4 } diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 47ed14dab0..6a253e14a6 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "MiniDox", + "manufacturer": "That-Canadian", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}] diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index dcb27a0a3e..6cee7a9a92 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xDFA1 -#define DEVICE_VER 0x0020 -#define MANUFACTURER marksard -#define PRODUCT Rhymestone - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/marksard/rhymestone/info.json b/keyboards/marksard/rhymestone/rev1/info.json index c10a45aa4b..ddce4923a4 100644 --- a/keyboards/marksard/rhymestone/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Rhymestone", + "manufacturer": "marksard", "url": "https://github.com/marksard/Keyboards", "maintainer": "marksard", + "usb": { + "vid": "0xFEED", + "pid": "0xDFA1", + "device_version": "0.2.0" + }, "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/marksard/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json index d9c1069b38..81728e0957 100644 --- a/keyboards/marksard/treadstone32/info.json +++ b/keyboards/marksard/treadstone32/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Treadstone32", + "manufacturer": "marksard", "url": "https://github.com/marksard/Keyboards", "maintainer": "marksard", + "usb": { + "vid": "0xFEED", + "pid": "0xDFA5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index d1afa59beb..e640fdb3c1 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xDFA5 -#define DEVICE_VER 0x0015 -#define MANUFACTURER marksard -#define PRODUCT treadstone32 lite - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json new file mode 100644 index 0000000000..2d66455900 --- /dev/null +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "treadstone32 lite", + "usb": { + "device_version": "0.1.5" + } +} diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index b844b874dd..ae27cdaf9e 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xDFA5 -#define DEVICE_VER 0x0010 -#define MANUFACTURER marksard -#define PRODUCT treadstone32 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json new file mode 100644 index 0000000000..9a2ae10a50 --- /dev/null +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "treadstone32", + "usb": { + "device_version": "0.1.0" + } +} diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h index 9d9c02effe..e4324680c4 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/config.h +++ b/keyboards/masterworks/classy_tkl/rev_a/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D57 // "MW" = Masterworks -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Masterworks -#define PRODUCT Classy TKL - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json index 7baf2c41ab..38c4a2331b 100644 --- a/keyboards/masterworks/classy_tkl/info.json +++ b/keyboards/masterworks/classy_tkl/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Classy TKL", + "manufacturer": "Masterworks", "url": "https://geekhack.org/index.php?topic=105933", "maintainer": "qmk", + "usb": { + "vid": "0x4D57", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h index 9602bbd39b..3b5b7ea0e7 100644 --- a/keyboards/mechllama/g35/config.h +++ b/keyboards/mechllama/g35/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xCEEB -#define PRODUCT_ID 0x0035 -#define MANUFACTURER kaylynb -#define PRODUCT MechLlama G35 - #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index c22c124fc8..465e145a97 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "G35", + "keyboard_name": "MechLlama G35", + "manufacturer": "kaylynb", "url": "https://github.com/kaylynb/MechLlama-G35", "maintainer": "kaylynb", + "usb": { + "vid": "0xCEEB", + "pid": "0x0035" + }, "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}] diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h index 9e7be98ea1..fbda4b7db2 100644 --- a/keyboards/mechllama/g35/v1/config.h +++ b/keyboards/mechllama/g35/v1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 } #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 } diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/mechllama/g35/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h index 09d5f607d2..cd4d6e991c 100644 --- a/keyboards/mechllama/g35/v2/config.h +++ b/keyboards/mechllama/g35/v2/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0002 - #define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 } #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 } diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/mechllama/g35/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h index 035ffa8032..08df109685 100644 --- a/keyboards/mechlovin/adelais/config.h +++ b/keyboards/mechlovin/adelais/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // "ML" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team.Mechlovin - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15
\ No newline at end of file diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index 7a858277e7..a583373c13 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Adelais", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs" }, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index fa8b213cc7..7f151ae09a 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAEC1 -#define PRODUCT Adelais En Ciel - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json new file mode 100644 index 0000000000..92ee67be74 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel", + "usb": { + "pid": "0xAEC1" + } +} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index cd290cdcd1..dbeb73cda2 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAEC2 -#define PRODUCT Adelais En Ciel Rev2 - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json new file mode 100644 index 0000000000..8af90a2c55 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel Rev2", + "usb": { + "pid": "0xAEC2" + } +} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index 6efac57ee2..e16d5f2ce5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0xAEC3 -#define PRODUCT Adelais En Ciel Rev3 - #define MATRIX_ROW_PINS { A4, A3, C13, A1, A2} #define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json new file mode 100644 index 0000000000..2f963ec895 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel Rev3", + "usb": { + "pid": "0xAEC3" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index 2fe1e63632..72386fdc59 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT Adelais - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json new file mode 100644 index 0000000000..68e7b3d144 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Adelais" +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h deleted file mode 100644 index 7c2c63ea21..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAD01
\ No newline at end of file diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json new file mode 100644 index 0000000000..ce04dbb068 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD01" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h index 4d56fedf05..69af2941a6 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h @@ -1,7 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAD02 - #define ENCODERS_PAD_A { A6, A4, B7 } #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json new file mode 100644 index 0000000000..f3b66e9eb2 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD02" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h index ca793f1fec..70fa00220b 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h @@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define PRODUCT_ID 0xAD03 - #define ENCODERS_PAD_A { A6, A4, B7 } #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json new file mode 100644 index 0000000000..f4c096143b --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD03" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index b7696c5a07..31acc74b90 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define PRODUCT_ID 0xAD04 -#define PRODUCT Adelais AVR /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json new file mode 100644 index 0000000000..d827607b81 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais AVR", + "usb": { + "pid": "0xAD04" + } +} diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h index a642f37f9b..7d50bb4615 100644 --- a/keyboards/mechlovin/delphine/config.h +++ b/keyboards/mechlovin/delphine/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define MANUFACTURER Mechlovin -#define PRODUCT Mechlovin Delphine - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 38ae0a3beb..a3fe9fb200 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "Delphine", + "manufacturer": "Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [ diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h index ead627937c..36923bb968 100644 --- a/keyboards/mechlovin/delphine/mono_led/config.h +++ b/keyboards/mechlovin/delphine/mono_led/config.h @@ -1,10 +1,6 @@ #pragma once -#define PRODUCT_ID 0xDEF1 -#define DEVICE_VER 0x0001 - - #ifdef BACKLIGHT_ENABLE #define BACKLIGHT_PIN B6 // #define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json new file mode 100644 index 0000000000..2665906b80 --- /dev/null +++ b/keyboards/mechlovin/delphine/mono_led/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0xDEF1", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h index 0ed8721d23..0d5bfb57f9 100644 --- a/keyboards/mechlovin/delphine/rgb_led/config.h +++ b/keyboards/mechlovin/delphine/rgb_led/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xDEF2 -#define DEVICE_VER 0x0001 - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 13 diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json new file mode 100644 index 0000000000..0a8f1ab220 --- /dev/null +++ b/keyboards/mechlovin/delphine/rgb_led/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0xDEF2", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index e1e97ca873..35145c440b 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0180 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Mechlovin Studio -#define PRODUCT Foundation FRL #define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3} diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 03b6cf6ff2..aa4148a40a 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Foundation", + "keyboard_name": "Foundation FRL", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Protozoa", + "usb": { + "vid": "0x4D4C", + "pid": "0x0180", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"2,15", "x":16.25, "y":0}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,13", "x":15, "y":2}, {"label":"2,14", "x":16, "y":2, "w":1.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":1.25}, {"label":"3,2", "x":3.5, "y":3}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":1.75}, {"label":"3,14", "x":16.25, "y":3}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}] diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h index 6acfa5d401..3a0aaa0eb9 100644 --- a/keyboards/mechlovin/hannah60rgb/config.h +++ b/keyboards/mechlovin/hannah60rgb/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML-Mechlovin -#define MANUFACTURER Team.Mechlovin - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h index 0f0c923fd0..9a84e78588 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h @@ -1,9 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6001 -#define DEVICE_VER 0x0001 -#define PRODUCT Hannah60 RGB - #define RGB_DI_PIN A15 #ifdef RGB_MATRIX_ENABLE # define DRIVER_LED_TOTAL 72 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 48c878edb1..1e30b49c01 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah60rgb rev1", + "keyboard_name": "Hannah60 RGB", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h index e96ca0002a..3a25680a20 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h @@ -1,9 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6002 -#define DEVICE_VER 0x0001 -#define PRODUCT Hannah60 RGB Rev.2 - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A15 # define RGBLED_NUM 18 diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 74490e03e3..4047982477 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah60rgb rev2", + "keyboard_name": "Hannah60 RGB Rev.2", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index f0aa801396..c43d228cf4 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define MANUFACTURER Team Mechlovin - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hannah65/rev1/haus/config.h b/keyboards/mechlovin/hannah65/rev1/haus/config.h deleted file mode 100644 index 204bf356e7..0000000000 --- a/keyboards/mechlovin/hannah65/rev1/haus/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Mechlovin' Studio - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define PRODUCT_ID 0x6500 -#define DEVICE_VER 0x0001 -#define PRODUCT Haus Rev. 1
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json index 329c4040c8..55ddde0a58 100644 --- a/keyboards/mechlovin/hannah65/rev1/info.json +++ b/keyboards/mechlovin/hannah65/rev1/haus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah65-rev1", + "keyboard_name": "Haus Rev. 1", + "manufacturer": "Team Mechlovin", "url": "", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6500", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index cca6cdfad3..3a222e8d87 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML-MechLovin' -#define MANUFACTURER Mechlovin -#define PRODUCT Mechlovin Hannah910 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hannah910/rev1/config.h b/keyboards/mechlovin/hannah910/rev1/config.h index 906e0c8846..7b793c75b9 100644 --- a/keyboards/mechlovin/hannah910/rev1/config.h +++ b/keyboards/mechlovin/hannah910/rev1/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9101 -#define DEVICE_VER 0x0001 - #define RGBLED_NUM 9
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index 1f130c6992..bbfdddf1ad 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9101", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Delete", "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":"INS", "x":15, "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"HOME", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Shift", "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}, {"label":"Up", "x":14, "y":3}, {"label":"END", "x":15, "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}, {"label":"Space", "x":3.75, "y":4, "w":2.75}, {"label":"Space", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/mechlovin/hannah910/rev2/config.h b/keyboards/mechlovin/hannah910/rev2/config.h index 3ae3cb65bc..c37c581ae6 100644 --- a/keyboards/mechlovin/hannah910/rev2/config.h +++ b/keyboards/mechlovin/hannah910/rev2/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9102 -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 28
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index c2e5dd1a3e..d0eb8b208f 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Hannah910 Rev.2", + "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9102", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/rev3/config.h b/keyboards/mechlovin/hannah910/rev3/config.h index 5e377f4d79..fbb878ab6a 100644 --- a/keyboards/mechlovin/hannah910/rev3/config.h +++ b/keyboards/mechlovin/hannah910/rev3/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9103 -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 28 diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index bb762dd589..44c797323b 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah910-rev3", + "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9103", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h index c8176d76b5..4126b720b7 100644 --- a/keyboards/mechlovin/hex4b/config.h +++ b/keyboards/mechlovin/hex4b/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0675 //Hex-75 -#define MANUFACTURER Mechlovin Studio - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json index 686d79cc0e..2edd39b3e2 100644 --- a/keyboards/mechlovin/hex4b/info.json +++ b/keyboards/mechlovin/hex4b/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Hex4B", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Hex-Keyboard&Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x0675" + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_bs", "LAYOUT_all": "LAYOUT_split_bs" diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h index 89538b47c7..8afeeaf593 100644 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ b/keyboards/mechlovin/hex4b/rev1/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define PRODUCT Hex-4B Rev.1 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json new file mode 100644 index 0000000000..b2dfdec696 --- /dev/null +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Hex-4B Rev.1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index cf5aced043..9eb4e03feb 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 -#define PRODUCT Hex-4B Rev.2 - - - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json new file mode 100644 index 0000000000..da18a2ce4b --- /dev/null +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Hex-4B Rev.2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h index a344c98b8f..6692b78292 100644 --- a/keyboards/mechlovin/infinity87/config.h +++ b/keyboards/mechlovin/infinity87/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML - -#define MANUFACTURER Mechlovin.Studio - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h b/keyboards/mechlovin/infinity87/rev1/rogue87/config.h deleted file mode 100644 index 3415f3add9..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define PRODUCT_ID 0x8704 -#define DEVICE_VER 0x0001 -#define PRODUCT Rogue87 Rev.1
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json index 3ffa181666..b9906b410b 100644 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rogue87", + "keyboard_name": "Rogue87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8704", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h b/keyboards/mechlovin/infinity87/rev1/rouge87/config.h deleted file mode 100644 index 786da387bc..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define PRODUCT_ID 0x8703 -#define DEVICE_VER 0x0001 -#define PRODUCT Rouge87 Rev.1 diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json index 8faaa83fd1..2957247ad4 100644 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rouge87", + "keyboard_name": "Rouge87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8703", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h index b3ae5a7717..c7e4f601e1 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/config.h +++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8701 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity 87 rev1 - #define RGB_DI_PIN A15 #define RGBLED_NUM 26 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json index da67c40c39..e19d4dbe7d 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/info.json +++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87", + "keyboard_name": "infinity87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h index ab329db96e..65eaa9a7fa 100644 --- a/keyboards/mechlovin/infinity87/rev2/config.h +++ b/keyboards/mechlovin/infinity87/rev2/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8702 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity87 rev.2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index fa6073912c..609f6b1700 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87 Rev.2", + "keyboard_name": "Infinity87 Rev.2", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8702", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h index 5b1a68308b..3c2ffd4b9f 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h +++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8710 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity 87 RGB rev1 - #define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 } #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 } diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index da67c40c39..0589e3f712 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87", + "keyboard_name": "Infinity87 RGB Rev1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8710", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h index 669d79ac91..6795046f8b 100644 --- a/keyboards/mechlovin/mechlovin9/config.h +++ b/keyboards/mechlovin/mechlovin9/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define MANUFACTURER Mechlovin Studio - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index 6fea78aecc..c0a64b984a 100644 --- a/keyboards/mechlovin/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "mechlovin9", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h index 2a9c335d73..236529e243 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/config.h +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0001 -#define PRODUCT Mechlovin9 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json new file mode 100644 index 0000000000..2153f0ad17 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Mechlovin9", + "usb": { + "pid": "0x6509", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h index ed11fafa83..c06295dfde 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/config.h +++ b/keyboards/mechlovin/mechlovin9/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0002 -#define PRODUCT Mechlovin9 Rev2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json new file mode 100644 index 0000000000..2c92773e6d --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Mechlovin9 Rev2", + "usb": { + "pid": "0x6509", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json index 2189f6bd1c..682038c681 100644 --- a/keyboards/mechwild/bde/info.json +++ b/keyboards/mechwild/bde/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "MechWild BDE Rev2", + "manufacturer": "MechWild", "url": "mechwild.com", "maintainer": "kylemccreery", + "usb": { + "vid": "0x6D77" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/lefty/config.h b/keyboards/mechwild/bde/lefty/config.h index 50101cbfc5..702a6d81b4 100644 --- a/keyboards/mechwild/bde/lefty/config.h +++ b/keyboards/mechwild/bde/lefty/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x1701 -#define DEVICE_VER 0x0203 -#define MANUFACTURER MechWild -#define PRODUCT BDE Lefty - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 14 diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json new file mode 100644 index 0000000000..293df18387 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDE Lefty", + "usb": { + "pid": "0x1701", + "device_version": "2.0.3" + } +} diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h index ab5110c19b..7ea5536055 100644 --- a/keyboards/mechwild/bde/rev2/config.h +++ b/keyboards/mechwild/bde/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x170A -#define DEVICE_VER 0x0101 -#define MANUFACTURER MechWild -#define PRODUCT BDE Rev2 - /* Key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json new file mode 100644 index 0000000000..9c9aa3e2c2 --- /dev/null +++ b/keyboards/mechwild/bde/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDE Rev2", + "usb": { + "pid": "0x170A", + "device_version": "1.0.1" + } +} diff --git a/keyboards/mechwild/bde/righty/config.h b/keyboards/mechwild/bde/righty/config.h index 3cae15b107..732e125bf9 100644 --- a/keyboards/mechwild/bde/righty/config.h +++ b/keyboards/mechwild/bde/righty/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x1702 -#define DEVICE_VER 0x0203 -#define MANUFACTURER MechWild -#define PRODUCT BDE Righty - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 14 diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json new file mode 100644 index 0000000000..93161bfcec --- /dev/null +++ b/keyboards/mechwild/bde/righty/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "BDE Righty", + "usb": { + "pid": "0x1702", + "device_version": "2.0.3" + } +} diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index 879108d238..29bc9f07e7 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m48 - #define MATRIX_ROWS 4 // Rows are doubled-up #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json index d22cfc54fd..c67c06fb76 100644 --- a/keyboards/mlego/m48/info.json +++ b/keyboards/mlego/m48/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m48", + "keyboard_name": "48", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m48", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_4x12": { "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":0, "y":1}, {"x":1, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "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/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index 4b718f129c..5f20d8c980 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6261 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { A6, A7, B0, B10 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json new file mode 100644 index 0000000000..68c73096c4 --- /dev/null +++ b/keyboards/mlego/m48/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6261", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index abce0cb5f8..6cf70e5c41 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m60 - #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json index 12924b5ea6..fc1a46cc23 100644 --- a/keyboards/mlego/m60/info.json +++ b/keyboards/mlego/m60/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m60", + "keyboard_name": "m60", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m60", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x12": { "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":0, "y":1}, {"x":1, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 638a698536..49c9492aa2 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6161 -#define DEVICE_VER 0x0001 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json new file mode 100644 index 0000000000..865399a460 --- /dev/null +++ b/keyboards/mlego/m60/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6161", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 7282886b0b..241ea77a22 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m60_split - #define MATRIX_ROWS 10 // Rows are doubled-up #define MATRIX_COLS 6 diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json index c6c5ee480d..3212b0c613 100644 --- a/keyboards/mlego/m60_split/info.json +++ b/keyboards/mlego/m60_split/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m60_split", + "keyboard_name": "m60_split", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m65", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x12": { "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":0, "y":1}, {"x":1, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 573ec72288..0256bcc924 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6361 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json new file mode 100644 index 0000000000..90303c33c5 --- /dev/null +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6361", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 1f1435a237..ce2726e19a 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6362 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json new file mode 100644 index 0000000000..bee03f611f --- /dev/null +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6362", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index 25d69d8b7a..7ac1f7271c 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xBABA -#define MANUFACTURER Alin Elena -#define PRODUCT m65 - #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json index 175c6638c5..3c7d816d62 100644 --- a/keyboards/mlego/m65/info.json +++ b/keyboards/mlego/m65/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "M65", + "keyboard_name": "m65", + "manufacturer": "Alin Elena", "url": "https://gitlab.com/m-lego/m65", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x13": { "layout": [ diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index 988b3cf31f..d296bf9954 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x6061 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json new file mode 100644 index 0000000000..e495c94992 --- /dev/null +++ b/keyboards/mlego/m65/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6061", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index 55c4f0d2f4..d5575d24a9 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x6061 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN B2 diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json new file mode 100644 index 0000000000..470262ed85 --- /dev/null +++ b/keyboards/mlego/m65/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6061", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index 1ebf730601..d8a9c2a463 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x6062 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json new file mode 100644 index 0000000000..e42ab50857 --- /dev/null +++ b/keyboards/mlego/m65/rev3/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6062", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index 606a6bb85c..f50356954f 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x6062 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json new file mode 100644 index 0000000000..c94ea38e22 --- /dev/null +++ b/keyboards/mlego/m65/rev4/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6062", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index c31a29003e..675cc3385d 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -16,11 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00DE -#define MANUFACTURER Mode -#define PRODUCT Eighty - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/mode/m80v1/m80h/config.h b/keyboards/mode/m80v1/m80h/config.h deleted file mode 100644 index b119ad4fff..0000000000 --- a/keyboards/mode/m80v1/m80h/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0081 -#define DEVICE_VER 0x0072 //H for hotswap version diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index 97d5881997..bb65727e62 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80H", + "keyboard_name": "Eighty", + "manufacturer": "Mode", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00DE", + "pid": "0x0081", + "device_version": "0.7.2" + }, "layouts": { "LAYOUT_eighty_m80h": { "layout": [ diff --git a/keyboards/mode/m80v1/m80s/config.h b/keyboards/mode/m80v1/m80s/config.h deleted file mode 100644 index 3e7f2ec3a8..0000000000 --- a/keyboards/mode/m80v1/m80s/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0080 -#define DEVICE_VER 0x0083 //S for solderable version diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index c586614a78..7b72eb256f 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80S", + "keyboard_name": "Eighty", + "manufacturer": "Mode", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00DE", + "pid": "0x0080", + "device_version": "0.8.3" + }, "layouts": { "LAYOUT_eighty_m80s": { "layout": [ diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index fbe5fb86df..9382def58a 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00DE -#define DEVICE_VER 0x0002 -#define MANUFACTURER Mode - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mode/m80v2/m80v2h/config.h b/keyboards/mode/m80v2/m80v2h/config.h deleted file mode 100644 index f474e28453..0000000000 --- a/keyboards/mode/m80v2/m80v2h/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PRODUCT_ID 0x0083 // 81 was used for M80H V1 -#define PRODUCT M80H V2 diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 251937c562..13bd6c67bc 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80V2H", + "keyboard_name": "M80H V2", + "manufacturer": "Mode", "url": "https://shop.modedesigns.com/collections/eighty", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x0083", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_m80v2h": { "layout": [ diff --git a/keyboards/mode/m80v2/m80v2s/config.h b/keyboards/mode/m80v2/m80v2s/config.h deleted file mode 100644 index ad1871f8ab..0000000000 --- a/keyboards/mode/m80v2/m80v2s/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PRODUCT_ID 0x0082 // 81 was used for M80H V1 -#define PRODUCT M80S V2 diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 6e0bd62d51..4e2a4fc6f5 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80V2S", + "keyboard_name": "M80S V2", + "manufacturer": "Mode", "url": "https://shop.modedesigns.com/collections/eighty", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x0082", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_m80v2s": { "layout": [ diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index 2c98d5a78c..3fd078898b 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Murciélago", + "manufacturer": "elagil", "url": "", "maintainer": "elagil", + "usb": { + "vid": "0x6166", + "pid": "0x0001", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h index 742e5398d3..f398596044 100644 --- a/keyboards/murcielago/rev1/config.h +++ b/keyboards/murcielago/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6166 // af -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0002 -#define MANUFACTURER elagil -#define PRODUCT Murciélago - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 6 diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index 0c5a34fdf5..7c0f4e087b 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7BA1 -#define PRODUCT_ID 0x3201 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MWStudio -#define PRODUCT AlickKK - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json new file mode 100644 index 0000000000..7a2f830273 --- /dev/null +++ b/keyboards/mwstudio/alicekk/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "AliceKK", + "manufacturer": "MWStudio", + "usb": { + "vid": "0x7BA1", + "pid": "0x3201", + "device_version": "0.0.1" + } +} diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h index 79798b1d66..e352a1ab92 100755 --- a/keyboards/neopad/config.h +++ b/keyboards/neopad/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0913 -#define MANUFACTURER rookiebwoy -#define PRODUCT neopad - /* Column/Row IO definitions */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h index aa85ce1975..299c28487d 100755 --- a/keyboards/neopad/rev1/config.h +++ b/keyboards/neopad/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json index b5868084d1..ef84eef161 100755 --- a/keyboards/neopad/rev1/info.json +++ b/keyboards/neopad/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "neopad", + "manufacturer": "rookiebwoy", "url": "https://github.com/rookiebwoy/neopad)", "maintainer": "rookiebwoy", + "usb": { + "vid": "0xFEED", + "pid": "0x0913", + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index a7f50b184f..83cc780d80 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -20,13 +20,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4E65 //'Ne' -#define PRODUCT_ID 0x700E // -#define DEVICE_VER 0x0001 -#define MANUFACTURER Neson Design -#define PRODUCT 700E Keyboard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index 270f1ed53c..4d4d427097 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "700E", + "manufacturer": "Neson Design", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4E65", + "pid": "0x700E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": diff --git a/keyboards/opendeck/32/info.json b/keyboards/opendeck/32/info.json index ad354e7506..8e22d925b1 100644 --- a/keyboards/opendeck/32/info.json +++ b/keyboards/opendeck/32/info.json @@ -1,5 +1,11 @@ { - "keyboard_name": "OpenDeck 32", + "keyboard_name": "OpenDeck32", + "manufacturer": "OpenDeck", + "usb": { + "vid": "0x4345", + "pid": "0x2EC0", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x8": { "layout": [ diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h index 73967671d0..6a87ad86b4 100644 --- a/keyboards/opendeck/32/rev1/config.h +++ b/keyboards/opendeck/32/rev1/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0x4345 -#define PRODUCT_ID 0x2EC0 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OpenDeck -#define PRODUCT OpenDeck32 - // Key matrix (TtB, LtR) #define MATRIX_ROWS 4 #define MATRIX_COLS 8 diff --git a/keyboards/pabile/p20/info.json b/keyboards/pabile/p20/info.json index 67e01dca85..e1fbb231ce 100644 --- a/keyboards/pabile/p20/info.json +++ b/keyboards/pabile/p20/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "P20", + "manufacturer": "Pabile", "url": "", "maintainer": "pabile", + "usb": { + "vid": "0x6666", + "pid": "0x6667" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h index 6b7ed83bd4..231e491d9b 100644 --- a/keyboards/pabile/p20/ver1/config.h +++ b/keyboards/pabile/p20/ver1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6666 -#define PRODUCT_ID 0x6667 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Pabile -#define PRODUCT P20 ver1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json new file mode 100644 index 0000000000..18b5e4bd2b --- /dev/null +++ b/keyboards/pabile/p20/ver1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "P20 ver1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h index f7b41099c4..13bce5132d 100644 --- a/keyboards/pabile/p20/ver2/config.h +++ b/keyboards/pabile/p20/ver2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6666 -#define PRODUCT_ID 0x6667 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Pabile -#define PRODUCT P20 ver2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/info.json new file mode 100644 index 0000000000..dae1f84edb --- /dev/null +++ b/keyboards/pabile/p20/ver2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "P20 ver2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index 847480b3e2..87221a81f8 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x03A8 -#define MANUFACTURER OLKB -#define PRODUCT Planck - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/planck/ez/base/info.json b/keyboards/planck/ez/base/info.json new file mode 100644 index 0000000000..07167a8c2a --- /dev/null +++ b/keyboards/planck/ez/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Planck EZ", + "usb": { + "pid": "0xC6CE" + } +} diff --git a/keyboards/planck/ez/base/rules.mk b/keyboards/planck/ez/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/planck/ez/base/rules.mk diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index d948fb5808..c9ed9e59ba 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -18,17 +18,6 @@ #pragma once -#undef VENDOR_ID -#define VENDOR_ID 0x3297 -#undef PRODUCT_ID -#define PRODUCT_ID 0xC6CE -#undef MANUFACTURER -#define MANUFACTURER ZSA Technology Labs -#undef PRODUCT -#define PRODUCT Planck EZ -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0000 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/planck/ez/glow/config.h b/keyboards/planck/ez/glow/config.h deleted file mode 100644 index 55ce289010..0000000000 --- a/keyboards/planck/ez/glow/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2018 Jack Humbert <jack.humb@gmail.com> - * Copyright 2015 ZSA Technology Labs Inc (@zsa) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0xC6CF - -#undef PRODUCT -#define PRODUCT Planck EZ Glow diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/info.json new file mode 100644 index 0000000000..4852258570 --- /dev/null +++ b/keyboards/planck/ez/glow/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Planck EZ Glow", + "usb": { + "pid": "0xC6CF" + } +} diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 6c9332b052..4008cb7057 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Planck EZ", + "manufacturer": "ZSA Technology Labs", "url": "https://ergodox-ez.com/pages/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x3297", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 61d3eb4d4f..47f140585b 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -29,3 +29,5 @@ RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no MOUSE_SHARED_EP = no + +DEFAULT_FOLDER = planck/ez/base diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json index a4710d781f..cc57b6da60 100644 --- a/keyboards/planck/info.json +++ b/keyboards/planck/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Planck", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", "layouts": { diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h index cc7f1fe940..67b42e8c08 100644 --- a/keyboards/planck/light/config.h +++ b/keyboards/planck/light/config.h @@ -2,11 +2,6 @@ #include "config_common.h" -#undef PRODUCT -#define PRODUCT Planck Light -#define PRODUCT_ID 0xBEA2 -#define DEVICE_VER 0x0001 - #undef MATRIX_ROW_PINS #undef MATRIX_COL_PINS diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json index 6169a8f991..d55de09d47 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Planck Light", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xBEA2", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev1/config.h b/keyboards/planck/rev1/config.h deleted file mode 100644 index 82f9acd8f9..0000000000 --- a/keyboards/planck/rev1/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0001 diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json index 04c6775042..2fcff227c6 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 1", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev2/config.h b/keyboards/planck/rev2/config.h deleted file mode 100644 index 09ec6c4470..0000000000 --- a/keyboards/planck/rev2/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0002 diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json index 42839397cb..5d4137a9d6 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 2", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h deleted file mode 100644 index a57e42dfbc..0000000000 --- a/keyboards/planck/rev3/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0003 diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json index 88a8741ad1..d9eaea8f41 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 3", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h deleted file mode 100644 index c802efa8d4..0000000000 --- a/keyboards/planck/rev4/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0004 diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json index 5c4d9af194..f5339f3671 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 4", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.4" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev5/config.h b/keyboards/planck/rev5/config.h deleted file mode 100644 index c2ff086f33..0000000000 --- a/keyboards/planck/rev5/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0005 diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index f5d667a507..4ade05c657 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 5", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 65d613048a..3879cb7690 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -17,10 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0xA4F9 -#define DEVICE_VER 0x0006 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json index 114a971294..bde896203f 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 6", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xA4F9", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index 6869997ae2..3cbee54de5 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -17,12 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0xA4F9 -#define DEVICE_VER 0x0006 -#undef MANUFACTURER -#define MANUFACTURER Drop - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json index 114a971294..cd8a932139 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 6", + "keyboard_name": "Planck", + "manufacturer": "Drop", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xA4F9", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h index 845ef60b08..8ee347d284 100644 --- a/keyboards/planck/thk/config.h +++ b/keyboards/planck/thk/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #include "config_common.h" -#define DEVICE_VER 0x0000 -#undef PRODUCT -#define PRODUCT Planck THK -#define PRODUCT_ID 0x25A7 // THK has a different pin-out #undef MATRIX_ROW_PINS diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index 70e1f0bd07..c8689737c0 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Planck THK", + "manufacturer": "OLKB", "maintainer": "Erovia", "url": "https://olkb.com/planck", + "usb": { + "vid": "0x03A8", + "pid": "0x25A7", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json index 0287b22a52..bb6a98939c 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Polilla", + "manufacturer": "elagil", "url": "", "maintainer": "elagil", + "usb": { + "vid": "0x6166", + "pid": "0x0010", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h index 8baa3b3162..4584a939fc 100644 --- a/keyboards/polilla/rev1/config.h +++ b/keyboards/polilla/rev1/config.h @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6166 // af -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER elagil -#define PRODUCT Polilla - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 63fa2d7433..13fbe46857 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x03A8 -#define MANUFACTURER OLKB -#define PRODUCT Preonic - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/preonic/info.json b/keyboards/preonic/info.json index e49e964577..76571d7ce8 100644 --- a/keyboards/preonic/info.json +++ b/keyboards/preonic/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Preonic", "url": "https://olkb.com/preonic", "maintainer": "jackhumbert", "layouts": { diff --git a/keyboards/preonic/rev1/config.h b/keyboards/preonic/rev1/config.h deleted file mode 100644 index a1091b10ed..0000000000 --- a/keyboards/preonic/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Jack Humbert <jack.humb@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "config_common.h" - -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x67F3 diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json new file mode 100644 index 0000000000..1a44f3a2d6 --- /dev/null +++ b/keyboards/preonic/rev1/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Preonic", + "manufacturer": "OLKB", + "usb": { + "vid": "0x03A8", + "pid": "0x67F3", + "device_version": "0.0.1" + } +} diff --git a/keyboards/preonic/rev2/config.h b/keyboards/preonic/rev2/config.h deleted file mode 100644 index a62fed4850..0000000000 --- a/keyboards/preonic/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Jack Humbert <jack.humb@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "config_common.h" - -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x67F3 diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json new file mode 100644 index 0000000000..5362084dc7 --- /dev/null +++ b/keyboards/preonic/rev2/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Preonic", + "manufacturer": "OLKB", + "usb": { + "vid": "0x03A8", + "pid": "0x67F3", + "device_version": "0.0.2" + } +} diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 700be3ae5f..5590ba0252 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -17,10 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT_ID 0xA649 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json index 8b7a65384e..1f13d480d2 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Preonic rev. 3", - "url": "https://olkb.com/preonic", - "maintainer": "jackhumbert", + "keyboard_name": "Preonic", + "manufacturer": "OLKB", + "usb": { + "vid": "0x03A8", + "pid": "0xA649", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_preonic_1x2uC": { "layout": [ diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index 5475108dad..5590ba0252 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -17,12 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT_ID 0xA649 -#undef MANUFACTURER -#define MANUFACTURER Drop - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json index 8b7a65384e..081d9e1983 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Preonic rev. 3", - "url": "https://olkb.com/preonic", - "maintainer": "jackhumbert", + "keyboard_name": "Preonic", + "manufacturer": "Drop", + "usb": { + "vid": "0x03A8", + "pid": "0xA649", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_preonic_1x2uC": { "layout": [ diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h index 343a9dc0bf..f1bd0090c7 100644 --- a/keyboards/primekb/prime_e/config.h +++ b/keyboards/primekb/prime_e/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5052 -#define MANUFACTURER PrimeKB - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index ee83f1bcbc..25f14ee9ce 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Prime_E", + "manufacturer": "PrimeKB", "url": "https://www.primekb.com", "maintainer": "holtenc", + "usb": { + "vid": "0x5052" + }, "layouts": { "LAYOUT": { "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1}, diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h index a562ffba81..89cf43902c 100644 --- a/keyboards/primekb/prime_e/rgb/config.h +++ b/keyboards/primekb/prime_e/rgb/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0052 -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_E RGB - #define RGB_DI_PIN B7 #define RGBLED_NUM 8 #define RGBLIGHT_ANIMATIONS diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json new file mode 100644 index 0000000000..1d40389e87 --- /dev/null +++ b/keyboards/primekb/prime_e/rgb/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Prime_E RGB", + "usb": { + "pid": "0x0052", + "device_version": "0.0.1" + } +} diff --git a/keyboards/primekb/prime_e/std/config.h b/keyboards/primekb/prime_e/std/config.h index a711e35b21..d6b242e08e 100644 --- a/keyboards/primekb/prime_e/std/config.h +++ b/keyboards/primekb/prime_e/std/config.h @@ -19,10 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0051 -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_E - #define BACKLIGHT_PIN B7 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/info.json new file mode 100644 index 0000000000..04f8842546 --- /dev/null +++ b/keyboards/primekb/prime_e/std/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Prime_E", + "usb": { + "pid": "0x0051", + "device_version": "0.0.1" + } +} diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h index 92cbe3f664..f6084f3280 100644 --- a/keyboards/primekb/prime_l/config.h +++ b/keyboards/primekb/prime_l/config.h @@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5052 -#define MANUFACTURER PrimeKB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json index ac537202f3..88a2cdb065 100644 --- a/keyboards/primekb/prime_l/info.json +++ b/keyboards/primekb/prime_l/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Prime_L", + "manufacturer": "PrimeKB", "url": "https://www.primekb.com", "maintainer": "MxBlu", + "usb": { + "vid": "0x5052" + }, "layouts": { "LAYOUT": { "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}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"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}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/primekb/prime_l/v1/config.h b/keyboards/primekb/prime_l/v1/config.h index 73f5cf8f30..e5a2f04158 100644 --- a/keyboards/primekb/prime_l/v1/config.h +++ b/keyboards/primekb/prime_l/v1/config.h @@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x504C -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_L V1 - /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 } #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json index ac537202f3..628aa67c10 100644 --- a/keyboards/primekb/prime_l/v1/info.json +++ b/keyboards/primekb/prime_l/v1/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Prime_L", + "keyboard_name": "Prime_L V1", "url": "https://www.primekb.com", "maintainer": "MxBlu", + "usb": { + "pid": "0x504C", + "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":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":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"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}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/primekb/prime_l/v2/config.h b/keyboards/primekb/prime_l/v2/config.h index 09d765ce26..d479a57f66 100644 --- a/keyboards/primekb/prime_l/v2/config.h +++ b/keyboards/primekb/prime_l/v2/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x5042 -#define DEVICE_VER 0x0002 -#define PRODUCT Prime_L V2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/info.json index b8033eae30..7199de33f6 100644 --- a/keyboards/primekb/prime_l/v2/info.json +++ b/keyboards/primekb/prime_l/v2/info.json @@ -2,6 +2,10 @@ "keyboard_name": "Prime_L V2", "url": "https://www.primekb.com", "maintainer": "HoltenC", + "usb": { + "pid": "0x5042", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "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}, {"x":14, "y":0}, {"x":15, "y":0}, diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h index c9ce4a9ac6..efb27f7fb2 100644 --- a/keyboards/program_yoink/config.h +++ b/keyboards/program_yoink/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7079 -#define DEVICE_VER 0x0001 -#define MANUFACTURER melonbred - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/program_yoink/ortho/config.h b/keyboards/program_yoink/ortho/config.h deleted file mode 100644 index 7620643f1a..0000000000 --- a/keyboards/program_yoink/ortho/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 melonbred - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#define PRODUCT_ID 0xF10C -#define PRODUCT Program Yoink! Ortho diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json index 7d7d4ef230..c73b4cc030 100644 --- a/keyboards/program_yoink/ortho/info.json +++ b/keyboards/program_yoink/ortho/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "program_yoink", + "keyboard_name": "Program Yoink! Ortho", + "manufacturer": "melonbred", "url": "", "maintainer": "melonbred", + "usb": { + "vid": "0x7079", + "pid": "0xF10C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho": { "layout": [ diff --git a/keyboards/program_yoink/staggered/config.h b/keyboards/program_yoink/staggered/config.h deleted file mode 100644 index a0da031525..0000000000 --- a/keyboards/program_yoink/staggered/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 melonbred - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#define PRODUCT_ID 0xF10B -#define PRODUCT Program Yoink! Staggered diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json index cc73feeb43..cc488e4a8f 100644 --- a/keyboards/program_yoink/staggered/info.json +++ b/keyboards/program_yoink/staggered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "program_yoink", + "keyboard_name": "Program Yoink! Staggered", + "manufacturer": "melonbred", "url": "", "maintainer": "melonbred", + "usb": { + "vid": "0x7079", + "pid": "0xF10B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h index 486956989d..550b2ffee0 100644 --- a/keyboards/ramonimbao/tkl_ff/config.h +++ b/keyboards/ramonimbao/tkl_ff/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB16B -#define PRODUCT_ID 0x00FF -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ramon Imbao -#define PRODUCT TKL FF - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json index fd71d3f990..a3a22e34d8 100644 --- a/keyboards/ramonimbao/tkl_ff/info.json +++ b/keyboards/ramonimbao/tkl_ff/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "TKL FF", + "manufacturer": "Ramon Imbao", "url": "", "maintainer": "Ramon Imbao", + "usb": { + "vid": "0xB16B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/tkl_ff/rules.mk b/keyboards/ramonimbao/tkl_ff/rules.mk index 1275531ef6..36c8b4137b 100644 --- a/keyboards/ramonimbao/tkl_ff/rules.mk +++ b/keyboards/ramonimbao/tkl_ff/rules.mk @@ -16,3 +16,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = ramonimbao/tkl_ff/v1 diff --git a/keyboards/ramonimbao/tkl_ff/v1/info.json b/keyboards/ramonimbao/tkl_ff/v1/info.json new file mode 100644 index 0000000000..3370446f2d --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x00FF" + } +} diff --git a/keyboards/ramonimbao/tkl_ff/v1/rules.mk b/keyboards/ramonimbao/tkl_ff/v1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v1/rules.mk diff --git a/keyboards/ramonimbao/tkl_ff/v2/config.h b/keyboards/ramonimbao/tkl_ff/v2/config.h index a35d1bc599..906f38813a 100644 --- a/keyboards/ramonimbao/tkl_ff/v2/config.h +++ b/keyboards/ramonimbao/tkl_ff/v2/config.h @@ -17,9 +17,6 @@ #include "config_common.h" -#undef PRODUCT_ID -#define PRODUCT_ID 0x10FF - #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/ramonimbao/tkl_ff/v2/info.json b/keyboards/ramonimbao/tkl_ff/v2/info.json new file mode 100644 index 0000000000..ed70ec408c --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x10FF" + } +} diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h index 1bc8eb7fdf..655c6898a0 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4446 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT Ratio65 Rev A HotSwap - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/rationalist/ratio65_hotswap/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json index 709e929fa0..8616062b72 100644 --- a/keyboards/rationalist/ratio65_hotswap/info.json +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Ratio65_HotSwap", + "keyboard_name": "Ratio65 Hotswap Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4446", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "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":"Delete", "x":15, "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":"Insert", "x":15, "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":"PgUp", "x":15, "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}, {"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}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "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":"Win", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/rationalist/ratio65_solder/rev_a/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h index 824ebd3cb7..9a4a6d1357 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/config.h +++ b/keyboards/rationalist/ratio65_solder/rev_a/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4446 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 4pplet -#define PRODUCT Ratio65 Rev A Solder - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/rationalist/ratio65_solder/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json index e083099bde..ec846e517c 100644 --- a/keyboards/rationalist/ratio65_solder/info.json +++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Ratio65_Solder", + "keyboard_name": "Ratio65 Solder Rev A", + "manufacturer": "4pplet", "url": "", "maintainer": "4pplet", + "usb": { + "vid": "0x4446", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "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":"~", "x":13, "y":0}, {"label":"Back", "x":14, "y":0}, {"label":"Del", "x":15, "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":"Insert", "x":15, "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":"Nuhs", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Nubs", "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}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "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":"Win", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json new file mode 100644 index 0000000000..ad889c2304 --- /dev/null +++ b/keyboards/redox/rev1/base/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/redox/rev1/base/rules.mk b/keyboards/redox/rev1/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/redox/rev1/base/rules.mk diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 95c4e3cbbf..72874b66f5 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D44 // "MD" -#define PRODUCT_ID 0x5244 // "RD" -#define DEVICE_VER 0x0100 -#define MANUFACTURER Falbatech -#define PRODUCT The Redox Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/redox/info.json b/keyboards/redox/rev1/info.json index e404d195e4..bceac88bb0 100644 --- a/keyboards/redox/info.json +++ b/keyboards/redox/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Redox", + "manufacturer": "Falbatech", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4D44", + "pid": "0x5244", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index eec50ab879..56cdb88126 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -5,10 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#undef DEVICE_VER -#define DEVICE_VER 0x0101 // added 1 for the rev1 + proton c - // wiring of each half #undef MATRIX_ROW_PINS #define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 } diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json new file mode 100644 index 0000000000..62a27157ad --- /dev/null +++ b/keyboards/redox/rev1/proton_c/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.1" + } +} diff --git a/keyboards/redox/rev1/rules.mk b/keyboards/redox/rev1/rules.mk index e69de29bb2..c971da1680 100644 --- a/keyboards/redox/rev1/rules.mk +++ b/keyboards/redox/rev1/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = redox/rev1/base diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk index 1ce6f56efe..181027c417 100644 --- a/keyboards/redox/rules.mk +++ b/keyboards/redox/rules.mk @@ -19,7 +19,7 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = redox/rev1 +DEFAULT_FOLDER = redox/rev1/base # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index de658eb93c..0c39127af5 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -11,12 +11,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3535 -#define PRODUCT_ID 0x3505 -#define MANUFACTURER RGBKB -#define PRODUCT Mün - /* Matrix Configuration - Rows are doubled up */ #define MATRIX_ROWS 14 // Last pins reserved for encoder / touch encoder support diff --git a/keyboards/rgbkb/mun/rev1/config.h b/keyboards/rgbkb/mun/rev1/config.h deleted file mode 100644 index 7ff0b54903..0000000000 --- a/keyboards/rgbkb/mun/rev1/config.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * <https://github.com/Legonut> wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. David Rauseo - * ---------------------------------------------------------------------------- - */ - -#pragma once - -#define DEVICE_VER 0x0001 diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index 72cd7be9f0..8b16bd4542 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mun", + "keyboard_name": "Mün", + "manufacturer": "RGBKB", "url": "https://www.rgbkb.net/products/mun", "maintainer": "Legonut", + "usb": { + "vid": "0x3535", + "pid": "0x3505", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h index 43c534ca92..5b6ca7e876 100644 --- a/keyboards/rgbkb/pan/config.h +++ b/keyboards/rgbkb/pan/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x5247 // "RG" - RGBKB -#define PRODUCT_ID 0x8C9C // Pan -#define DEVICE_VER 0x0002 -#define MANUFACTURER RGBKB -#define PRODUCT Pan - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json index 54ac24a3a4..524eec0da8 100644 --- a/keyboards/rgbkb/pan/info.json +++ b/keyboards/rgbkb/pan/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "RGBKB Pan", + "keyboard_name": "Pan", + "manufacturer": "RGBKB", "url": "https://www.rgbkb.net/collections/all/products/pan-keyboard-diy-kit", "maintainer": "Legonut", + "usb": { + "vid": "0x5247", + "pid": "0x8C9C", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h index 14518a755d..3e08848f6b 100644 --- a/keyboards/rgbkb/sol/rev1/config.h +++ b/keyboards/rgbkb/sol/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER RGBKB -#define PRODUCT Sol - /* ws2812 RGB LED */ #define RGB_DI_PIN B3 diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index 33e6625fe4..2a611f7a6a 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Sol", + "manufacturer": "RGBKB", "url": "", "maintainer": "Legonut", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index f0c71db34e..cdaf9c0536 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0002 -#define MANUFACTURER RGBKB -#define PRODUCT Sol - /* ws2812 RGB LED */ #define RGB_DI_PIN B7 diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index 33e6625fe4..bd1bba3d72 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Sol", + "manufacturer": "RGBKB", "url": "", "maintainer": "Legonut", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 92db3def6b..20435a159a 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -11,12 +11,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3535 -#define PRODUCT_ID 0x3510 -#define MANUFACTURER RGBKB -#define PRODUCT Sol 3 - /* Matrix Configuration - Rows are doubled up */ #define MATRIX_ROWS 12 // Last pins reserved for encoder / touch encoder support diff --git a/keyboards/rgbkb/sol3/rev1/config.h b/keyboards/rgbkb/sol3/rev1/config.h deleted file mode 100644 index 7ff0b54903..0000000000 --- a/keyboards/rgbkb/sol3/rev1/config.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * <https://github.com/Legonut> wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. David Rauseo - * ---------------------------------------------------------------------------- - */ - -#pragma once - -#define DEVICE_VER 0x0001 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index 7003726b7f..b8a8e5015a 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Sol 3 rev1", + "keyboard_name": "Sol 3", + "manufacturer": "RGBKB", "url": "", "maintainer": "XScorpion2, rgbkb", + "usb": { + "vid": "0x3535", + "pid": "0x3510", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h index 31bfe2bcbe..e1d1212bbc 100644 --- a/keyboards/rgbkb/zen/rev1/config.h +++ b/keyboards/rgbkb/zen/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Legonut -#define PRODUCT Project Zen - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json index 2a78ba0297..cdd6497139 100644 --- a/keyboards/rgbkb/zen/rev1/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Zen", + "keyboard_name": "Project Zen", + "manufacturer": "Legonut", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "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":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}] diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index 93c1b3f200..685577b6c7 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3061 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Legonut -#define PRODUCT "Project Zen" - /* key matrix size */ // Rows are doubled-up diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json index 53baefe22d..3c80032407 100644 --- a/keyboards/rgbkb/zen/rev2/info.json +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Zen", + "keyboard_name": "Project Zen", + "manufacturer": "Legonut", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3061", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h index 19fd28d2ec..3835a3e705 100644 --- a/keyboards/rgbkb/zygomorph/rev1/config.h +++ b/keyboards/rgbkb/zygomorph/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER RGBKB -#define PRODUCT Zygomorph - /* Select hand configuration */ #define EE_HANDS diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index ef8db5d02a..50155da240 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Zygomorph", + "manufacturer": "RGBKB", "url": "https://www.rgbkb.net/pages/introducing-the-zygomorph-keyboard", "maintainer": "Legonut", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x12": { "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":7, "y":0}, {"label":"7", "x":8, "y":0}, {"label":"8", "x":9, "y":0}, {"label":"9", "x":10, "y":0}, {"label":"0", "x":11, "y":0}, {"label":"BKSP", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":7, "y":1}, {"label":"U", "x":8, "y":1}, {"label":"I", "x":9, "y":1}, {"label":"O", "x":10, "y":1}, {"label":"P", "x":11, "y":1}, {"label":"\\|", "x":12, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":";:", "x":11, "y":2}, {"label":"'\"", "x":12, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":",<", "x":9, "y":3}, {"label":".>", "x":10, "y":3}, {"label":"/?", "x":11, "y":3}, {"label":"Enter", "x":12, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Super", "x":2, "y":4}, {"label":"RGB", "x":3, "y":4}, {"label":"⇓", "x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"label":"FN", "x":8, "y":4}, {"label":"Left", "x":9, "y":4}, {"label":"Down", "x":10, "y":4}, {"label":"Up", "x":11, "y":4}, {"label":"Right", "x":12, "y":4}] diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index a74cd25c29..e6cddb0a5b 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB5F -#define DEVICE_VER 0x0007 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT 7skb - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/7skb/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index f85f32cb6d..7bd508ed7f 100644 --- a/keyboards/salicylic_acid3/7skb/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "7skb", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB5F", + "device_version": "0.0.7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index 740a9f3fbd..a039848af9 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0013 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT getta25 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/getta25/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index 980b5142db..23354552ea 100644 --- a/keyboards/salicylic_acid3/getta25/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Getta25", + "keyboard_name": "getta25", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index ee5f2ca0bc..9b30c9a242 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB4F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT jisplit89 - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index 4f138a5262..1279d2475e 100644 --- a/keyboards/salicylic_acid3/jisplit89/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "jisplit89", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB4F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index faeb719019..2cc4a46674 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE8BA -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked48 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 12 diff --git a/keyboards/salicylic_acid3/naked48/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index 8186a6ba5b..fd4639c5cc 100644 --- a/keyboards/salicylic_acid3/naked48/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Naked48", + "keyboard_name": "naked48", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xE8BA", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h index b754095011..3f4e663b2d 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/config.h +++ b/keyboards/salicylic_acid3/naked60/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB5C -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 12 diff --git a/keyboards/salicylic_acid3/naked60/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json index 8ec020ae72..30b1def9aa 100644 --- a/keyboards/salicylic_acid3/naked60/info.json +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Naked60", + "keyboard_name": "naked60", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB5C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index b4699a9ca2..0bc5656fea 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0003 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked64 - /* key matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/naked64/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json index 887f43b087..c8fe578271 100644 --- a/keyboards/salicylic_acid3/naked64/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Naked64", + "keyboard_name": "naked64", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 742a8d73d0..697e7a7d49 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0011 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT setta21 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/setta21/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index 46c06613a8..aa101e7a13 100644 --- a/keyboards/salicylic_acid3/setta21/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "setta21", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.1" + }, "layouts": { "LAYOUT_numpad_6x4": { "layout": [ diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h index 07fe864df3..25baca4b88 100644 --- a/keyboards/sentraq/s60_x/default/config.h +++ b/keyboards/sentraq/s60_x/default/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq -#define PRODUCT S60-X - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json new file mode 100644 index 0000000000..3f0110679d --- /dev/null +++ b/keyboards/sentraq/s60_x/default/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "S60-X" +} diff --git a/keyboards/sentraq/s60_x/info.json b/keyboards/sentraq/s60_x/info.json index 6d664193c5..424c576c72 100644 --- a/keyboards/sentraq/s60_x/info.json +++ b/keyboards/sentraq/s60_x/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "S60-X", + "manufacturer": "Sentraq", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index ad44cb80fc..0ab4093862 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq -#define PRODUCT S60-X-RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json new file mode 100644 index 0000000000..bcee4ef9db --- /dev/null +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "S60-X-RGB" +} diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h index bfe83ba52c..ce3ddc7b86 100644 --- a/keyboards/smithrune/iron165r2/config.h +++ b/keyboards/smithrune/iron165r2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8384 // SR for Smith and RUne -#define PRODUCT_ID 0x1652 // 165 rev 2 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SmithRune -#define PRODUCT Iron156R2 - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json new file mode 100644 index 0000000000..0d42363728 --- /dev/null +++ b/keyboards/smithrune/iron165r2/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Iron165R2", + "manufacturer": "SmithRune", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x8384", + "pid": "0x1652", + "device_version": "0.0.1" + } +} diff --git a/keyboards/splitkb/kyria/info.json b/keyboards/splitkb/kyria/info.json index d362e4ad72..2bc52803b0 100644 --- a/keyboards/splitkb/kyria/info.json +++ b/keyboards/splitkb/kyria/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Kyria", + "manufacturer": "splitkb", "url": "https://splitkb.com", "maintainer": "splitkb.com", + "usb": { + "vid": "0x8D1D", + "pid": "0x9D9D" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 87ec1021bf..f6f9a98c3e 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8D1D -#define PRODUCT_ID 0x9D9D -#define DEVICE_VER 0x0001 -#define MANUFACTURER splitkb -#define PRODUCT Kyria rev1 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json new file mode 100644 index 0000000000..8e34af43f5 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kyria rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 15e4e7bd3b..6af99e0a7c 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8D1D -#define PRODUCT_ID 0x9D9D -#define DEVICE_VER 0x0002 -#define MANUFACTURER splitkb -#define PRODUCT Kyria rev2 - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json new file mode 100644 index 0000000000..7ff56b321a --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kyria rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h index accc0d2b43..2e598b1d95 100644 --- a/keyboards/studiokestra/galatea/config.h +++ b/keyboards/studiokestra/galatea/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define MANUFACTURER Studio Kestra -#define PRODUCT Galatea - #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/studiokestra/galatea/rev1/config.h b/keyboards/studiokestra/galatea/rev1/config.h deleted file mode 100644 index 9f8fb44f9a..0000000000 --- a/keyboards/studiokestra/galatea/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define PRODUCT_ID 0x8801 -#define DEVICE_VER 0x0001 diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json index e3f31198fe..2b832d7fc7 100644 --- a/keyboards/studiokestra/galatea/rev1/info.json +++ b/keyboards/studiokestra/galatea/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Galatea", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/galatea", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x8801", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h deleted file mode 100644 index 4e0170a0f9..0000000000 --- a/keyboards/studiokestra/galatea/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define PRODUCT_ID 0x8802 -#define DEVICE_VER 0x0002 diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index e3f31198fe..9954a96274 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Galatea", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/galatea", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x8802", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index 04a431f9f3..3c4b8dd2a8 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "namecard2x4", + "manufacturer": "takashiski", "url": "https://skyhigh-works.hatenablog.com/", "maintainer": "takashiski", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h index 74373a5752..22d86c3bfa 100644 --- a/keyboards/takashiski/namecard2x4/rev1/config.h +++ b/keyboards/takashiski/namecard2x4/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT namecard2x4 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h index 4bb4a1fcde..8ba5a6a6bb 100644 --- a/keyboards/takashiski/namecard2x4/rev2/config.h +++ b/keyboards/takashiski/namecard2x4/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER takashiski -#define PRODUCT namecard2x4 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h index f926f644e3..a829fda5be 100755 --- a/keyboards/tau4/config.h +++ b/keyboards/tau4/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER taukeyboards -#define PRODUCT tau4 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json new file mode 100644 index 0000000000..9ec48383c7 --- /dev/null +++ b/keyboards/tau4/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "tau4", + "manufacturer": "taukeyboards", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + } +} diff --git a/keyboards/the_uni/info.json b/keyboards/the_uni/info.json index a8b5a1b5cc..b7cb80957e 100644 --- a/keyboards/the_uni/info.json +++ b/keyboards/the_uni/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "The Uni", + "manufacturer": "stenokeyboards", "url": "https://www.stenokeyboards.com", "maintainer": "qmk", + "usb": { + "vid": "0x9000", + "pid": "0x0001" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/the_uni/pro_micro/config.h b/keyboards/the_uni/pro_micro/config.h index 61a866d8db..dc0493face 100644 --- a/keyboards/the_uni/pro_micro/config.h +++ b/keyboards/the_uni/pro_micro/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x9000 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER stenokeyboards -#define PRODUCT The Uni - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 11 diff --git a/keyboards/the_uni/pro_micro/info.json b/keyboards/the_uni/pro_micro/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/the_uni/pro_micro/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/the_uni/usb_c/config.h b/keyboards/the_uni/usb_c/config.h index c45b450838..02b6ad5a1f 100644 --- a/keyboards/the_uni/usb_c/config.h +++ b/keyboards/the_uni/usb_c/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x9000 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0002 -#define MANUFACTURER stenokeyboards -#define PRODUCT The Uni - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 11 diff --git a/keyboards/the_uni/usb_c/info.json b/keyboards/the_uni/usb_c/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/the_uni/usb_c/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h index 143cf4e6ba..c0f6ac5811 100644 --- a/keyboards/thevankeyboards/jetvan/config.h +++ b/keyboards/thevankeyboards/jetvan/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEAE -#define PRODUCT_ID 0x8858 -#define DEVICE_VER 0x0001 -#define MANUFACTURER evangs -#define PRODUCT JetVan - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json new file mode 100644 index 0000000000..f017d743dd --- /dev/null +++ b/keyboards/thevankeyboards/jetvan/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "JetVan", + "manufacturer": "evangs", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEAE", + "pid": "0x8858", + "device_version": "0.0.1" + } +} diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index b2b6008240..f9e9460b88 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -18,10 +18,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7812 #define DEVICE_VER 0x0001 -#define MANUFACTURER tkw #define PRODUCT Grandiceps Split /* key matrix size */ diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 7a4324ffdc..dc4cf5a0ee 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -1,8 +1,11 @@ { - "keyboard_name": "grandiceps", + "manufacturer": "tkw", "url": "https://github.com/vattern/grandiceps", "maintainer": "vattern", - "manufacturer": "tkw", + "usb": { + "vid": "0xFEED", + "pid": "0x7812" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkw/grandiceps/rev1/info.json b/keyboards/tkw/grandiceps/rev1/info.json new file mode 100644 index 0000000000..34d2a94743 --- /dev/null +++ b/keyboards/tkw/grandiceps/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Grandiceps Split", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/tkw/grandiceps/rev1/rules.mk b/keyboards/tkw/grandiceps/rev1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/tkw/grandiceps/rev1/rules.mk diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h index 98b762087e..5810fe75bc 100644 --- a/keyboards/tkw/grandiceps/rev2/config.h +++ b/keyboards/tkw/grandiceps/rev2/config.h @@ -15,10 +15,5 @@ */ #pragma once -#undef DEVICE_VER -#define DEVICE_VER 0x0002 -#undef PRODUCT -#define PRODUCT Grandiceps Split rev2 - #define SPLIT_HAND_PIN B3 #define EEPROM_I2C_24LC64 diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/info.json new file mode 100644 index 0000000000..786f381c4f --- /dev/null +++ b/keyboards/tkw/grandiceps/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Grandiceps Split rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 8274edd22d..2220b16252 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -26,3 +26,5 @@ OLED_ENABLE = yes OLED_DRIVER = SSD1306 WS2812_DRIVER = pwm OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE + +DEFAULT_FOLDER = tkw/grandiceps/rev1 diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h index 7abeaa1810..e5715bdbce 100644 --- a/keyboards/tominabox1/le_chiffre/config.h +++ b/keyboards/tominabox1/le_chiffre/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7431 -#define PRODUCT_ID 0xD645 - -#define MANUFACTURER tominabox1 -#define PRODUCT Le Chiffre - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/tominabox1/le_chiffre/he/config.h b/keyboards/tominabox1/le_chiffre/he/config.h index 495cdbbd99..b0b471ac08 100644 --- a/keyboards/tominabox1/le_chiffre/he/config.h +++ b/keyboards/tominabox1/le_chiffre/he/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 - - /* COL2ROW, ROW2COL*/ #undef DIODE_DIRECTION #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json new file mode 100644 index 0000000000..b377cdff00 --- /dev/null +++ b/keyboards/tominabox1/le_chiffre/he/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json index afcbc752a5..6a7e10fad7 100644 --- a/keyboards/tominabox1/le_chiffre/info.json +++ b/keyboards/tominabox1/le_chiffre/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "le_chiffre", + "keyboard_name": "Le Chiffre", + "manufacturer": "tominabox1", "url": "", "maintainer": "tominabox1", + "usb": { + "vid": "0x7431", + "pid": "0xD645" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0, "w":1}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, diff --git a/keyboards/tominabox1/le_chiffre/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h index 220d5b27e0..78609df05e 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/config.h +++ b/keyboards/tominabox1/le_chiffre/rev1/config.h @@ -17,9 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/tominabox1/le_chiffre/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/tominabox1/le_chiffre/rev2/config.h b/keyboards/tominabox1/le_chiffre/rev2/config.h index 29a4c0bcc3..bdff4120d6 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/config.h +++ b/keyboards/tominabox1/le_chiffre/rev2/config.h @@ -17,8 +17,6 @@ #include "config_common.h" -#define DEVICE_VER 0x0002 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/tominabox1/le_chiffre/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tronguylabs/m122_3270/blackpill/config.h b/keyboards/tronguylabs/m122_3270/blackpill/config.h index 53c3ad73e4..03d97de30e 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/config.h +++ b/keyboards/tronguylabs/m122_3270/blackpill/config.h @@ -22,6 +22,3 @@ // rows are inputs). Note that every usable I/O pin is used. #define MATRIX_COL_PINS { B0, B1, B10, B12, B13, B14, B15, A8, A7, A10, A6, A5, A15, B3, B4, B5, B6, B7, B8, B9 } #define MATRIX_ROW_PINS { C13, C14, C15, A0, A1, A2, A3, A4 } - -// The BlackPill version is version 2 -#define DEVICE_VER 0x0002 diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tronguylabs/m122_3270/bluepill/config.h b/keyboards/tronguylabs/m122_3270/bluepill/config.h index f59eaaacb6..c8cf8523f6 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/config.h +++ b/keyboards/tronguylabs/m122_3270/bluepill/config.h @@ -24,6 +24,3 @@ // rows are inputs). Note that every usable I/O pin is used. #define MATRIX_COL_PINS { B1, B10, B11, B12, B13, B14, B15, A8, B0, A10, A7, A6, A15, B3, B4, B5, B6, B7, B8, B9 } #define MATRIX_ROW_PINS { C13, C14, C15, A1, A2, A3, A4, A5 } - -// The BluePill version is version 3 -#define DEVICE_VER 0x0003 diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json new file mode 100644 index 0000000000..b377cdff00 --- /dev/null +++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h index 98359e6cc4..801fc9ee50 100644 --- a/keyboards/tronguylabs/m122_3270/config.h +++ b/keyboards/tronguylabs/m122_3270/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0x3270 -#define MANUFACTURER IBM -#define PRODUCT Model M PC/3270 122 key - // Both controllers draw 100 mA or less #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json index cddc24ea9c..f6fba523d6 100644 --- a/keyboards/tronguylabs/m122_3270/info.json +++ b/keyboards/tronguylabs/m122_3270/info.json @@ -1,6 +1,11 @@ { - "keyboard_name": "IBM Model M PC/3270 122 key", + "keyboard_name": "Model M PC/3270 122 key", + "manufacturer": "IBM", "maintainer": "jmaynard", + "usb": { + "vid": "0x1209", + "pid": "0x3270" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tronguylabs/m122_3270/teensy/config.h b/keyboards/tronguylabs/m122_3270/teensy/config.h index 33590b4064..b105ecad52 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/config.h +++ b/keyboards/tronguylabs/m122_3270/teensy/config.h @@ -20,6 +20,3 @@ // avoiding the LED on PD6 #define MATRIX_COL_PINS { B5, B6, B7, D0, D1, D2, D3, D4, D5, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 } #define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 } - -// The Teensy version is version 1 -#define DEVICE_VER 0x0001 diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/tronguylabs/m122_3270/teensy/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index 08f4d5ebf7..fa1a563970 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/classic_ultracl_post_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h index d5fa9cf2f3..ad7668bdea 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index bedbca4f36..d7f8e9dcbf 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/classic_ultracl_pre_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5, "w":1.25}, {"x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.25}, {"x":12.25, "y":5.5, "w":1.25}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h index d5fa9cf2f3..ad7668bdea 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index 766a93e6c6..bfc60adfaf 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/spacesaver_m_post_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h index cf78172d43..ddd8ef6e9c 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index e912d82ead..3ce16d2c09 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "unicomp/spacesaver_m_pre_2013", + "keyboard_name": "Unicomp Spacesaver M", + "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5, "w":1.25}, {"x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":4.75}, {"x":9.75, "y":5.5, "w":1.25}, {"x":11, "y":5.5, "w":1.25}, {"x":12.25, "y":5.5, "w":1.25}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}] diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h index cf78172d43..ddd8ef6e9c 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unicomp/Purdea Andrei -#define PRODUCT Unicomp Spacesaver M #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" /* key matrix size */ diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 4da4f02aa9..d8f474257e 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER nrtkbb -#define PRODUCT uzu42 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/uzu42/info.json b/keyboards/uzu42/rev1/info.json index a4903077ca..f96564f36b 100644 --- a/keyboards/uzu42/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "uzu42", + "manufacturer": "nrtkbb", "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42", "maintainer": "nrtkbb", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h index 96534c80c7..1d4d028e9f 100644 --- a/keyboards/westm/westm68/config.h +++ b/keyboards/westm/westm68/config.h @@ -21,12 +21,6 @@ /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x574D // WM -#define DEVICE_VER 0x0001 -#define MANUFACTURER WestM -#define PRODUCT WestM68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json index 58378c1b43..f7f67d45a0 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "WestM68", + "manufacturer": "WestM", "url": "https://github.com/WestMProducts", "maintainer": "WestM", + "usb": { + "vid": "0x574D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h index 488d644c3e..054b47cca2 100644 --- a/keyboards/westm/westm68/rev1/config.h +++ b/keyboards/westm/westm68/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0101 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN A8 #define RGBLED_NUM 16 diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json new file mode 100644 index 0000000000..a4736b30a4 --- /dev/null +++ b/keyboards/westm/westm68/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0101" + } +} diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h index 94ce14d3f9..054b47cca2 100644 --- a/keyboards/westm/westm68/rev2/config.h +++ b/keyboards/westm/westm68/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0102 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN A8 #define RGBLED_NUM 16 diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json new file mode 100644 index 0000000000..0b36e6dd58 --- /dev/null +++ b/keyboards/westm/westm68/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0102" + } +} diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h index 4175b5b3f8..6d0bf729ac 100644 --- a/keyboards/westm/westm9/config.h +++ b/keyboards/westm/westm9/config.h @@ -21,12 +21,6 @@ /* Ensure we jump to bootloader if the RESET keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x574D // WM -#define DEVICE_VER 0x0001 -#define MANUFACTURER WestM -#define PRODUCT WestM9 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 5c36e74ab4..3beb8b232f 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "WestM9", + "manufacturer": "WestM", "url": "https://github.com/WestMProducts", "maintainer": "WestM", + "usb": { + "vid": "0x574D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_macropad": { "layout": [ diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h index 48ed5d6869..fcc9ddb99d 100644 --- a/keyboards/westm/westm9/rev1/config.h +++ b/keyboards/westm/westm9/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0301 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN F1 #define RGBLED_NUM 14 diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json new file mode 100644 index 0000000000..9934337227 --- /dev/null +++ b/keyboards/westm/westm9/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0301" + } +} diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h index 84a7589360..fcc9ddb99d 100644 --- a/keyboards/westm/westm9/rev2/config.h +++ b/keyboards/westm/westm9/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -#define PRODUCT_ID 0x0302 - // The pin connected to the data pin of the LEDs #define RGB_DI_PIN F1 #define RGBLED_NUM 14 diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json new file mode 100644 index 0000000000..3b2f219948 --- /dev/null +++ b/keyboards/westm/westm9/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x0302" + } +} diff --git a/keyboards/whale/sk/config.h b/keyboards/whale/sk/config.h index a3989df890..4c2b9c23ff 100644 --- a/keyboards/whale/sk/config.h +++ b/keyboards/whale/sk/config.h @@ -17,7 +17,3 @@ #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0495 diff --git a/keyboards/whale/sk/v3/config.h b/keyboards/whale/sk/v3/config.h index fc1e4ffeff..64fc622203 100644 --- a/keyboards/whale/sk/v3/config.h +++ b/keyboards/whale/sk/v3/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define MANUFACTURER Whale Mo -#define PRODUCT Splite Keyboard v3 - /* key matrix size */ /* Notice: HALF of row on the slave side */ #define MATRIX_ROWS 12 diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json index b0a07088b1..8ba2a34311 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Splite Keyboard v3", + "manufacturer": "Whale Mo", "url": "https://github.com/ncwhale/Keyboard_Design/tree/master/Splite-Keyboard-v3", "maintainer": "ncwhale", + "usb": { + "vid": "0xFEED", + "pid": "0x0495", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json index 346422b92a..24eba75384 100644 --- a/keyboards/xelus/dawn60/info.json +++ b/keyboards/xelus/dawn60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dawn60", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x0060", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_60_all": "LAYOUT_all" }, diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h index 1db0af867e..4b3a1641b9 100644 --- a/keyboards/xelus/dawn60/rev1/config.h +++ b/keyboards/xelus/dawn60/rev1/config.h @@ -17,12 +17,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x0060 // Dawn60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Dawn60 // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h index 08fef5d7f3..11c59f8847 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/config.h +++ b/keyboards/xelus/dawn60/rev1_qmk/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x0060 // Dawn60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Dawn60 - // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json index 3a0582fc7f..241f1cbe44 100644 --- a/keyboards/xelus/rs60/info.json +++ b/keyboards/xelus/rs60/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "RS60", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5253" + }, "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h index 23372d72eb..00fbf6712b 100644 --- a/keyboards/xelus/rs60/rev1/config.h +++ b/keyboards/xelus/rs60/rev1/config.h @@ -15,13 +15,6 @@ */ #pragma once -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5253 // RS60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT RS60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/xelus/rs60/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/xelus/rs60/rev2/config.h b/keyboards/xelus/rs60/rev2/config.h index 65ac383189..71eb5fb262 100644 --- a/keyboards/xelus/rs60/rev2/config.h +++ b/keyboards/xelus/rs60/rev2/config.h @@ -15,13 +15,6 @@ */ #pragma once -// USB Device descriptor parameter -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5253 // RS60 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Xelus -#define PRODUCT RS60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xelus/rs60/rev2/info.json b/keyboards/xelus/rs60/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/xelus/rs60/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 26e418943f..e9876f8c64 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "XD004", + "manufacturer": "XIUDI", "maintainer": "qmk", + "usb": { + "vid": "0x7844", + "pid": "0x0404", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}] diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 559699e159..b2e36f4704 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -25,14 +25,6 @@ where some things are disabled to save space as well. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x0404 -#define DEVICE_VER 0x0001 -// Note: unsure about manufacturer -#define MANUFACTURER XIUDI -#define PRODUCT XD004 v1 - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 4 diff --git a/keyboards/xiudi/xd60/info.json b/keyboards/xiudi/xd60/info.json index 8ea3d6a4ff..04e863a3bc 100644 --- a/keyboards/xiudi/xd60/info.json +++ b/keyboards/xiudi/xd60/info.json @@ -1,6 +1,10 @@ { - "keyboard_name": "XD60", + "manufacturer": "XIUDI", "maintainer": "qmk", + "usb": { + "vid": "0x7844", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3}, {"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"label":"Menu", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h index d5bfc89a2d..d5e8642e59 100644 --- a/keyboards/xiudi/xd60/rev2/config.h +++ b/keyboards/xiudi/xd60/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER XIUDI -#define PRODUCT XD60v2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json new file mode 100644 index 0000000000..bceb5bc6cb --- /dev/null +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "XD60 Rev 2", + "usb": { + "pid": "0x6060" + } +} diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h index 189b0222b0..243630c76b 100644 --- a/keyboards/xiudi/xd60/rev3/config.h +++ b/keyboards/xiudi/xd60/rev3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x6363 -#define DEVICE_VER 0x0001 -#define MANUFACTURER XIUDI -#define PRODUCT XD60rev3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json new file mode 100644 index 0000000000..a03a344a28 --- /dev/null +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "XD60 Rev 3", + "usb": { + "pid": "0x6363" + } +} diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 2abdae1d31..665cc96275 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAA96 -#define PRODUCT_ID 0xAAAF -#define DEVICE_VER 0x0001 -#define MANUFACTURER Y&R -#define PRODUCT nz64 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 3dbfd3b436..23638206f7 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAA96 -#define PRODUCT_ID 0xAAAD -#define DEVICE_VER 0x0001 -#define MANUFACTURER ZHOU_Y&R -#define PRODUCT zhou65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h index 6969aca480..13f69f18c9 100644 --- a/keyboards/yosino58/rev1/config.h +++ b/keyboards/yosino58/rev1/config.h @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0F6A -#define PRODUCT_ID 0x01B8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sakuranbo0046 -#define PRODUCT yosino58 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/yosino58/info.json b/keyboards/yosino58/rev1/info.json index 5762f5ab89..aa2fe726ee 100644 --- a/keyboards/yosino58/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "yosino58 rev. 1", + "keyboard_name": "yosino58", + "manufacturer": "sakuranbo0046", "url": "https://github.com/sakurachari/yosino58", "maintainer": "sakuranbo0046", + "usb": { + "vid": "0x0F6A", + "pid": "0x01B8", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index 370b7623f2..095b6b39eb 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "navpad 1.0", + "manufacturer": "yushakobo", "url": "https://shop.yushakobo.jp/products/navpad-10", "maintainer": "yushakobo", + "usb": { + "vid": "0x3265", + "pid": "0x0008" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h index 5ebdda599a..9d2906fa30 100644 --- a/keyboards/yushakobo/navpad/10/rev0/config.h +++ b/keyboards/yushakobo/navpad/10/rev0/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0000 -#define MANUFACTURER yushakobo -#define PRODUCT navpad 1.0 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 7 diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json new file mode 100644 index 0000000000..5baab67dba --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.0" + } +} diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h index 40bb31b156..65f9944db9 100644 --- a/keyboards/yushakobo/navpad/10/rev1/config.h +++ b/keyboards/yushakobo/navpad/10/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yushakobo -#define PRODUCT "navpad 1.0" - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 3d463549df..09809dada9 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0008 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yushakobo -#define PRODUCT "navpad 1.0 with helix keyboard" - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 7 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 98e2314c91..e2c44de4da 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "navpad 1.0 w/ helix right hand side", + "keyboard_name": "navpad 1.0 with helix keyboard", + "manufacturer": "yushakobo", "url": "", "maintainer": "yushakobo", + "usb": { + "vid": "0x3265", + "pid": "0x0008", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yynmt/acperience12/rev1/config.h b/keyboards/yynmt/acperience12/rev1/config.h index d1adb8106c..73a8ef461b 100644 --- a/keyboards/yynmt/acperience12/rev1/config.h +++ b/keyboards/yynmt/acperience12/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 //Sublicense from Microchip Technology -#define PRODUCT_ID 0xEA51 //Sublicense from Microchip Technology -#define DEVICE_VER 0x0001 -#define MANUFACTURER yynmt -#define PRODUCT Acperience12 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 2 diff --git a/keyboards/yynmt/acperience12/info.json b/keyboards/yynmt/acperience12/rev1/info.json index c21faf109a..7d4dbb40ce 100644 --- a/keyboards/yynmt/acperience12/info.json +++ b/keyboards/yynmt/acperience12/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Acperience12", + "manufacturer": "yynmt", "url": "http://yynmt.com", "maintainer": "yynmt", + "usb": { + "vid": "0x04D8", + "pid": "0xEA51", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |