From b2b673fc9e117ef75c936b6f3e3bb797cbdca015 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 26 Jul 2022 10:52:18 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven: A (#17781) --- keyboards/0xcb/tutelpad/config.h | 7 ------- keyboards/0xcb/tutelpad/info.json | 6 ++++++ keyboards/1k/config.h | 7 ------- keyboards/1k/info.json | 8 +++++++- keyboards/a_dux/config.h | 7 ------- keyboards/a_dux/info.json | 6 ++++++ keyboards/abacus/config.h | 7 ------- keyboards/abacus/info.json | 6 ++++++ keyboards/abatskeyboardclub/nayeon/config.h | 7 ------- keyboards/abatskeyboardclub/nayeon/info.json | 6 ++++++ keyboards/acekeyboard/titan60/config.h | 7 ------- keyboards/acekeyboard/titan60/info.json | 6 ++++++ keyboards/acheron/arctic/config.h | 7 ------- keyboards/acheron/arctic/info.json | 6 ++++++ keyboards/acheron/austin/config.h | 7 ------- keyboards/acheron/austin/info.json | 6 ++++++ keyboards/acheron/keebspcb/config.h | 7 ------- keyboards/acheron/keebspcb/info.json | 6 ++++++ keyboards/acheron/lasgweloth/config.h | 7 ------- keyboards/acheron/lasgweloth/info.json | 6 ++++++ keyboards/ada/ada1800mini/config.h | 7 ------- keyboards/ada/ada1800mini/info.json | 6 ++++++ keyboards/ada/infinity81/config.h | 7 ------- keyboards/ada/infinity81/info.json | 6 ++++++ keyboards/adelheid/config.h | 7 ------- keyboards/adelheid/info.json | 6 ++++++ keyboards/adpenrose/kintsugi/config.h | 7 ------- keyboards/adpenrose/kintsugi/info.json | 6 ++++++ keyboards/aeboards/aegis/config.h | 7 ------- keyboards/aeboards/aegis/info.json | 6 ++++++ keyboards/ai03/andromeda/config.h | 7 ------- keyboards/ai03/andromeda/info.json | 6 ++++++ keyboards/ai03/jp60/config.h | 7 ------- keyboards/ai03/jp60/info.json | 6 ++++++ keyboards/ai03/lunar/config.h | 7 ------- keyboards/ai03/lunar/info.json | 6 ++++++ keyboards/ai03/orbit/config.h | 7 ------- keyboards/ai03/orbit/info.json | 8 +++++++- keyboards/ai03/orbit_x/config.h | 7 ------- keyboards/ai03/orbit_x/info.json | 8 +++++++- keyboards/ai03/polaris/config.h | 7 ------- keyboards/ai03/polaris/info.json | 6 ++++++ keyboards/ai03/quasar/config.h | 7 ------- keyboards/ai03/quasar/info.json | 8 +++++++- keyboards/ai03/soyuz/config.h | 7 ------- keyboards/ai03/soyuz/info.json | 6 ++++++ keyboards/ai03/vega/config.h | 7 ------- keyboards/ai03/vega/info.json | 6 ++++++ keyboards/ai03/voyager60_alps/config.h | 6 ------ keyboards/ai03/voyager60_alps/info.json | 6 ++++++ keyboards/akb/eb46/config.h | 6 ------ keyboards/akb/eb46/info.json | 6 ++++++ keyboards/akb/raine/config.h | 7 ------- keyboards/akb/raine/info.json | 8 +++++++- keyboards/akegata_denki/device_one/config.h | 7 ------- keyboards/akegata_denki/device_one/info.json | 6 ++++++ keyboards/al1/config.h | 7 ------- keyboards/al1/info.json | 6 ++++++ keyboards/aleblazer/zodiark/config.h | 7 ------- keyboards/aleblazer/zodiark/info.json | 8 +++++++- keyboards/alf/dc60/config.h | 7 ------- keyboards/alf/dc60/info.json | 6 ++++++ keyboards/alf/x11/config.h | 7 ------- keyboards/alf/x11/info.json | 6 ++++++ keyboards/alf/x2/config.h | 7 ------- keyboards/alf/x2/info.json | 8 +++++++- keyboards/alfredslab/swift65/hotswap/config.h | 7 ------- keyboards/alfredslab/swift65/hotswap/info.json | 8 +++++++- keyboards/alfredslab/swift65/solder/config.h | 7 ------- keyboards/alfredslab/swift65/solder/info.json | 8 +++++++- keyboards/alpha/config.h | 7 ------- keyboards/alpha/info.json | 6 ++++++ keyboards/alpine65/config.h | 7 ------- keyboards/alpine65/info.json | 6 ++++++ keyboards/alps64/config.h | 7 ------- keyboards/alps64/info.json | 8 +++++++- keyboards/amag23/config.h | 7 ------- keyboards/amag23/info.json | 6 ++++++ keyboards/amjkeyboard/amj40/config.h | 7 ------- keyboards/amjkeyboard/amj40/info.json | 6 ++++++ keyboards/amjkeyboard/amj60/config.h | 7 ------- keyboards/amjkeyboard/amj60/info.json | 6 ++++++ keyboards/amjkeyboard/amj66/config.h | 7 ------- keyboards/amjkeyboard/amj66/info.json | 6 ++++++ keyboards/amjkeyboard/amj84/config.h | 7 ------- keyboards/amjkeyboard/amj84/info.json | 8 +++++++- keyboards/amjkeyboard/amj96/config.h | 7 ------- keyboards/amjkeyboard/amj96/info.json | 6 ++++++ keyboards/amjkeyboard/amjpad/config.h | 7 ------- keyboards/amjkeyboard/amjpad/info.json | 8 +++++++- keyboards/anavi/macropad8/config.h | 7 ------- keyboards/anavi/macropad8/info.json | 8 +++++++- keyboards/ano/config.h | 6 ------ keyboards/ano/info.json | 6 ++++++ keyboards/anomalykb/a65i/config.h | 7 ------- keyboards/anomalykb/a65i/info.json | 6 ++++++ keyboards/aos/tkl/config.h | 7 ------- keyboards/aos/tkl/info.json | 6 ++++++ keyboards/aozora/config.h | 7 ------- keyboards/aozora/info.json | 6 ++++++ keyboards/ares/config.h | 6 ------ keyboards/ares/info.json | 8 +++++++- keyboards/arisu/config.h | 7 ------- keyboards/arisu/info.json | 6 ++++++ keyboards/arrayperipherals/1x4p1/config.h | 7 ------- keyboards/arrayperipherals/1x4p1/info.json | 8 +++++++- keyboards/ash1800/config.h | 7 ------- keyboards/ash1800/info.json | 6 ++++++ keyboards/ash_xiix/config.h | 7 ------- keyboards/ash_xiix/info.json | 8 +++++++- keyboards/ashpil/modelm_usbc/config.h | 7 ------- keyboards/ashpil/modelm_usbc/info.json | 8 +++++++- keyboards/at_at/660m/config.h | 7 ------- keyboards/at_at/660m/info.json | 8 +++++++- keyboards/atlantis/ak81_ve/config.h | 7 ------- keyboards/atlantis/ak81_ve/info.json | 6 ++++++ keyboards/atlas_65/config.h | 7 ------- keyboards/atlas_65/info.json | 8 +++++++- keyboards/atomic/config.h | 7 ------- keyboards/atomic/info.json | 6 ++++++ keyboards/atreus62/config.h | 8 -------- keyboards/atreus62/info.json | 6 ++++++ keyboards/atset/at1/config.h | 7 ------- keyboards/atset/at1/info.json | 6 ++++++ keyboards/atset/at12/config.h | 7 ------- keyboards/atset/at12/info.json | 8 +++++++- keyboards/atset/at16/config.h | 7 ------- keyboards/atset/at16/info.json | 8 +++++++- keyboards/atset/at3/config.h | 7 ------- keyboards/atset/at3/info.json | 6 ++++++ keyboards/atset/at6/config.h | 7 ------- keyboards/atset/at6/info.json | 6 ++++++ keyboards/atset/at9/config.h | 7 ------- keyboards/atset/at9/info.json | 6 ++++++ keyboards/atxkb/1894/config.h | 7 ------- keyboards/atxkb/1894/info.json | 6 ++++++ keyboards/aves60/config.h | 7 ------- keyboards/aves60/info.json | 8 +++++++- keyboards/aves65/config.h | 7 ------- keyboards/aves65/info.json | 6 ++++++ keyboards/axolstudio/foundation_gamma/config.h | 7 ------- keyboards/axolstudio/foundation_gamma/info.json | 6 ++++++ keyboards/axolstudio/helpo/config.h | 7 ------- keyboards/axolstudio/helpo/info.json | 8 +++++++- keyboards/axolstudio/yeti/hotswap/config.h | 7 ------- keyboards/axolstudio/yeti/hotswap/info.json | 8 +++++++- keyboards/axolstudio/yeti/soldered/config.h | 7 ------- keyboards/axolstudio/yeti/soldered/info.json | 8 +++++++- keyboards/aya/config.h | 6 ------ keyboards/aya/info.json | 6 ++++++ 150 files changed, 475 insertions(+), 546 deletions(-) diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h index 89e5ef6ba071..a19fa7e83faa 100644 --- a/keyboards/0xcb/tutelpad/config.h +++ b/keyboards/0xcb/tutelpad/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB00 -#define PRODUCT_ID 0xF09F -#define DEVICE_VER 0x0001 -#define MANUFACTURER ItsFiremanSam -#define PRODUCT TutelPad - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json index 8a757a8e28fb..00261daad358 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "TutelPad", + "manufacturer": "ItsFiremanSam", "url": "", "maintainer": "ItsFiremanSam", + "usb": { + "vid": "0xCB00", + "pid": "0xF09F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h index be680b419449..06675824a6b3 100644 --- a/keyboards/1k/config.h +++ b/keyboards/1k/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0009 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MakotoKurauchi -#define PRODUCT 1K - /* matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json index a806ac6295a7..0c2de3180875 100644 --- a/keyboards/1k/info.json +++ b/keyboards/1k/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "1k", + "keyboard_name": "1K", + "manufacturer": "MakotoKurauchi", "url": "", "maintainer": "MakotoKurauchi", + "usb": { + "vid": "0x0009", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_1x1": { "layout": [ diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h index b00794577479..4e9258667c44 100644 --- a/keyboards/a_dux/config.h +++ b/keyboards/a_dux/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC2AB -#define PRODUCT_ID 0x3939 -#define DEVICE_VER 0x0001 -#define MANUFACTURER tapioki -#define PRODUCT Architeuthis dux - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json index e276128a62d3..7b9a43822ac7 100644 --- a/keyboards/a_dux/info.json +++ b/keyboards/a_dux/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Architeuthis dux", + "manufacturer": "tapioki", "url": "https://github.com/tapioki/cephalopoda", "maintainer": "@tapioki", + "usb": { + "vid": "0xC2AB", + "pid": "0x3939", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index 5a627e630a2d..a539eeabc22a 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER nickolaij -#define PRODUCT abacus - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 21d035c97cdd..858c6949b500 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Abacus", + "manufacturer": "nickolaij", "url": "https://www.github.com/nickolaij", "maintainer": "nickolaij", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h index dad3ee307f57..4af821539d5d 100644 --- a/keyboards/abatskeyboardclub/nayeon/config.h +++ b/keyboards/abatskeyboardclub/nayeon/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B47 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Abats Keyboard Club -#define PRODUCT Nayeon - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json index d5281a303101..acba956b06e7 100644 --- a/keyboards/abatskeyboardclub/nayeon/info.json +++ b/keyboards/abatskeyboardclub/nayeon/info.json @@ -1,11 +1,17 @@ { "keyboard_name": "Nayeon", + "manufacturer": "Abats Keyboard Club", "url": "", "maintainer": "ramonimbao", "layout_aliases": { "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi_tsangan", "LAYOUT_iso": "LAYOUT_tkl_f13_iso_tsangan" }, + "usb": { + "vid": "0x4B47", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h index 6cfaa7980eb8..f348a12cf494 100644 --- a/keyboards/acekeyboard/titan60/config.h +++ b/keyboards/acekeyboard/titan60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xACE1 // Ace -#define PRODUCT_ID 0x5449 // TI -#define DEVICE_VER 0x0001 -#define MANUFACTURER Acekeyboard -#define PRODUCT titan60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json index 8e7b41c9cd36..08676395159f 100644 --- a/keyboards/acekeyboard/titan60/info.json +++ b/keyboards/acekeyboard/titan60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Titan60", + "manufacturer": "Acekeyboard", "url": "https://acekeyboard.co/", "maintainer": "keebnewb", + "usb": { + "vid": "0xACE1", + "pid": "0x5449", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index 1275eb5a65d5..63fa9080813c 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x4152 // AR for Arctic -#define DEVICE_VER 0x0001 // Revision pre-Alpha -#define MANUFACTURER AcheronProject -#define PRODUCT ArcticPCB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json index 4f9974a1f60b..4c249a31d3e6 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ArcticPCB", + "manufacturer": "AcheronProject", "url": "http://gondolindrim.github.io/AcheronDocs/arctic/intro.html", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x4152", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi_tsangan": { "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Fn", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index ddbd6975d4b9..3b51bb3f869f 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAC11 -#define PRODUCT_ID 0x4175 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DriftMechanics -#define PRODUCT Austin - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 19 diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index bee81486e3ad..6fda03534ecb 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Austin", + "manufacturer": "DriftMechanics", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xAC11", + "pid": "0x4175", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 05e08f74f7e4..4991c68a50eb 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x4B45 // KE for Keebs -#define DEVICE_VER 0x0001 // Revision pre-Alpha -#define MANUFACTURER AcheronProject -#define PRODUCT KeebsPCB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index b316cc6849c4..31dc899c4281 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "KeebsPCB", + "manufacturer": "AcheronProject", "url": "http://gondolindrim.github.io/AcheronDocs/keebs/intro.html", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x4B45", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi_tsangan": { "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Menu", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index f9a2427faea3..aebe821e3b7d 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4150 // AP for AcheronProject -#define PRODUCT_ID 0x7641 // LA for Lasgweloth -#define DEVICE_VER 0x0001 -#define MANUFACTURER AcheronProect -#define PRODUCT Lasgweloth - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json index b936b45d6ec7..7cade663da1c 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Lasgweloth", + "manufacturer": "AcheronProject", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4150", + "pid": "0x7641", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h index 38be5ad5c76e..36dc47c124bd 100644 --- a/keyboards/ada/ada1800mini/config.h +++ b/keyboards/ada/ada1800mini/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xADA0 -#define PRODUCT_ID 0x1800 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ada -#define PRODUCT ada1800mini - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json index 8e746467fc44..a7cf7986bd15 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ada1800mini", + "manufacturer": "Ada", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xADA0", + "pid": "0x1800", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h index af28efeae2a6..173f2685d7a5 100644 --- a/keyboards/ada/infinity81/config.h +++ b/keyboards/ada/infinity81/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xADA0 -#define PRODUCT_ID 0x0081 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ada -#define PRODUCT infinity81 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json index 71fb774721b9..b2d465fdf9bb 100644 --- a/keyboards/ada/infinity81/info.json +++ b/keyboards/ada/infinity81/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "infinity81", + "manufacturer": "Ada", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xADA0", + "pid": "0x0081", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h index aca9bdc701c2..cb6393393ccb 100644 --- a/keyboards/adelheid/config.h +++ b/keyboards/adelheid/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF100 -#define PRODUCT_ID 0xAD78 -#define DEVICE_VER 0x0002 -#define MANUFACTURER floookay -#define PRODUCT adelheid - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 15 diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json index 8b92e306e0ff..c00755d40339 100644 --- a/keyboards/adelheid/info.json +++ b/keyboards/adelheid/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Adelheid", + "manufacturer": "floookay", "url": "https://github.com/floookay/adelheid", "maintainer": "floookay", + "usb": { + "vid": "0xF100", + "pid": "0xAD78", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index b3aca40a06c4..cbde0090fa41 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4450 // "ADP" -#define PRODUCT_ID 0x0001 // 'Cause it's my first keeb -#define DEVICE_VER 0x0001 -#define MANUFACTURER adpenrose -#define PRODUCT Kintsugi - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index 0e76187335f4..db9952af294b 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kintsugi", + "manufacturer": "adpenrose", "url": "https://github.com/ADPenrose/kintsugi_keeb", "maintainer": "adpenrose", + "usb": { + "vid": "0x4450", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h index 7f59c520059c..631a007bf31c 100644 --- a/keyboards/aeboards/aegis/config.h +++ b/keyboards/aeboards/aegis/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // "AE" -#define PRODUCT_ID 0x0807 // 1800 -> 0x0708 -> 0x0807 ;-) -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEboards -#define PRODUCT AEboards Aegis - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json index ff0c9bf822df..00e03f768519 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Aegis", + "manufacturer": "AEboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4145", + "pid": "0x0807", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_aegis": { "layout": [ diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h index f88eb0212310..cfacca7c0456 100644 --- a/keyboards/ai03/andromeda/config.h +++ b/keyboards/ai03/andromeda/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x000A -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT Andromeda - #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json index 0f4c0adb1443..8e77bc59fda9 100644 --- a/keyboards/ai03/andromeda/info.json +++ b/keyboards/ai03/andromeda/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Andromeda", + "manufacturer": "ai03 Design Studio", "url": "", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x000A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi_wkl": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h index 2e4832154653..c951655ad992 100644 --- a/keyboards/ai03/jp60/config.h +++ b/keyboards/ai03/jp60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0024 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT JP60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index d5453de73416..a5428270f97e 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "JP60", + "manufacturer": "ai03 Design Studio", "url": "https://github.com/ai03-2725/JP60", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0024", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h index 65f428776f4d..ed584c4461f0 100644 --- a/keyboards/ai03/lunar/config.h +++ b/keyboards/ai03/lunar/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Switchplate Peripherals -#define PRODUCT Lunar - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json index ca2b35e3de79..f65d21ab8036 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Lunar", + "manufacturer": "Switchplate Peripherals", "url": "https://geekhack.org/index.php?topic=96112.0", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h index 1b745b4e1f9b..775df8913f81 100644 --- a/keyboards/ai03/orbit/config.h +++ b/keyboards/ai03/orbit/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0003 -#define MANUFACTURER ai03 Keyboard Designs -#define PRODUCT Orbit - /* key matrix size */ #define MATRIX_ROWS 10 // Double rows for split keyboards. Orbit has 5, so define 10 #define MATRIX_COLS 7 diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index a9f0804820fd..9deccb9a3072 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "orbit", + "keyboard_name": "Orbit", + "manufacturer": "ai03 Keyboard Designs", "url": "https://github.com/ai03-2725/Orbit", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0003", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h index 74acd647469c..f5bc5f0b3436 100644 --- a/keyboards/ai03/orbit_x/config.h +++ b/keyboards/ai03/orbit_x/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0014 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT OrbitX - /* key matrix size */ #define MATRIX_ROWS 8 // Double the rows for split #define MATRIX_COLS 6 diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json index 9d22282925bc..19ae38fcdf08 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Orbit-X", + "keyboard_name": "OrbitX", + "manufacturer": "ai03 Design Studio", "url": "", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0014", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h index 2d869dd0bd5d..8d8951cd713e 100644 --- a/keyboards/ai03/polaris/config.h +++ b/keyboards/ai03/polaris/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT Polaris - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json index 99f8ca7a3d50..c4bef0c4a0bc 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Polaris", + "manufacturer": "ai03 Design Studio", "url": "https://kb.ai03.me/projects/polaris.html", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h index 97fa2df2da7d..99e0413566e1 100644 --- a/keyboards/ai03/quasar/config.h +++ b/keyboards/ai03/quasar/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ryota Goto -#define PRODUCT Quasar - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json index 439d4feea86f..d404e644a0c6 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "quasar", + "keyboard_name": "Quasar", + "manufacturer": "Ryota Goto", "url": "https://github.com/ai03-2725/Quasar/", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0010", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h index 8022145cebd2..872fb58c1337 100644 --- a/keyboards/ai03/soyuz/config.h +++ b/keyboards/ai03/soyuz/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0018 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT Soyuz - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json index 8195a6f099ff..98af3b33732a 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Soyuz", + "manufacturer": "ai03 Design Studio", "url": "https://github.com/ai03-2725/soyuz", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0018", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h index 5f94ea9a7db4..d6fbd8418d8f 100644 --- a/keyboards/ai03/vega/config.h +++ b/keyboards/ai03/vega/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0015 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 Design Studio -#define PRODUCT Vega - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ai03/vega/info.json b/keyboards/ai03/vega/info.json index 027f03ef35af..ee66f539c93d 100644 --- a/keyboards/ai03/vega/info.json +++ b/keyboards/ai03/vega/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Vega", + "manufacturer": "ai03 Design Studio", "url": "ai03.com", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0015", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h index cd06071989b8..5ae9a4c9f5be 100644 --- a/keyboards/ai03/voyager60_alps/config.h +++ b/keyboards/ai03/voyager60_alps/config.h @@ -16,12 +16,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x060A -#define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 -#define PRODUCT Voyager60-Alps - #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index 64cbaa668e24..25c142f79581 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Voyager60-Alps", + "manufacturer": "ai03", "url": "https://github.com/ai03-2725/Voyager60/tree/alps", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x060A", + "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":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"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":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":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h index 644cd97305cd..68fa6aaf1ca3 100644 --- a/keyboards/akb/eb46/config.h +++ b/keyboards/akb/eb46/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4646 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Elliot Powell -#define PRODUCT eb46 /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json index dbcc9abb83df..d2cae832b5e4 100644 --- a/keyboards/akb/eb46/info.json +++ b/keyboards/akb/eb46/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "eb46", + "manufacturer": "Elliot Powell", "maintainer": "e11i0t23", + "usb": { + "vid": "0x4646", + "pid": "0xFEED", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h index e0377514e25a..c341ceb7dc34 100644 --- a/keyboards/akb/raine/config.h +++ b/keyboards/akb/raine/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AKB -#define PRODUCT Raine - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/akb/raine/info.json b/keyboards/akb/raine/info.json index d3205ecb6638..2efbba3fe158 100644 --- a/keyboards/akb/raine/info.json +++ b/keyboards/akb/raine/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "raine", + "keyboard_name": "Raine", + "manufacturer": "AKB", "maintainer": "e11i0t23", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/akegata_denki/device_one/config.h b/keyboards/akegata_denki/device_one/config.h index cae2c60c04e6..33a017f3fb62 100644 --- a/keyboards/akegata_denki/device_one/config.h +++ b/keyboards/akegata_denki/device_one/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xADD0 -#define DEVICE_VER 0x0001 -#define MANUFACTURER akegata denki -#define PRODUCT device one mechanical keyboard - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json index 34de2927b926..bc75208eb742 100644 --- a/keyboards/akegata_denki/device_one/info.json +++ b/keyboards/akegata_denki/device_one/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "device one", + "manufacturer": "akegata denki", "url": "https://akegata.co", + "usb": { + "vid": "0xFEED", + "pid": "0xADD0", + "device_version": "0.0.1" + }, "maintainer": "qmk", "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h index 07cc94a2799d..b0f485dfaa8a 100644 --- a/keyboards/al1/config.h +++ b/keyboards/al1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x544C -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Alsoran -#define PRODUCT AL1 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index 4014687fe979..bbb928a3ea60 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AL1", + "manufacturer": "Alsoran", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x544C", + "pid": "0x6050", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h index a3ea6382e412..90ecb7ce9627 100644 --- a/keyboards/aleblazer/zodiark/config.h +++ b/keyboards/aleblazer/zodiark/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF901 -#define PRODUCT_ID 0xF902 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Aleblazer -#define PRODUCT Zodiark - #define SOFT_SERIAL_PIN D3 #define SERIAL_USE_MULTI_TRANSACTION #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index 89e3deb4149f..a42819b3a1af 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "zodiark", + "keyboard_name": "Zodiark", + "manufacturer": "Aleblazer", "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark", "maintainer": "Aleblazer", + "usb": { + "vid": "0xF901", + "pid": "0xF902", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index bdbea9578cda..8e5d855d0d77 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alf -#define PRODUCT dc60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index f10d594fc8eb..81b8613e5bdd 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "dc60", + "manufacturer": "Alf", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "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":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"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":12, "y":3}, {"x":13, "y":3}, {"x":14, "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":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index a489174b2d6a..cbe4733397a0 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alf -#define PRODUCT x11 - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 13 diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index 14d4a5efb7ac..b65a843b28b6 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "x11", + "manufacturer": "Alf", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index a6f4958b0547..50e256778ada 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ALF -#define PRODUCT X2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index 4a3cc839c9d7..7bb69d15e6ae 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ALF X2", + "keyboard_name": "X2", + "manufacturer": "ALF", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index acf4f521b828..3845c885e1b6 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBBEB -#define PRODUCT_ID 0xD4C4 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AlfredsLab -#define PRODUCT Swift65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 25b261d330bd..21895a1b2de5 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hotswap", + "keyboard_name": "Swift65 Hotswap", + "manufacturer": "AlfredsLab", "url": "https://swiftcables.net/", "maintainer": "Spooknik", + "usb": { + "vid": "0xBBEB", + "pid": "0xD4C4", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_7u_space", "LAYOUT_all": "LAYOUT_7u_space" diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index 509aae6a8966..f0161bf6164c 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBBEB -#define PRODUCT_ID 0xD4C3 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AlfredsLab -#define PRODUCT Swift65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 69729e4330f6..154747b588da 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Swift65", + "keyboard_name": "Swift65 Solder", + "manufacturer": "AlfredsLab", "url": "https://swiftcables.net/", "maintainer": "Spooknik", + "usb": { + "vid": "0xBBEB", + "pid": "0xD4C3", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_625u_space_split_bs", "LAYOUT_all": "LAYOUT_625u_space_split_bs" diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index ae1c69656b5c..379b879abc62 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/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 PyroL -#define PRODUCT alpha - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 10 diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index 3564b8d53656..eb6144bdbfc6 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Alpha", + "manufacturer": "PyroL", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "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":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":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2, "w":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}] diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h index ce674396abce..a5180dc227ce 100644 --- a/keyboards/alpine65/config.h +++ b/keyboards/alpine65/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6680 // BP for Bitmap -#define PRODUCT_ID 0x0065 // AR for Arctic -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bitmap Designs -#define PRODUCT Alpine65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json index 94cd3589a3c3..51006056c924 100644 --- a/keyboards/alpine65/info.json +++ b/keyboards/alpine65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Alpine65", + "manufacturer": "Bitmap Designs", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x6680", + "pid": "0x0065", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h index 640bab8bca14..9656678fe902 100644 --- a/keyboards/alps64/config.h +++ b/keyboards/alps64/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6873 //hs "Hasu" -#define PRODUCT_ID 0x6464 //Alps"64" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Hasu -#define PRODUCT Alps64 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/alps64/info.json b/keyboards/alps64/info.json index c7917c8c6eb7..d2b240099792 100644 --- a/keyboards/alps64/info.json +++ b/keyboards/alps64/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "alps64", + "keyboard_name": "Alps64", + "manufacturer": "Hasu", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x6873", + "pid": "0x6464", + "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}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h index 798fcf9d0f7f..cbbac33136fe 100644 --- a/keyboards/amag23/config.h +++ b/keyboards/amag23/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B54 // "KT" -#define PRODUCT_ID 0x2323 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Koolertron -#define PRODUCT AMAG23 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 6 diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json index dc44b51224dd..7eb9aed98295 100644 --- a/keyboards/amag23/info.json +++ b/keyboards/amag23/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AMAG23", + "manufacturer": "Koolertron", "url": "http://www.koolertron.com/koolertron-one-handed-macro-mechanical-keyboard-rgb-led-backlit-portable-mini-onehanded-mechanical-gaming-keypad-23-fully-programmable-keys-blue-switches-p-874.html", "maintainer": "ianmclinden", + "usb": { + "vid": "0x4B54", + "pid": "0x2323", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h index 2f472eac01b2..168d16eaee1a 100755 --- a/keyboards/amjkeyboard/amj40/config.h +++ b/keyboards/amjkeyboard/amj40/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00D8 //A+M+J -#define PRODUCT_ID 0x6072 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Han Chen -#define PRODUCT AMJ40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index 575fd1b03416..cb7c274f109a 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AMJ40", + "manufacturer": "Han Chen", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00D8", + "pid": "0x6072", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 4e894a45fcac..a3764d00d2fd 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00D8 //A+M+J -#define PRODUCT_ID 0x6066 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Han Chen -#define PRODUCT AMJ60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index 2c1781738eeb..3b106beb1828 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AMJ60", + "manufacturer": "Han Chen", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00D8", + "pid": "0x6066", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h index cc84524b0b3a..240cb312c9de 100644 --- a/keyboards/amjkeyboard/amj66/config.h +++ b/keyboards/amjkeyboard/amj66/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00D8 //A+M+J -#define PRODUCT_ID 0xBD66 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AMJKeyboard -#define PRODUCT AMJ66 - /* Key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index 27a6ecdb948b..2b55e1e3c329 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AMJ66", + "manufacturer": "AMJKeyboard", "url": "", "maintainer": "FSund, qmk", + "usb": { + "vid": "0x00D8", + "pid": "0xBD66", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h index 569c06dac2a5..99f59983eaef 100644 --- a/keyboards/amjkeyboard/amj84/config.h +++ b/keyboards/amjkeyboard/amj84/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00D8 //A+M+J -#define PRODUCT_ID 0x6068 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Han Chen -#define PRODUCT AMJ84 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json index 484823fcca6b..3d565306865e 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AMJ84", - "maintainer": "peepeetee", + "manufacturer": "Han Chen", "url": "", + "maintainer": "peepeetee", + "usb": { + "vid": "0x00D8", + "pid": "0x6068", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h index 67b3699047d0..4b94236ec9e0 100644 --- a/keyboards/amjkeyboard/amj96/config.h +++ b/keyboards/amjkeyboard/amj96/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00D8 //A+M+J -#define PRODUCT_ID 0x6074 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Han Chen -#define PRODUCT AMJ96 - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 16 diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json index b2aac215c0c7..329232293e19 100644 --- a/keyboards/amjkeyboard/amj96/info.json +++ b/keyboards/amjkeyboard/amj96/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AMJ96", + "manufacturer": "Han Chen", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00D8", + "pid": "0x6074", + "device_version": "0.0.2" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h index fe621b7bf3cd..0a885b7a36d0 100644 --- a/keyboards/amjkeyboard/amjpad/config.h +++ b/keyboards/amjkeyboard/amjpad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00D8 //A+M+J -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0003 -#define MANUFACTURER AMJ -#define PRODUCT PAD - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 76147716d25b..456b90e04934 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "AMJ Pad", + "keyboard_name": "PAD", + "manufacturer": "AMJ", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00D8", + "pid": "0x6060", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_numpad_6x4": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":2}] diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h index 4ec8c7312350..ef51822f5a9e 100644 --- a/keyboards/anavi/macropad8/config.h +++ b/keyboards/anavi/macropad8/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCEEB -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ANAVI -#define PRODUCT Macro Pad 8 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index 8f6deed82b2f..fd6d3bd0a1fc 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ANAVI Macro Pad 8", + "keyboard_name": "Macro Pad 8", + "manufacturer": "ANAVI", "url": "", "maintainer": "leon-anavi", + "usb": { + "vid": "0xCEEB", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h index 3c3ee05fbe69..5489e656b72b 100644 --- a/keyboards/ano/config.h +++ b/keyboards/ano/config.h @@ -16,12 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8372 -#define PRODUCT_ID 0x0651 -#define DEVICE_VER 0x0000 -#define MANUFACTURER Sebastien Sauve-Hoover -#define PRODUCT Ano Keyboard /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/ano/info.json b/keyboards/ano/info.json index 3eda03c74fab..63c994c173cd 100644 --- a/keyboards/ano/info.json +++ b/keyboards/ano/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ano", + "manufacturer": "Sebastien Sauve-Hoover", "url": "https://github.com/sauvehoo", "maintainer": "sauvehoo", + "usb": { + "vid": "0x8372", + "pid": "0x0651", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0.25, "y":0.25}, {"label":"F1", "x":1.5, "y":0.25}, {"label":"F2", "x":2.5, "y":0.25}, {"label":"F3", "x":3.5, "y":0.25}, {"label":"F4", "x":4.5, "y":0.25}, {"label":"F5", "x":5.75, "y":0.25}, {"label":"F6", "x":6.75, "y":0.25}, {"label":"F7", "x":7.75, "y":0.25}, {"label":"F8", "x":8.75, "y":0.25}, {"label":"F9", "x":10, "y":0.25}, {"label":"F10", "x":11, "y":0.25}, {"label":"F11", "x":12, "y":0.25}, {"label":"F12", "x":13, "y":0.25}, {"label":"Delete", "x":14.25, "y":0.25}, {"label":"Encoder", "x":18.25, "y":0.25}, {"label":"~", "x":0.25, "y":1.5}, {"label":"!", "x":1.25, "y":1.5}, {"label":"@", "x":2.25, "y":1.5}, {"label":"#", "x":3.25, "y":1.5}, {"label":"$", "x":4.25, "y":1.5}, {"label":"%", "x":5.25, "y":1.5}, {"label":"^", "x":6.25, "y":1.5}, {"label":"&", "x":7.25, "y":1.5}, {"label":"*", "x":8.25, "y":1.5}, {"label":"(", "x":9.25, "y":1.5}, {"label":")", "x":10.25, "y":1.5}, {"label":"_", "x":11.25, "y":1.5}, {"label":"+", "x":12.25, "y":1.5}, {"label":"Backspace", "x":13.25, "y":1.5, "w":2}, {"label":"Num Lock", "x":15.25, "y":1.5}, {"label":"/", "x":16.25, "y":1.5}, {"label":"*", "x":17.25, "y":1.5}, {"label":"*", "x":18.25, "y":1.5}, {"label":"Tab", "x":0.25, "y":2.5, "w":1.5}, {"label":"Q", "x":1.75, "y":2.5}, {"label":"W", "x":2.75, "y":2.5}, {"label":"E", "x":3.75, "y":2.5}, {"label":"R", "x":4.75, "y":2.5}, {"label":"T", "x":5.75, "y":2.5}, {"label":"Y", "x":6.75, "y":2.5}, {"label":"U", "x":7.75, "y":2.5}, {"label":"I", "x":8.75, "y":2.5}, {"label":"O", "x":9.75, "y":2.5}, {"label":"P", "x":10.75, "y":2.5}, {"label":"{", "x":11.75, "y":2.5}, {"label":"}", "x":12.75, "y":2.5}, {"label":"|", "x":13.75, "y":2.5, "w":1.5}, {"label":"7", "x":15.25, "y":2.5}, {"label":"8", "x":16.25, "y":2.5}, {"label":"9", "x":17.25, "y":2.5}, {"label":"-", "x":18.25, "y":2.5}, {"label":"Caps Lock", "x":0.25, "y":3.5, "w":1.75}, {"label":"A", "x":2, "y":3.5}, {"label":"S", "x":3, "y":3.5}, {"label":"D", "x":4, "y":3.5}, {"label":"F", "x":5, "y":3.5}, {"label":"G", "x":6, "y":3.5}, {"label":"H", "x":7, "y":3.5}, {"label":"J", "x":8, "y":3.5}, {"label":"K", "x":9, "y":3.5}, {"label":"L", "x":10, "y":3.5}, {"label":":", "x":11, "y":3.5}, {"label":"\"", "x":12, "y":3.5}, {"label":"Enter", "x":13, "y":3.5, "w":2.25}, {"label":"4", "x":15.25, "y":3.5}, {"label":"5", "x":16.25, "y":3.5}, {"label":"6", "x":17.25, "y":3.5}, {"label":"+", "x":18.25, "y":3.5}, {"label":"Shift", "x":0.25, "y":4.5, "w":2.25}, {"label":"Z", "x":2.5, "y":4.5}, {"label":"X", "x":3.5, "y":4.5}, {"label":"C", "x":4.5, "y":4.5}, {"label":"V", "x":5.5, "y":4.5}, {"label":"B", "x":6.5, "y":4.5}, {"label":"N", "x":7.5, "y":4.5}, {"label":"M", "x":8.5, "y":4.5}, {"label":"<", "x":9.5, "y":4.5}, {"label":">", "x":10.5, "y":4.5}, {"label":"?", "x":11.5, "y":4.5}, {"label":"Shift", "x":12.5, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"1", "x":15.25, "y":4.5}, {"label":"2", "x":16.25, "y":4.5}, {"label":"3", "x":17.25, "y":4.5}, {"label":"Enter", "x":18.25, "y":4.5, "h":2}, {"label":"Ctrl", "x":0.25, "y":5.5, "w":1.25}, {"label":"Win", "x":1.5, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5, "w":6.25}, {"label":"Alt", "x":10.25, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":11.75, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}, {"label":"0", "x":16.25, "y":5.5}, {"label":".", "x":17.25, "y":5.5}] diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h index b6ca4a8b8457..e090e4645628 100644 --- a/keyboards/anomalykb/a65i/config.h +++ b/keyboards/anomalykb/a65i/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C47 -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AnomalyKB -#define PRODUCT AnomalyKB A65I - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/anomalykb/a65i/info.json b/keyboards/anomalykb/a65i/info.json index 2cd7e5a4e852..ae249db7ef54 100644 --- a/keyboards/anomalykb/a65i/info.json +++ b/keyboards/anomalykb/a65i/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "A65I", + "manufacturer": "AnomalyKB", "maintainer": "Lfgberg", + "usb": { + "vid": "0x4C47", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_ansi": "LAYOUT_65_ansi_blocker", "LAYOUT_ansi_splitbs": "LAYOUT_65_ansi_blocker_split_bs", diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h index de408455075b..ddea414eb1a7 100644 --- a/keyboards/aos/tkl/config.h +++ b/keyboards/aos/tkl/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x504B -#define PRODUCT_ID 0x1000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ace of Spades -#define PRODUCT Ace of Spades TKL - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json index dff8b1643923..32aaba37a190 100644 --- a/keyboards/aos/tkl/info.json +++ b/keyboards/aos/tkl/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Ace of Spades TKL", + "manufacturer": "Ace of Spades", "maintainer": "rys", + "usb": { + "vid": "0x504B", + "pid": "0x1000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_iso_wkl": { "layout": [ diff --git a/keyboards/aozora/config.h b/keyboards/aozora/config.h index 67972a84b2b3..ac0f11b40959 100644 --- a/keyboards/aozora/config.h +++ b/keyboards/aozora/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE86A -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salmon Cat Studio -#define PRODUCT Aozora - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json index 0f442cc12eb2..414565ce1c05 100644 --- a/keyboards/aozora/info.json +++ b/keyboards/aozora/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Aozora", + "manufacturer": "Salmon Cat Studio", "url": "https://salmoncat.studio/pages/aozora-%E9%9D%92%E7%A9%BA-6-9-21-7-10-21", "maintainer": "Phooood", + "usb": { + "vid": "0x04D8", + "pid": "0xE86A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h index 53a3bfe13a23..4049109827f9 100644 --- a/keyboards/ares/config.h +++ b/keyboards/ares/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x20A0 -#define PRODUCT_ID 0x422D -#define DEVICE_VER 0x0200 -#define MANUFACTURER LSJ -#define PRODUCT Ares - #define RGBLED_NUM 16 #define MATRIX_ROWS 5 diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index eeff16b7a978..67c6fe3bc73a 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "LSJ Ares", + "keyboard_name": "Ares", + "manufacturer": "LSJ", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x20A0", + "pid": "0x422D", + "device_version": "2.0.0" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h index 8e2da440c274..c323bbbfed6d 100644 --- a/keyboards/arisu/config.h +++ b/keyboards/arisu/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFA7E -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Fate -#define PRODUCT arisu - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/arisu/info.json b/keyboards/arisu/info.json index c74817aefd81..bb7ce228c401 100644 --- a/keyboards/arisu/info.json +++ b/keyboards/arisu/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Arisu", + "manufacturer": "Fate", "url": "https://github.com/FateNozomi/arisu-pcb", "maintainer": "FateNozomi", + "usb": { + "vid": "0xFA7E", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/arrayperipherals/1x4p1/config.h b/keyboards/arrayperipherals/1x4p1/config.h index 44559be3ed12..aec5a143eede 100644 --- a/keyboards/arrayperipherals/1x4p1/config.h +++ b/keyboards/arrayperipherals/1x4p1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4152 // "AR" -#define PRODUCT_ID 0x4F46 // "OF" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Array Peripherals -#define PRODUCT [1x4] + 1 Macropad - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 5 diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index d962cb586ba6..6a2e1efd1fb4 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "[1 x 4] + 1 Macropad", + "keyboard_name": "[1x4] + 1 Macropad", + "manufacturer": "Array Peripherals", "url": "https://github.com/daviddoan", "maintainer": "David Doan", + "usb": { + "vid": "0x4152", + "pid": "0x4F46", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_1x5": { "layout": [ diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h index 7b55f31bd399..3748d87f4d74 100644 --- a/keyboards/ash1800/config.h +++ b/keyboards/ash1800/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1800 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Hasyim Ashari -#define PRODUCT ASH-1800 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 10 diff --git a/keyboards/ash1800/info.json b/keyboards/ash1800/info.json index 632544c772e3..3c7272d8848a 100644 --- a/keyboards/ash1800/info.json +++ b/keyboards/ash1800/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "ASH-1800", + "manufacturer": "Hasyim Ashari", "maintainer": "angelbirth", + "usb": { + "vid": "0xFEED", + "pid": "0x1800", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h index bcfdaeef7c48..10819eb8e415 100644 --- a/keyboards/ash_xiix/config.h +++ b/keyboards/ash_xiix/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x14BC -#define DEVICE_VER 0x0001 -#define MANUFACTURER ASH -#define PRODUCT XIIX - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 10 diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json index b91d2e14b1cb..05b926cda0c9 100644 --- a/keyboards/ash_xiix/info.json +++ b/keyboards/ash_xiix/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ASH-XIIX", + "keyboard_name": "XIIX", + "manufacturer": "ASH", "url": "config.qmk.fm", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x14BC", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h index 857217152737..ccc6f2bbf8af 100644 --- a/keyboards/ashpil/modelm_usbc/config.h +++ b/keyboards/ashpil/modelm_usbc/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ashpil -#define PRODUCT IBM Model M 101/102 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json index 985141afbb5e..9838025ce5d9 100644 --- a/keyboards/ashpil/modelm_usbc/info.json +++ b/keyboards/ashpil/modelm_usbc/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IBM Model M 101 ANSI/102 ISO", + "keyboard_name": "IBM Model M 101/102", + "manufacturer": "ashpil", "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc", "maintainer": "ashpil", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_fullsize_iso_wkl": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h index 5a53e8c38af4..b3676e970431 100644 --- a/keyboards/at_at/660m/config.h +++ b/keyboards/at_at/660m/config.h @@ -23,13 +23,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA22A -#define PRODUCT_ID 0x6600 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AT-AT -#define PRODUCT 660M - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json index e5282485fb6c..1558e2d05836 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "AT-AT 660M", + "keyboard_name": "660M", + "manufacturer": "AT-AT", "url": "", "maintainer": "adrientetar", + "usb": { + "vid": "0xA22A", + "pid": "0x6600", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 1b6050f9ac7e..ac9a407ccb69 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x416B -#define PRODUCT_ID 0x0081 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atlantis -#define PRODUCT AK81_VE - /* Key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json index 8d4a8ebf59ec..95011de49212 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "AK81_VE", + "manufacturer": "Atlantis", "maintainer": "fOmey", + "usb": { + "vid": "0x416B", + "pid": "0x0081", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h index 86613cb193a2..337ba015c2b7 100644 --- a/keyboards/atlas_65/config.h +++ b/keyboards/atlas_65/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6565 -#define PRODUCT_ID 0x1000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Joshua Nguyen -#define PRODUCT atlas_65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/atlas_65/info.json b/keyboards/atlas_65/info.json index d6c0eedb00d2..266e71118a23 100644 --- a/keyboards/atlas_65/info.json +++ b/keyboards/atlas_65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "atlas-65", + "keyboard_name": "atlas_65", + "manufacturer": "Joshua Nguyen", "url": "https://github.com/ryanstevensmith/atlas-65", "maintainer": "ryanstevensmith, Joshua Nguyen", + "usb": { + "vid": "0x6565", + "pid": "0x1000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h index 095cac906caf..a0f38d845f7b 100644 --- a/keyboards/atomic/config.h +++ b/keyboards/atomic/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OLKB -#define PRODUCT Atomic - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json index d55ba4b75a4b..bd0a2c2f9969 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "Atomic", + "manufacturer": "OLKB", "maintainer": "jackhumbert", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_grid": "LAYOUT_ortho_5x15" }, diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h index 2bb3da484c42..bbf5028d7b15 100644 --- a/keyboards/atreus62/config.h +++ b/keyboards/atreus62/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6062 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Profet -#define PRODUCT Atreus62 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 5 diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json index d5f1e7cce9ca..4bcde69be58b 100644 --- a/keyboards/atreus62/info.json +++ b/keyboards/atreus62/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Atreus62", + "manufacturer": "Profet", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6062", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index 502007002467..b5f433b87956 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // Atset -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atset -#define PRODUCT AT1 - /* Key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json index c96ca6c3b1d2..b73f4de3ae90 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "AT1", + "manufacturer": "Atset", "maintainer": "atset", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}] diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index c037cd5b740b..26e26fc32e30 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // Atset -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atset -#define PRODUCT AT12 - /* Key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json index 2facdf3800dd..28a535db483e 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "AT9", + "keyboard_name": "AT12", + "manufacturer": "Atset", "maintainer": "atset", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}] diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index fd0505332919..da194644ba2a 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // Atset -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atset -#define PRODUCT AT16 - /* Key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json index 970bb7446f0f..65a51448b4c0 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "AT9", + "keyboard_name": "AT16", + "manufacturer": "Atset", "maintainer": "atset", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}] diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index 3c7fa4abb69a..094ad56a1e1c 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // Atset -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atset -#define PRODUCT AT3 - /* Key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 3 diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json index 2cceb5cb8436..6f8eab5e62da 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "AT3", + "manufacturer": "Atset", "maintainer": "atset", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}] diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index b5192c5982a8..fd40ac609b4a 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // Atset -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atset -#define PRODUCT AT6 - /* Key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/atset/at6/info.json b/keyboards/atset/at6/info.json index cdaeee825d96..abdaf10b9f24 100644 --- a/keyboards/atset/at6/info.json +++ b/keyboards/atset/at6/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "AT6", + "manufacturer": "Atset", "maintainer": "atset", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index 157c4a2e4246..187442c265ca 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // Atset -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atset -#define PRODUCT AT9 - /* Key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/atset/at9/info.json b/keyboards/atset/at9/info.json index 5c69b1c8d312..b550240ce703 100644 --- a/keyboards/atset/at9/info.json +++ b/keyboards/atset/at9/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "AT9", + "manufacturer": "Atset", "maintainer": "atset", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h index fd621e169a5b..72d11a180fb7 100644 --- a/keyboards/atxkb/1894/config.h +++ b/keyboards/atxkb/1894/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5458 // TX -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER atxkb -#define PRODUCT 1894 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json index a9195061f8ed..d91764625e52 100644 --- a/keyboards/atxkb/1894/info.json +++ b/keyboards/atxkb/1894/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "1894", + "manufacturer": "atxkb", "url": "https://atxkb.com", "maintainer": "austexcn", + "usb": { + "vid": "0x5458", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h index d44951a4ce14..7783cc912087 100644 --- a/keyboards/aves60/config.h +++ b/keyboards/aves60/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x9991 -#define PRODUCT_ID 0xD408 -#define DEVICE_VER 0x0001 -#define MANUFACTURER I/O Keyboards -#define PRODUCT Aves 60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json index f921de058ab4..6d1c7f4e3708 100644 --- a/keyboards/aves60/info.json +++ b/keyboards/aves60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Aves60", + "keyboard_name": "Aves 60", + "manufacturer": "I/O Keyboards", "url": "https://iokeyboards.eu/", "maintainer": "evyd13", + "usb": { + "vid": "0x9991", + "pid": "0xD408", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h index 5ae386512c62..1536787ac0c3 100644 --- a/keyboards/aves65/config.h +++ b/keyboards/aves65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x9991 -#define PRODUCT_ID 0x9038 -#define DEVICE_VER 0x0001 -#define MANUFACTURER I/O Keyboards -#define PRODUCT Aves65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json index 4531d93b813f..789725a9d2de 100644 --- a/keyboards/aves65/info.json +++ b/keyboards/aves65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Aves65", + "manufacturer": "I/O Keyboards", "url": "", "maintainer": "Hund", + "usb": { + "vid": "0x9991", + "pid": "0x9038", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h index 6883e51d5799..59b433942878 100644 --- a/keyboards/axolstudio/foundation_gamma/config.h +++ b/keyboards/axolstudio/foundation_gamma/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x525C -#define PRODUCT_ID 0xE3EB -#define DEVICE_VER 0x0001 -#define MANUFACTURER Axolstudio -#define PRODUCT Foundation Gamma - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json index 8845e6ce77df..e26e61f1e410 100644 --- a/keyboards/axolstudio/foundation_gamma/info.json +++ b/keyboards/axolstudio/foundation_gamma/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Foundation Gamma", + "manufacturer": "Axolstudio", "url": "https://axolstudio.ca/foundation-gamma", "maintainer": "kb-elmo", + "usb": { + "vid": "0x525C", + "pid": "0xE3EB", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_ansi_tsangan": "LAYOUT_tkl_f13_ansi_tsangan", "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift" diff --git a/keyboards/axolstudio/helpo/config.h b/keyboards/axolstudio/helpo/config.h index 927c7cc56c81..5251f7aefb7a 100644 --- a/keyboards/axolstudio/helpo/config.h +++ b/keyboards/axolstudio/helpo/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x525C -#define PRODUCT_ID 0xC89F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Axolstudio -#define PRODUCT Helpo - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index 5ec0cc7d1313..5c25c7df05ec 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "helpo", + "keyboard_name": "Helpo", + "manufacturer": "Axolstudio", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0x525C", + "pid": "0xC89F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h index 559b62a81d72..1f0540c9e10f 100644 --- a/keyboards/axolstudio/yeti/hotswap/config.h +++ b/keyboards/axolstudio/yeti/hotswap/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x525C -#define PRODUCT_ID 0x9F9E -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZtech -#define PRODUCT Yeti RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json index 72042a98a3bb..eef82fa2dd1b 100644 --- a/keyboards/axolstudio/yeti/hotswap/info.json +++ b/keyboards/axolstudio/yeti/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "yeti hotswap", + "keyboard_name": "Yeti Hotswap", + "manufacturer": "Axolstudio", "url": "https://axolstudio.ca/yeti", "maintainer": "kb-elmo", + "usb": { + "vid": "0x525C", + "pid": "0x9F9E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/axolstudio/yeti/soldered/config.h b/keyboards/axolstudio/yeti/soldered/config.h index 34b47bbcacad..74468f29e2bc 100644 --- a/keyboards/axolstudio/yeti/soldered/config.h +++ b/keyboards/axolstudio/yeti/soldered/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x525C -#define PRODUCT_ID 0x9F9F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Axolstudio -#define PRODUCT Yeti - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json index 9c6c122ce363..e7e014378687 100644 --- a/keyboards/axolstudio/yeti/soldered/info.json +++ b/keyboards/axolstudio/yeti/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "yeti soldered", + "keyboard_name": "Yeti Soldered", + "manufacturer": "Axolstudio", "url": "https://axolstudio.ca/yeti", "maintainer": "kb-elmo", + "usb": { + "vid": "0x525C", + "pid": "0x9F9F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice": { "layout": [ diff --git a/keyboards/aya/config.h b/keyboards/aya/config.h index 0381f224ca7e..aa100864f267 100644 --- a/keyboards/aya/config.h +++ b/keyboards/aya/config.h @@ -18,12 +18,6 @@ #include "config_common.h" -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0x2925 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DanNixon -#define PRODUCT Aya - #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json index 8db200eb6a20..d8093bad72a4 100644 --- a/keyboards/aya/info.json +++ b/keyboards/aya/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Aya", + "manufacturer": "DanNixon", "url": "https://github.com/DanNixon/aya", "maintainer": "dannixon", + "usb": { + "vid": "0x1209", + "pid": "0x2925", + "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":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "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":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "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":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "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":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]