diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-03 22:13:21 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-03 22:13:21 +0000 |
| commit | 0a198b59a3f44bf099ef3f15ba3f808c6e0dba5c (patch) | |
| tree | cc3e90a52b67fbb9260b25fc3cba3eaafce9799a /keyboards | |
| parent | 237039cdcd896e7a99e58db92d193c5ff7a2dc33 (diff) | |
| parent | a8744b163074457253da2c63affd3b4cceefe04a (diff) | |
| download | qmk_firmware-0a198b59a3f44bf099ef3f15ba3f808c6e0dba5c.tar.gz qmk_firmware-0a198b59a3f44bf099ef3f15ba3f808c6e0dba5c.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
227 files changed, 704 insertions, 825 deletions
diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h index 8f3e32a52f..4bb41abe19 100644 --- a/keyboards/salicylic_acid3/7splus/config.h +++ b/keyboards/salicylic_acid3/7splus/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEAE7 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT 7splus - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index a87909c07b..aa70fe150a 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "7splus", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEAE7", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h index e7a1555aea..cb886509ab 100644 --- a/keyboards/salicylic_acid3/ajisai74/config.h +++ b/keyboards/salicylic_acid3/ajisai74/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB54 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT ajisai74 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index 6bf2d7af49..c0e5c2b5c0 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ajisai74", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB54", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h index ae13e20014..ff2bb2d47c 100644 --- a/keyboards/salicylic_acid3/ergoarrows/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEA54 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT ergoarrows - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 7 diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index a625476e79..2c741c21e9 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ergoarrows", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEA54", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h index 22e17c6cc7..d6f57e9d7b 100644 --- a/keyboards/salicylic_acid3/nafuda/config.h +++ b/keyboards/salicylic_acid3/nafuda/config.h @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0012 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT nafuda - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index d418341d19..822ee9e0a1 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "nafuda", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h index 997971bc96..5258cdccdb 100644 --- a/keyboards/salicylic_acid3/nknl7en/config.h +++ b/keyboards/salicylic_acid3/nknl7en/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEA56 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT nknl7en - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index c80ac22769..6c94b5deb6 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "nknl7en", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEA56", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h index 7fb3c0e9c9..317f546c85 100644 --- a/keyboards/salicylic_acid3/nknl7jp/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEA55 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT nknl7jp - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index c074d9019f..1750c19dba 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "nknl7jp", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEA55", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h index 1df34a48dd..55dff94e3f 100644 --- a/keyboards/sam/s80/config.h +++ b/keyboards/sam/s80/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x534D -#define PRODUCT_ID 0x3830 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sam -#define PRODUCT s80 - /* key matrix size */ #define MATRIX_ROWS 11 #define MATRIX_COLS 9 diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index af109e1787..6dd583ddd6 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "s80 wkl", + "keyboard_name": "s8", + "manufacturer": "Sam", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x534D", + "pid": "0x3830", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h index a0dca89211..da483a7cf5 100644 --- a/keyboards/sam/sg81m/config.h +++ b/keyboards/sam/sg81m/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x534D //SM -#define PRODUCT_ID 0x3831 //81 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sam -#define PRODUCT SG81M - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json index 439d8562e9..59561a84f3 100644 --- a/keyboards/sam/sg81m/info.json +++ b/keyboards/sam/sg81m/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "sam sg81m", + "keyboard_name": "SG81M", + "manufacturer": "Sam", "url": "", "maintainer": "CMMS-Freather", + "usb": { + "vid": "0x534D", + "pid": "0x3831", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_7u_space": { "layout": [ diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h index 3cb61cfde6..a818d3e84f 100644 --- a/keyboards/sanctified/dystopia/config.h +++ b/keyboards/sanctified/dystopia/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5357 // "SW" -#define PRODUCT_ID 0x0001 // First public keyboard -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER Sanctified.Works -#define PRODUCT Dystopia - /* Key Matrix Size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/info.json index f282ba1803..9b363e32d3 100644 --- a/keyboards/sanctified/dystopia/info.json +++ b/keyboards/sanctified/dystopia/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Dystopia", + "manufacturer": "Sanctified.Works", "url": "", "maintainer": "Sanctified", + "usb": { + "vid": "0x5357", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_bs": { "layout": [ diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h index 9395d8ef1a..4a3b14a496 100644 --- a/keyboards/sandwich/keeb68/config.h +++ b/keyboards/sandwich/keeb68/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sandwich -#define PRODUCT Keeb68 (Patron Saint Edition) - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json index c6b5cb4f53..b5193a9486 100644 --- a/keyboards/sandwich/keeb68/info.json +++ b/keyboards/sandwich/keeb68/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keeb68 (PSE)", + "keyboard_name": "Keeb68 (Patron Saint Edition)", + "manufacturer": "sandwich", "url": "", "maintainer": "SandwichRising", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/satt/comet46/config.h b/keyboards/satt/comet46/config.h index d75294dc13..f14a389382 100644 --- a/keyboards/satt/comet46/config.h +++ b/keyboards/satt/comet46/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SatT -#define PRODUCT Comet46 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 10 diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/info.json index f49c878e08..be71dedb39 100644 --- a/keyboards/satt/comet46/info.json +++ b/keyboards/satt/comet46/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Comet46", + "manufacturer": "SatT", "url": "", "maintainer": "SatT", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/satt/vision/config.h b/keyboards/satt/vision/config.h index 2db8fa8b29..b4bf9e1978 100644 --- a/keyboards/satt/vision/config.h +++ b/keyboards/satt/vision/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5454 -#define PRODUCT_ID 0x5649 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SatT -#define PRODUCT Vision - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/satt/vision/info.json b/keyboards/satt/vision/info.json index 8d1965bfd9..bb32359aac 100644 --- a/keyboards/satt/vision/info.json +++ b/keyboards/satt/vision/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Vision", + "manufacturer": "SatT", "url": "", "maintainer": "SatT", + "usb": { + "vid": "0x5454", + "pid": "0x5649", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"PgUp", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"Q", "x":2.25, "y":0}, {"label":"W", "x":3.25, "y":0}, {"label":"E", "x":4.25, "y":0}, {"label":"R", "x":5.25, "y":0}, {"label":"T", "x":6.25, "y":0}, {"label":"Y", "x":9, "y":0}, {"label":"U", "x":10, "y":0}, {"label":"I", "x":11, "y":0}, {"label":"O", "x":12, "y":0}, {"label":"P", "x":13, "y":0}, {"label":"Back", "x":14, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"PgDn", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.25}, {"label":"A", "x":2.5, "y":1}, {"label":"S", "x":3.5, "y":1}, {"label":"D", "x":4.5, "y":1}, {"label":"F", "x":5.5, "y":1}, {"label":"G", "x":6.5, "y":1}, {"label":"H", "x":9.25, "y":1}, {"label":"J", "x":10.25, "y":1}, {"label":"K", "x":11.25, "y":1}, {"label":"L", "x":12.25, "y":1}, {"label":":", "x":13.25, "y":1}, {"label":"\"", "x":14.25, "y":1, "w":1.75}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.75, "y":2}, {"label":"N", "x":9.75, "y":2}, {"label":"M", "x":10.75, "y":2}, {"label":"<", "x":11.75, "y":2}, {"label":">", "x":12.75, "y":2}, {"label":"?", "x":13.75, "y":2, "w":1.25}, {"label":"Adjust", "x":15, "y":2}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":3.75, "y":3, "w":1.5}, {"label":"Lower", "x":5.25, "y":3, "w":2}, {"x":7.25, "y":3}, {"label":"Raise", "x":8.75, "y":3, "w":1.75}, {"label":"Enter", "x":10.5, "y":3}, {"label":"Alt", "x":11.5, "y":3, "w":1.5}, {"label":"Ctrl", "x":14.5, "y":3, "w":1.5}] diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h index 6e203a4341..99c89fdd16 100644 --- a/keyboards/sauce/mild/config.h +++ b/keyboards/sauce/mild/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8367 // "SC" -#define PRODUCT_ID 0x7783 // "MS" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sauce -#define PRODUCT Mild - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/sauce/mild/info.json b/keyboards/sauce/mild/info.json index d722a03d8b..6893180ab8 100644 --- a/keyboards/sauce/mild/info.json +++ b/keyboards/sauce/mild/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Sauce - Mild", + "keyboard_name": "Mild", + "manufacturer": "Sauce", "url": "", "maintainer": "Sauce", + "usb": { + "vid": "0x8367", + "pid": "0x7783", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h index 90c9bc522c..2452804ff0 100644 --- a/keyboards/sawnsprojects/amber80/solder/config.h +++ b/keyboards/sawnsprojects/amber80/solder/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0xA801 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects X Yuutsu X Zlane -#define PRODUCT Amber80 Solder - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json index 49ca20594c..a04fa2f716 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Amber80 SOLDER", + "keyboard_name": "Amber80 Solder", + "manufacturer": "SawnsProjects X Yuutsu X Zlane", "url": "", "maintainer": "SawnsProjects", + "usb": { + "vid": "0x5350", + "pid": "0xA801", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h index 4cd1a1b39c..66283bff69 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x6B32 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects -#define PRODUCT Krush60 - Solder - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index d95c475509..d3de2e9000 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Krush60 Solder", + "keyboard_name": "Krush60 - Solder", + "manufacturer": "SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x6B32", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs", "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan" diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index ebf8cbf740..c48080d59f 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x5B31 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects -#define PRODUCT Krush65 - Hotswap - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 2e54420137..b70ecd9ddd 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Krush65 Hotswap", + "keyboard_name": "Krush65 - Hotswap", + "manufacturer": "SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x5B31", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index 1afab16a0e..1638e35ac6 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x6B31 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SawnsProjects -#define PRODUCT Krush65 - Solder - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index b72946bf55..c7ab169977 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Krush65 Solder", + "keyboard_name": "Krush65 - Solder", + "manufacturer": "SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x6B31", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs_sp" }, diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h index 5ad3f20093..077b18d0d8 100644 --- a/keyboards/sawnsprojects/satxri6key/config.h +++ b/keyboards/sawnsprojects/satxri6key/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x0727 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MaiTheSan -#define PRODUCT Satxri6key - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index 77897e179c..a158fff7d2 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Satxri6key", + "manufacturer": "MaiTheSan", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5350", + "pid": "0x0727", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h index bf1a7cdde6..cec49e65ae 100644 --- a/keyboards/sawnsprojects/vcl65/solder/config.h +++ b/keyboards/sawnsprojects/vcl65/solder/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5350 -#define PRODUCT_ID 0x1727 -#define DEVICE_VER 0x0001 -#define MANUFACTURER VCL x SawnsProjects -#define PRODUCT VCL65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json index bae3093b4f..982a09d953 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "VCL65 Solder", + "keyboard_name": "VCL65", + "manufacturer": "VCL x SawnsProjects", "url": "", "maintainer": "MaiTheSan", + "usb": { + "vid": "0x5350", + "pid": "0x1727", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h index ca7ce70ff3..c72b7be68e 100644 --- a/keyboards/scatter42/config.h +++ b/keyboards/scatter42/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3B47 -#define DEVICE_VER 0x0001 -#define MANUFACTURER bbrfkr -#define PRODUCT scatter42 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json index 5802fc5cdc..c30750c7c2 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "scatter42", + "manufacturer": "bbrfkr", "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42", "maintainer": "bbrfkr", + "usb": { + "vid": "0xFEED", + "pid": "0x3B47", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h index a8ead5ccb5..2f656805ea 100644 --- a/keyboards/sck/gtm/config.h +++ b/keyboards/sck/gtm/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6090 -#define DEVICE_VER 0x0002 -#define MANUFACTURER SpaceCityKeyboards -#define PRODUCT GTM Pad - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 6 diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json index 147704f65e..4da024cd44 100644 --- a/keyboards/sck/gtm/info.json +++ b/keyboards/sck/gtm/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Grand Theft Macro Pad", + "keyboard_name": "GTM Pad", + "manufacturer": "SpaceCityKeyboards", "url": "", "maintainer": "jrfhoutx", + "usb": { + "vid": "0xFEED", + "pid": "0x6090", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h index b008ff1b24..97a8cf476f 100644 --- a/keyboards/sck/m0116b/config.h +++ b/keyboards/sck/m0116b/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER jrfhoutx -#define PRODUCT Golden Delicious - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json index 37b3a10176..df77370b8b 100644 --- a/keyboards/sck/m0116b/info.json +++ b/keyboards/sck/m0116b/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Golden Delicious - M0116B", + "manufacturer": "jrfhoutx", "url": "https://github.com/jrfhoutx", "maintainer": "jrfhoutx", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_m0116_ansi": { "layout": [ diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h index 9ff392ec25..2b0d3ec458 100644 --- a/keyboards/sck/neiso/config.h +++ b/keyboards/sck/neiso/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Space City Keyboards -#define PRODUCT NEISO - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 5 diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json index 069b01a2e9..4303e58857 100644 --- a/keyboards/sck/neiso/info.json +++ b/keyboards/sck/neiso/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "NEISO", + "manufacturer": "Space City Keyboards", "url": "", "maintainer": "jrfhoutx", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}] diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index 6e3d617e9a..986047c35b 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5343 // "SC" -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Space City Keyboards -#define PRODUCT OSA - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index 210c302f90..37e05235f6 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "OSA", + "manufacturer": "Space City Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5343", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default_ansi": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h index 2eb52658e5..422d7e2fac 100644 --- a/keyboards/sekigon/grs_70ec/config.h +++ b/keyboards/sekigon/grs_70ec/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x70EC -#define DEVICE_VER 0x0001 -#define MANUFACTURER sekigon-gonnoc -#define PRODUCT GRS-70EC - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json index 93a6327a67..55db0571f7 100644 --- a/keyboards/sekigon/grs_70ec/info.json +++ b/keyboards/sekigon/grs_70ec/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "grs_70ec", + "keyboard_name": "GRS-70EC", + "manufacturer": "sekigon-gonnoc", "url": "https://github.com/sekigon-gonnoc/GRS-70EC-doc/", "maintainer": "sekigon-gonnoc", + "usb": { + "vid": "0xFEED", + "pid": "0x70EC", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sendyyeah/75pixels/config.h b/keyboards/sendyyeah/75pixels/config.h index 9cb41e4917..26fc9334fd 100644 --- a/keyboards/sendyyeah/75pixels/config.h +++ b/keyboards/sendyyeah/75pixels/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5359 -#define PRODUCT_ID 0x3735 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sendyyeah -#define PRODUCT 75 Pixels - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json index 6fb65c1d88..4bfc29e243 100644 --- a/keyboards/sendyyeah/75pixels/info.json +++ b/keyboards/sendyyeah/75pixels/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "beVi", + "keyboard_name": "75 Pixels", + "manufacturer": "sendyyeah", "url": "https://github.com/sendyyeah/bevi", "maintainer": "sendyyeah", + "usb": { + "vid": "0x5359", + "pid": "0x3735", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x15": { "layout": [ diff --git a/keyboards/sendyyeah/bevi/config.h b/keyboards/sendyyeah/bevi/config.h index 8283329986..fff3556e2b 100644 --- a/keyboards/sendyyeah/bevi/config.h +++ b/keyboards/sendyyeah/bevi/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5359 -#define PRODUCT_ID 0x4256 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sendyyeah -#define PRODUCT beVi - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json index 05e66f3aa5..508c3f50ef 100644 --- a/keyboards/sendyyeah/bevi/info.json +++ b/keyboards/sendyyeah/bevi/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "beVi", + "manufacturer": "sendyyeah", "url": "https://github.com/sendyyeah/bevi", "maintainer": "sendyyeah", + "usb": { + "vid": "0x5359", + "pid": "0x4256", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h index 86c6d26e16..48fd375b07 100644 --- a/keyboards/sendyyeah/pix/config.h +++ b/keyboards/sendyyeah/pix/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5359 -#define PRODUCT_ID 0x4e34 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sendyyeah -#define PRODUCT Pix - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 5 diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json index 39e016dae1..339ad499f6 100644 --- a/keyboards/sendyyeah/pix/info.json +++ b/keyboards/sendyyeah/pix/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Pix", + "manufacturer": "sendyyeah", "url": "https://github.com/sendz/pix", "maintainer": "sendz", + "usb": { + "vid": "0x5359", + "pid": "0x4E34", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h index dc2cb68c79..ea48db4e15 100644 --- a/keyboards/senselessclay/ck60/config.h +++ b/keyboards/senselessclay/ck60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x0601 // 60rgb (1) -#define DEVICE_VER 0x0000 // rev0 -#define MANUFACTURER senselessclay -#define PRODUCT ck60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json index 55a7e95b46..27088f2785 100644 --- a/keyboards/senselessclay/ck60/info.json +++ b/keyboards/senselessclay/ck60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "CK60", + "manufacturer": "senselessclay", "url": "https://candykeys.com", "maintainer": "had-i", + "usb": { + "vid": "0x4849", + "pid": "0x0601", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60_iso" }, diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h index f23560f164..2038c58f44 100644 --- a/keyboards/senselessclay/ck65/config.h +++ b/keyboards/senselessclay/ck65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x0651 // 65rgb (1) -#define DEVICE_VER 0x0000 // rev0 -#define MANUFACTURER senselessclay -#define PRODUCT ck65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json index c1dcf3cebd..54e43ccc94 100644 --- a/keyboards/senselessclay/ck65/info.json +++ b/keyboards/senselessclay/ck65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "CK65", + "manufacturer": "senselessclay", "url": "https://candykeys.com", "maintainer": "had-i", + "usb": { + "vid": "0x4849", + "pid": "0x0651", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_iso" }, diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h index 5656d77ea5..972befc147 100644 --- a/keyboards/senselessclay/gos65/config.h +++ b/keyboards/senselessclay/gos65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x0650 // 65rgb (0) -#define DEVICE_VER 0x0001 // rev1 -#define MANUFACTURER senselessclay -#define PRODUCT gos65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index 95f0960a47..6bad2ae556 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "gos65", + "manufacturer": "senselessclay", "url": "https://senselessclay.com/", "maintainer": "hadi", + "usb": { + "vid": "0x4849", + "pid": "0x0650", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":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":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h index 60a4b23d02..ba4619b956 100644 --- a/keyboards/senselessclay/had60/config.h +++ b/keyboards/senselessclay/had60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4849 // HI -#define PRODUCT_ID 0x060F // 60flex -#define DEVICE_VER 0x0001 // rev1 -#define MANUFACTURER senselessclay -#define PRODUCT had60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json index a14c171d69..5dbcf2f68c 100644 --- a/keyboards/senselessclay/had60/info.json +++ b/keyboards/senselessclay/had60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "had60", + "manufacturer": "senselessclay", "url": "https://senselessclay.com/", "maintainer": "hadi", + "usb": { + "vid": "0x4849", + "pid": "0x060F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index 0426773a68..341bad6b67 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq -#define PRODUCT Sentraq Number Pad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index 806edcea27..b0c0ca370d 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "Sentraq Number Pad", + "keyboard_name": "Number Pad", + "manufacturer": "Sentraq", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "url": "https://sentraq.com/collections/kits/products/number-pad-rgb-kit", "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 2f02e8e162..e1e829b3ae 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT S65-PLUS -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index 141f7d6c63..625bc63fd3 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "S65-Plus", + "manufacturer": "Sentraq", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index b8886bf67f..61a468a33c 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT S65-X RGB -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sentraq - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index 20088cee89..7e87cf2011 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "S65-X PCB", + "manufacturer": "Sentraq", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h index 3bf7efc77d..9181a49be1 100644 --- a/keyboards/sergiopoverony/creator_pro/config.h +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -17,14 +17,6 @@ #pragma once #include "config_common.h" -/* vid pid */ -#define VENDOR_ID 0x8B1E -#define PRODUCT_ID 0x0C00 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SergioPoverony -#define PRODUCT Creator Pro - - /* key matrix size pins */ #define MATRIX_ROWS 1 #define MATRIX_COLS 9 diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json index a64615a78f..71d82a85bb 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Creator Pro", + "manufacturer": "SergioPoverony", "url": "https://github.com/sergiopoverony", "maintainer": "SergioPoverony", + "usb": { + "vid": "0x8B1E", + "pid": "0x0C00", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h index 016ab0d460..f3828b023c 100644 --- a/keyboards/sets3n/kk980/config.h +++ b/keyboards/sets3n/kk980/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x404A -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sets3n -#define PRODUCT kk980 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json index dad5530d44..9b712f7507 100644 --- a/keyboards/sets3n/kk980/info.json +++ b/keyboards/sets3n/kk980/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "kk980", + "manufacturer": "Sets3n", "url": "https://i.imgur.com/MQA6FXb.jpg", "maintainer": "Sets3n", + "usb": { + "vid": "0x404A", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h index 26f9c9515e..063c883381 100644 --- a/keyboards/shambles/config.h +++ b/keyboards/shambles/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4F42 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OsciX -#define PRODUCT Shambles TKL - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/shambles/info.json b/keyboards/shambles/info.json index 5952442d7d..071f0c7568 100644 --- a/keyboards/shambles/info.json +++ b/keyboards/shambles/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Shambles TKL", + "manufacturer": "OsciX", "url": "", "maintainer": "OsciX", + "usb": { + "vid": "0xFEED", + "pid": "0x0F42", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1.5, "y":0}, {"label":"K02", "x":2.5, "y":0}, {"label":"K03", "x":3.5, "y":0}, {"label":"K04", "x":4.75, "y":0}, {"label":"K05", "x":5.75, "y":0}, {"label":"K06", "x":6.75, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"K08", "x":9, "y":0}, {"label":"K09", "x":10.25, "y":0}, {"label":"K10", "x":11.25, "y":0}, {"label":"K11", "x":12.25, "y":0}, {"label":"K12", "x":0, "y":1.5}, {"label":"K13", "x":1, "y":1.5}, {"label":"K14", "x":2, "y":1.5}, {"label":"K15", "x":3, "y":1.5}, {"label":"K16", "x":4, "y":1.5}, {"label":"K17", "x":5, "y":1.5}, {"label":"K18", "x":6, "y":1.5}, {"label":"K19", "x":7, "y":1.5}, {"label":"K20", "x":8, "y":1.5}, {"label":"K21", "x":9, "y":1.5}, {"label":"K22", "x":10.25, "y":1.25}, {"label":"K23", "x":11.25, "y":1.25}, {"label":"K24", "x":12.25, "y":1.25}, {"label":"K25", "x":0, "y":2.5}, {"label":"K26", "x":1, "y":2.5}, {"label":"K27", "x":2, "y":2.5}, {"label":"K28", "x":3, "y":2.5}, {"label":"K29", "x":4, "y":2.5}, {"label":"K30", "x":5, "y":2.5}, {"label":"K31", "x":6, "y":2.5}, {"label":"K32", "x":7, "y":2.5}, {"label":"K33", "x":8, "y":2.5}, {"label":"K34", "x":9, "y":2.5}, {"label":"K35", "x":11.25, "y":2.5}, {"label":"K36", "x":0.5, "y":3.5}, {"label":"K37", "x":1.5, "y":3.5}, {"label":"K38", "x":2.5, "y":3.5}, {"label":"K39", "x":3.5, "y":3.5}, {"label":"K40", "x":4.5, "y":3.5, "w":2}, {"label":"K41", "x":6.5, "y":3.5}, {"label":"K42", "x":7.5, "y":3.5}, {"label":"K43", "x":8.5, "y":3.5}, {"label":"K44", "x":10.25, "y":3.5}, {"label":"K45", "x":11.25, "y":3.5}, {"label":"K43", "x":12.25, "y":3.5}] diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h index ee84318f3d..2873ae72c9 100644 --- a/keyboards/shapeshifter4060/config.h +++ b/keyboards/shapeshifter4060/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0x1209 // pid.codes Vendor ID -#define PRODUCT_ID 0xA1F1 // Shapeshifter 4060: https://pid.codes/1209/A1F1/ -#define DEVICE_VER 0x0002 -#define MANUFACTURER Vosechu -#define PRODUCT Shapeshifter 4060 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json index 5ec2bc2b03..14a0e4407f 100644 --- a/keyboards/shapeshifter4060/info.json +++ b/keyboards/shapeshifter4060/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Shapeshifter 4060", + "manufacturer": "Vosechu", "url": "kitsunekeyboards.com", "maintainer": "vosechu", + "usb": { + "vid": "0x1209", + "pid": "0xA1F1", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h index 80243234e7..1fd31866d2 100644 --- a/keyboards/shiro/config.h +++ b/keyboards/shiro/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER T.Shinohara -#define PRODUCT Shiro - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 3 diff --git a/keyboards/shiro/info.json b/keyboards/shiro/info.json index a4be71c6d3..e2ff5a96dd 100644 --- a/keyboards/shiro/info.json +++ b/keyboards/shiro/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Shiro", + "manufacturer": "T.Shinohara", "url": "https://github.com/ShinoharaTa/keyboards/blob/master/Shiro/manual/build_guide_ja.md", "maintainer": "T.Shinohara", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h index 059515c776..589fad2c8d 100644 --- a/keyboards/shk9/config.h +++ b/keyboards/shk9/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5348 -#define PRODUCT_ID 0x4B39 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Superhuman -#define PRODUCT SHK9 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/shk9/info.json b/keyboards/shk9/info.json index 529668ce0d..7784728b0a 100644 --- a/keyboards/shk9/info.json +++ b/keyboards/shk9/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "SHK9", + "manufacturer": "Superhuman", "url": "http://superhuman.website", "maintainer": "Sam Hudson", + "usb": { + "vid": "0x5348", + "pid": "0x4B39", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/sidderskb/majbritt/rev1/config.h b/keyboards/sidderskb/majbritt/rev1/config.h index a6ccb2221b..cc05bc722d 100644 --- a/keyboards/sidderskb/majbritt/rev1/config.h +++ b/keyboards/sidderskb/majbritt/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x534B // SB -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SiddersKB -#define PRODUCT Majbritt - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json index 2677edb794..c337ab9cb1 100644 --- a/keyboards/sidderskb/majbritt/rev1/info.json +++ b/keyboards/sidderskb/majbritt/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Majbritt", + "keyboard_name": "Majbritt Rev1", + "manufacturer": "SiddersKb", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x534B", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h index 6bee0fa6bf..ac78a636e3 100644 --- a/keyboards/sidderskb/majbritt/rev2/config.h +++ b/keyboards/sidderskb/majbritt/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x534B // SB -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0002 -#define MANUFACTURER SiddersKb -#define PRODUCT Majbritt - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json index 3e2aa450ad..9c3af6d1c4 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Majbritt Rev2", - "maintainer": "Sleepdealr", + "manufacturer": "SiddersKb", "url": "https://sidderskb.co.uk/", + "maintainer": "Sleepdealr", + "usb": { + "vid": "0x534B", + "pid": "0x0001", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/signum/3_0/config.h b/keyboards/signum/3_0/config.h index d0c3175d0f..4ecd7cb9fd 100644 --- a/keyboards/signum/3_0/config.h +++ b/keyboards/signum/3_0/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Troy Fletcher -#define PRODUCT Signum30 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/signum/3_0/info.json b/keyboards/signum/3_0/info.json index 2966e5114e..632d87e711 100644 --- a/keyboards/signum/3_0/info.json +++ b/keyboards/signum/3_0/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Signum 3.0", + "manufacturer": "Troy Fletcher", "url": "http://troyfletcher.net/", "maintainer": "jceb", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index 28b53eb066..185b3ef067 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x27DB -#define DEVICE_VER 0x0001 -#define MANUFACTURER SwanMatch -#define PRODUCT SilverBullet44 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index 40e7fb832f..bd6878aa66 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "SilverBullet44", + "manufacturer": "SwanMatch", "url": "https://swanmatch.booth.pm/items/1561270", "maintainer": "swanmatch", + "usb": { + "vid": "0x16C0", + "pid": "0x27DB", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h index 1d3ed105e1..82e3ed00f1 100644 --- a/keyboards/singa/config.h +++ b/keyboards/singa/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x736B // SK -#define PRODUCT_ID 0x7575 -#define DEVICE_VER 0x0200 -#define MANUFACTURER Singa Keyboards -#define PRODUCT Singa - #define RGBLED_NUM 18 #define MATRIX_ROWS 7 diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json index d65bf0c07b..ca79d19e72 100644 --- a/keyboards/singa/info.json +++ b/keyboards/singa/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Singa", + "manufacturer": "Singa Keyboards", "url": "http://singakbd.com/", "maintainer": "qmk", + "usb": { + "vid": "0x736B", + "pid": "0x7575", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT": { "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":1}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5, "w":1}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] diff --git a/keyboards/sirius/uni660/rev1/config.h b/keyboards/sirius/uni660/rev1/config.h index 4b810e2cd6..649fd5deda 100644 --- a/keyboards/sirius/uni660/rev1/config.h +++ b/keyboards/sirius/uni660/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5352 // "SR" -#define PRODUCT_ID 0x0201 // Second Product First Version -#define DEVICE_VER 0x1912 // 2019.12 -#define MANUFACTURER SiRius -#define PRODUCT Uni660 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/info.json index f3a9b244e8..9960c4c35b 100644 --- a/keyboards/sirius/uni660/rev1/info.json +++ b/keyboards/sirius/uni660/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Uni660", + "manufacturer": "SiRius", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5352", + "pid": "0x0201", + "device_version": "19.1.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sirius/uni660/rev2/ansi/config.h b/keyboards/sirius/uni660/rev2/ansi/config.h index 19ee1166c3..649fd5deda 100644 --- a/keyboards/sirius/uni660/rev2/ansi/config.h +++ b/keyboards/sirius/uni660/rev2/ansi/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5352 // "SR" -#define PRODUCT_ID 0x0202 // Second Product Second Version -#define DEVICE_VER 0x2004 // 2020.12 -#define MANUFACTURER SiRius -#define PRODUCT Uni660 V2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sirius/uni660/rev2/ansi/info.json b/keyboards/sirius/uni660/rev2/ansi/info.json index 630038cdd0..eaf2e8538a 100644 --- a/keyboards/sirius/uni660/rev2/ansi/info.json +++ b/keyboards/sirius/uni660/rev2/ansi/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Uni660", + "keyboard_name": "Uni660 V2 ANSI", + "manufacturer": "SiRius", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5352", + "pid": "0x0202", + "device_version": "20.0.4" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/sirius/uni660/rev2/iso/config.h b/keyboards/sirius/uni660/rev2/iso/config.h index f0f771707e..649fd5deda 100644 --- a/keyboards/sirius/uni660/rev2/iso/config.h +++ b/keyboards/sirius/uni660/rev2/iso/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5352 // "SR" -#define PRODUCT_ID 0x0203 // Second Product Third Version -#define DEVICE_VER 0x2004 // 2020.12 -#define MANUFACTURER SiRius -#define PRODUCT Uni660 V2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/info.json index e2d72bfb51..bb46a2f3ab 100644 --- a/keyboards/sirius/uni660/rev2/iso/info.json +++ b/keyboards/sirius/uni660/rev2/iso/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Uni660", + "keyboard_name": "Uni660 V2 ISO", + "manufacturer": "SiRius", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5352", + "pid": "0x0203", + "device_version": "20.0.4" + }, "layouts": { "LAYOUT_iso": { "layout": [ diff --git a/keyboards/sirius/unigo66/config.h b/keyboards/sirius/unigo66/config.h index 777046db0c..d1511874ec 100644 --- a/keyboards/sirius/unigo66/config.h +++ b/keyboards/sirius/unigo66/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1001 -#define DEVICE_VER 0x1901 -#define MANUFACTURER Sirius -#define PRODUCT UniGo66 - /* size of virtual matrix */ #define MATRIX_ROWS 16 #define MATRIX_COLS 16 diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json index d1acdeeb07..fca325dd92 100644 --- a/keyboards/sirius/unigo66/info.json +++ b/keyboards/sirius/unigo66/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "UniGo66", + "manufacturer": "Sirius", "url": "https://discord.gg/GJ8bdM", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x1001", + "device_version": "19.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h index a4d19a5ca1..f9379f5720 100644 --- a/keyboards/sixkeyboard/config.h +++ b/keyboards/sixkeyboard/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x746B -#define PRODUCT_ID 0x736B -#define DEVICE_VER 0x0001 -#define MANUFACTURER techkeys.us -#define PRODUCT sixkeykeyboard - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json index 9f8ffa4879..2c9206fcbf 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Techkeys SixKeyBoard", + "keyboard_name": "SixKeyBoard", + "manufacturer": "TechKeys", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x746B", + "pid": "0x736B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x3": { "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/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 059daa0392..781eb23a7e 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF984 -#define PRODUCT_ID 0xB5E9 -#define DEVICE_VER 0x0001 -#define MANUFACTURER BredWorks -#define PRODUCT Skeletn87 Hotswap - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index 9878d6d194..a310bb260b 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "skeletn87 hotswap", + "keyboard_name": "Skeletn87 Hotswap", + "manufacturer": "BredWorks", "url": "", "maintainer": "kb-elmo<mail@elmo.space>", + "usb": { + "vid": "0xF984", + "pid": "0xB5E9", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index 7580d0a43e..3b5ce9692a 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF984 -#define PRODUCT_ID 0xB5E8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER BredWorks -#define PRODUCT Skeletn87 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index e3d8c6d999..c62f4e559e 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "skeletn87", + "keyboard_name": "Skeletn87", + "manufacturer": "BredWorks", "url": "", "maintainer": "kb-elmo<mail@elmo.space>", + "usb": { + "vid": "0xF984", + "pid": "0xB5E8", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h index 3e93068b5a..164bce68bf 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/config.h +++ b/keyboards/skeletonkbd/skeletonnumpad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x736C -#define PRODUCT_ID 0x6E70 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SkeletonKBD -#define PRODUCT SkeletonNumPad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json index 0dac570601..050ff5b61b 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/info.json +++ b/keyboards/skeletonkbd/skeletonnumpad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "skeletonnumpad", + "keyboard_name": "SkeletonNumPad", + "manufacturer": "SkeletonKBD", "url": "https://github.com/skeletonkbd/SkeletonNumPad", "maintainer": "skeletonkbd", + "usb": { + "vid": "0x736C", + "pid": "0x6E70", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h index e736e4c8d4..9668da656f 100644 --- a/keyboards/skergo/config.h +++ b/keyboards/skergo/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B49 -#define PRODUCT_ID 0x534B -#define DEVICE_VER 0x0001 -#define MANUFACTURER Keyzio -#define PRODUCT SKErgo - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json index 83e277a91d..c47a1ac45f 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "SKErgo", + "manufacturer": "Keyzio", "url": "https://keyz.io", "maintainer": "kevinzhao-tech", + "usb": { + "vid": "0x4B49", + "pid": "0x534B", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_bs" }, diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h index f061840771..69aac0b560 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/config.h +++ b/keyboards/skippys_custom_pcs/rooboard65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x36B6 // Skippys Custom PCs -#define PRODUCT_ID 0x0002 // Rooboard65 -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER FJLabs -#define PRODUCT Rooboard65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json index 3f195fc7c7..ab68e33ec0 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Rooboard65", + "manufacturer": "FJLabs", "url": "https://www.fjlaboratories.com/", "maintainer": "FJLabs", + "usb": { + "vid": "0x36B6", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h index 9d30421dcb..7d8fe627e9 100644 --- a/keyboards/skippys_custom_pcs/roopad/config.h +++ b/keyboards/skippys_custom_pcs/roopad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x36B6 // skippys_custom_pcs -#define PRODUCT_ID 0x0001 // RooPad -#define DEVICE_VER 0x0001 // Version 1 -#define MANUFACTURER ToastyStoemp -#define PRODUCT RooPad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 5 diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json index e866a1cc29..734310ed8c 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RooPad", + "manufacturer": "ToastyStoemp", "url": "", "maintainer": "ToastyStoemp", + "usb": { + "vid": "0x36B6", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Num Lock", "x":1.5, "y":0}, {"label":"/", "x":2.5, "y":0}, {"label":"*", "x":3.5, "y":0}, {"label":"-", "x":4.5, "y":0}, {"x":0, "y":1}, {"label":"7", "x":1.5, "y":1}, {"label":"8", "x":2.5, "y":1}, {"label":"9", "x":3.5, "y":1}, {"label":"+", "x":4.5, "y":1, "h":2}, {"x":0, "y":2}, {"label":"4", "x":1.5, "y":2}, {"label":"5", "x":2.5, "y":2}, {"label":"6", "x":3.5, "y":2}, {"x":0, "y":3}, {"label":"1", "x":1.5, "y":3}, {"label":"2", "x":2.5, "y":3}, {"label":"3", "x":3.5, "y":3}, {"label":"Enter", "x":4.5, "y":3, "h":2}, {"x":0, "y":4}, {"label":"0", "x":1.5, "y":4, "w":2}, {"label":".", "x":3.5, "y":4}] diff --git a/keyboards/skme/zeno/config.h b/keyboards/skme/zeno/config.h index 91245ed508..a6404a8ff4 100644 --- a/keyboards/skme/zeno/config.h +++ b/keyboards/skme/zeno/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4048 // baul.xyz / sandkeys.me -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SKME -#define PRODUCT Zeno - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/info.json index 14e9d92422..956761eeaa 100644 --- a/keyboards/skme/zeno/info.json +++ b/keyboards/skme/zeno/info.json @@ -1,8 +1,13 @@ - { "keyboard_name": "Zeno", + "manufacturer": "SKME", "url": "https://baul.xyz", "maintainer": "qmk", + "usb": { + "vid": "0x4048", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [{"x":0.25, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0.25, "y":1, "w":1.5}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":0.15, "y":2, "w":1.75}, {"x":1.9, "y":2}, {"x":2.9, "y":2}, {"x":3.9, "y":2}, {"x":4.9, "y":2}, {"x":5.9, "y":2}, {"x":9.05, "y":2}, {"x":10.05, "y":2}, {"x":11.05, "y":2}, {"x":12.05, "y":2}, {"x":13.05, "y":2}, {"x":14.05, "y":2}, {"x":15.05, "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":8.55, "y":3}, {"x":9.55, "y":3}, {"x":10.55, "y":3}, {"x":11.55, "y":3}, {"x":12.55, "y":3}, {"x":13.55, "y":3}, {"x":14.55, "y":3, "w":1.75}, {"x":16.3, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"x":8.55, "y":4, "w":2.75}, {"x":11.3, "y":4, "w":1.5}, {"x":15.8, "y":4, "w":1.5}] diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h index 7bcc71bb3c..6aa113dcb6 100644 --- a/keyboards/slz40/config.h +++ b/keyboards/slz40/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SithLord -#define PRODUCT slz40 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/slz40/info.json b/keyboards/slz40/info.json index 471bba73c3..4b69d20efb 100644 --- a/keyboards/slz40/info.json +++ b/keyboards/slz40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "slz40", + "manufacturer": "SithLord", "url": "https://github.com/sithlord121/slz40", "maintainer": "SithLord", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h index c96fa911e5..5d934dd937 100644 --- a/keyboards/smallkeyboard/config.h +++ b/keyboards/smallkeyboard/config.h @@ -17,13 +17,7 @@ #pragma once -/* USB Device descriptor parameter */ #include "config_common.h" -#define VENDOR_ID 0x7A71 // "zq" = zhouqiong19840119 -#define PRODUCT_ID 0x736B // "sk" = smallkeyboard -#define DEVICE_VER 0x0001 -#define MANUFACTURER zhouqiong19840119 -#define PRODUCT smallkeyboard /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json index 8d1d642c10..9514637685 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "smallkeyboard", + "manufacturer": "zhouqiong19840119", "url": "", "maintainer": "zhouqiong19840119", + "usb": { + "vid": "0x7A71", + "pid": "0x736B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x3": { "layout": [ diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h index 084f008a78..e26366ade3 100644 --- a/keyboards/smithrune/iron180/config.h +++ b/keyboards/smithrune/iron180/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8384 //SR for Smith and Rune -#define PRODUCT_ID 0x1180 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SmithRune -#define PRODUCT IRON180 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json index 64ee4b4ee3..cd68970641 100644 --- a/keyboards/smithrune/iron180/info.json +++ b/keyboards/smithrune/iron180/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Iron180", + "manufacturer": "SmithRune", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x8384", + "pid": "0x1180", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h index 2c7d0e178f..fdb3b9a909 100644 --- a/keyboards/smk60/config.h +++ b/keyboards/smk60/config.h @@ -6,13 +6,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xDEAD -#define PRODUCT_ID 0x6585 -#define DEVICE_VER 0x0001 -#define MANUFACTURER astro -#define PRODUCT smk 60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json index 5aff493fd4..c3e3bd29e0 100644 --- a/keyboards/smk60/info.json +++ b/keyboards/smk60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "SMK60", + "manufacturer": "astro", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xDEAD", + "pid": "0x6585", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_wkl": { "layout": [ diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h index f15fc72200..816a0449be 100644 --- a/keyboards/snampad/config.h +++ b/keyboards/snampad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Snamellit -#define PRODUCT snampad - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/snampad/info.json b/keyboards/snampad/info.json index 740ab15ad8..de827697c2 100644 --- a/keyboards/snampad/info.json +++ b/keyboards/snampad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "snampad", + "manufacturer": "Snamellit", "url": "", "maintainer": "ptillemans", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_6x4": { "layout": [ diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h index 492c5680b8..6d56aece7c 100644 --- a/keyboards/sneakbox/aliceclone/config.h +++ b/keyboards/sneakbox/aliceclone/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sneakbox -#define PRODUCT AliceClone - /*Bootmagic boot button, set to topmost, leftmost key */ #define BOOTMAGIC_LITE_ROW 2 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json index 9fbee0c692..9fc342135d 100644 --- a/keyboards/sneakbox/aliceclone/info.json +++ b/keyboards/sneakbox/aliceclone/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Alice Clone", + "keyboard_name": "AliceClone", + "manufacturer": "Sneakbox", "url": "https://sneakbox.design", "maintainer": "mujimanic", + "usb": { + "vid": "0x5342", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h index 6e30dbca96..0218fc0675 100644 --- a/keyboards/sneakbox/aliceclonergb/config.h +++ b/keyboards/sneakbox/aliceclonergb/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 -#define PRODUCT_ID 0x0006 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sneakbox -#define PRODUCT AliceClone RGB - /*Bootmagic boot button, set to topmost, leftmost key */ #define BOOTMAGIC_LITE_ROW 2 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json index 9fbee0c692..867ae9497a 100644 --- a/keyboards/sneakbox/aliceclonergb/info.json +++ b/keyboards/sneakbox/aliceclonergb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Alice Clone", + "keyboard_name": "AliceClone RGB", + "manufacturer": "Sneakbox", "url": "https://sneakbox.design", "maintainer": "mujimanic", + "usb": { + "vid": "0x5342", + "pid": "0x0006", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h index 81fdf5b374..7c7f3b0ad9 100644 --- a/keyboards/sneakbox/ava/config.h +++ b/keyboards/sneakbox/ava/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sneakbox -#define PRODUCT AVA - /*Bootmagic boot button, set to topmost, leftmost key */ #define BOOTMAGIC_LITE_ROW 2 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index 276efce018..dc31241874 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "AVA", + "manufacturer": "Sneakbox", "url": "https://sneakbox.com", "maintainer": "mujimanic", + "usb": { + "vid": "0x5342", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_alice_split_bs": "LAYOUT_ava_split_bs", "LAYOUT_alice": "LAYOUT_ava" diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h index 72b3265db6..1e02d62d76 100644 --- a/keyboards/sneakbox/disarray/ortho/config.h +++ b/keyboards/sneakbox/disarray/ortho/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sneakbox -#define PRODUCT Disarray (Ortholinear Layout) - /*Bootmagic boot button, set to topmost, leftmost key */ #define BOOTMAGIC_LITE_ROW 1 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json index 350e482177..5172c0c963 100644 --- a/keyboards/sneakbox/disarray/ortho/info.json +++ b/keyboards/sneakbox/disarray/ortho/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Disarray (Ortholinear)", + "manufacturer": "Sneakbox", "url": "https://sneakbox.com", "maintainer": "mujimanic", + "usb": { + "vid": "0x5342", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h index cc9a2ebd49..140cb58bf1 100644 --- a/keyboards/sneakbox/disarray/staggered/config.h +++ b/keyboards/sneakbox/disarray/staggered/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Sneakbox -#define PRODUCT Disarray (Staggered Layout) - /*Bootmagic boot button, set to topmost, leftmost key */ #define BOOTMAGIC_LITE_ROW 1 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json index f08d5389bf..2629c1ea4f 100644 --- a/keyboards/sneakbox/disarray/staggered/info.json +++ b/keyboards/sneakbox/disarray/staggered/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Disarray (Staggered)", + "manufacturer": "Sneakbox", "url": "https://sneakbox.design", "maintainer": "mujimanic", + "usb": { + "vid": "0x5342", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h index 93048f3cd1..8663bf8933 100755 --- a/keyboards/sofle/keyhive/config.h +++ b/keyboards/sofle/keyhive/config.h @@ -19,13 +19,6 @@ #pragma once #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0xFC32 -#define PRODUCT_ID 0x1287 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Keyhive -#define PRODUCT Sofle - // Key matrix size // Rows are doubled-up. Added extra column for rotary encoder VIA mapping. #define MATRIX_ROWS 10 diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json index aafc6a8c8b..fd15873c42 100644 --- a/keyboards/sofle/keyhive/info.json +++ b/keyboards/sofle/keyhive/info.json @@ -1,5 +1,11 @@ { "keyboard_name": "Sofle", + "manufacturer": "Keyhive", + "usb": { + "vid": "0xFC32", + "pid": "0x1287", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h index a34c574326..26d35982df 100644 --- a/keyboards/sofle/rev1/config.h +++ b/keyboards/sofle/rev1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFC32 -#define PRODUCT_ID 0x0287 -#define DEVICE_VER 0x0001 -#define MANUFACTURER JosefAdamcik -#define PRODUCT Sofle - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json index 7673c485bf..00afc505e3 100644 --- a/keyboards/sofle/rev1/info.json +++ b/keyboards/sofle/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Sofle", + "manufacturer": "JosefAdamcik", "url": "https://github.com/josefadamcik/SofleKeyboard", "maintainer": "Josef Adamcik <josef.adamcik@gmail.com>", + "usb": { + "vid": "0xFC32", + "pid": "0x0287", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h index 81acb34604..f4810d0fa8 100644 --- a/keyboards/soup10/config.h +++ b/keyboards/soup10/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5375 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER icesoup -#define PRODUCT soup10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/soup10/info.json b/keyboards/soup10/info.json index e5b52a8b94..83fe427115 100644 --- a/keyboards/soup10/info.json +++ b/keyboards/soup10/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Soup10", + "manufacturer": "icesoup", "url": "https://github.com/Sadeeed/soup10", "maintainer": "Sadeeed", + "usb": { + "vid": "0x5375", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h index 0721302dbe..444ac403bb 100644 --- a/keyboards/sowbug/68keys/config.h +++ b/keyboards/sowbug/68keys/config.h @@ -20,13 +20,6 @@ #include "config_common.h" -// USB Device descriptor parameter -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x8888 -#define DEVICE_VER 0x0001 -#define MANUFACTURER github.com/sowbug -#define PRODUCT 68-key keyboard - // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json index bd9d00197d..03018825c5 100644 --- a/keyboards/sowbug/68keys/info.json +++ b/keyboards/sowbug/68keys/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "68keys", + "manufacturer": "Sowbug", "url": "github.com/sowbug", "maintainer": "sowbug", + "usb": { + "vid": "0xFEED", + "pid": "0x8888", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h index 44e82bbac7..9523e02e9d 100644 --- a/keyboards/sowbug/ansi_tkl/config.h +++ b/keyboards/sowbug/ansi_tkl/config.h @@ -20,13 +20,6 @@ #include "config_common.h" -// USB Device descriptor parameters -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x8889 -#define DEVICE_VER 0x0001 -#define MANUFACTURER github.com/sowbug -#define PRODUCT ANSI TKL - // key matrix size #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json index f1b7f10034..a7ff38a7fe 100644 --- a/keyboards/sowbug/ansi_tkl/info.json +++ b/keyboards/sowbug/ansi_tkl/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ansi_tkl", + "keyboard_name": "ANSI TKL", + "manufacturer": "Sowbug", "url": "github.com/sowbug", "maintainer": "sowbug", + "usb": { + "vid": "0xFEED", + "pid": "0x8889", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 932b129f84..6d8d5554c4 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4452 // "DR" short for DrewKeys -#define PRODUCT_ID 0x534f // "SO" short for Soy -#define DEVICE_VER 0x0001 -#define MANUFACTURER drewkeys -#define PRODUCT soy20 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json index 3ec8ad72e0..fd6f34592f 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Soy20", + "manufacturer": "drewkeys", "url": "", "maintainer": "twholt", + "usb": { + "vid": "0x4452", + "pid": "0x534F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h index da9fd10575..6a2ac596fb 100755 --- a/keyboards/spaceholdings/nebula12/config.h +++ b/keyboards/spaceholdings/nebula12/config.h @@ -25,13 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* LSE clock */ #define STM32_LSECLK 32768 -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8968 -#define PRODUCT_ID 0x5337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Yiancar-Designs -#define PRODUCT NEBULA12 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json index 64ad3747a6..aca8ea5f69 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "NEBULA12", + "manufacturer": "Yiancar-Designs", "url": "", "maintainer": "yiancar", + "usb": { + "vid": "0x8968", + "pid": "0x5337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_68_ansi": { "layout": [ diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h index 60ea9eb3ca..ac3826b253 100755 --- a/keyboards/spaceholdings/nebula12b/config.h +++ b/keyboards/spaceholdings/nebula12b/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8968 -#define PRODUCT_ID 0x5332 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Yiancar-Designs -#define PRODUCT NEBULA12B - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json index 4580cca278..9da7dfcb26 100755 --- a/keyboards/spaceholdings/nebula12b/info.json +++ b/keyboards/spaceholdings/nebula12b/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "NEBULA12B", + "manufacturer": "Yiancar-Designs", "url": "", "maintainer": "yiancar", + "usb": { + "vid": "0x8968", + "pid": "0x5332", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index 1d6cb5e918..a8a9803d15 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8968 -#define PRODUCT_ID 0x5336 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Yiancar-Designs -#define PRODUCT NEBULA68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json index a0f0ba8aa3..626bb51a9b 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "NEBULA68", + "manufacturer": "Yiancar-Designs", "url": "", "maintainer": "yiancar", + "usb": { + "vid": "0x8968", + "pid": "0x5336", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_68_ansi": { "layout": [ diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h index 1c0d6db233..4e22e69e10 100755 --- a/keyboards/spaceholdings/nebula68b/config.h +++ b/keyboards/spaceholdings/nebula68b/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8968 -#define PRODUCT_ID 0x5338 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Yiancar-Designs -#define PRODUCT NEBULA68B - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json index 253e9682ed..47fc6fc718 100755 --- a/keyboards/spaceholdings/nebula68b/info.json +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "NEBULA68B", + "manufacturer": "Yiancar-Designs", "url": "", "maintainer": "yiancar", + "usb": { + "vid": "0x8968", + "pid": "0x5338", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_68_ansi_split_bs": { "layout": [ diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h index 5c264f44ac..01786911ce 100644 --- a/keyboards/spaceman/2_milk/config.h +++ b/keyboards/spaceman/2_milk/config.h @@ -16,13 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 // "SB" -#define PRODUCT_ID 0x3225 // "2%" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Spaceman -#define PRODUCT 2% Milk - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 1 diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json index 288bc0144c..8cdf474517 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "2% Milk", + "manufacturer": "Spaceman", "url": "", "maintainer": "Spaceman", + "usb": { + "vid": "0x5342", + "pid": "0x3225", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h index e05a618e4a..46eb28d6ba 100644 --- a/keyboards/spaceman/pancake/rev1/config.h +++ b/keyboards/spaceman/pancake/rev1/config.h @@ -16,13 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 // SB -#define PRODUCT_ID 0x504B // PK -#define DEVICE_VER 0x0001 -#define MANUFACTURER Spaceman -#define PRODUCT Pancake - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json index 7462b5bf6b..b05601cfa4 100644 --- a/keyboards/spaceman/pancake/rev1/info.json +++ b/keyboards/spaceman/pancake/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Pancake", + "manufacturer": "Spaceman", "url": "", "maintainer": "Spaceman", + "usb": { + "vid": "0x5342", + "pid": "0x504B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_mit": { "layout": [ diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h index a4d3b439c4..f63b136140 100644 --- a/keyboards/spaceman/pancake/rev2/config.h +++ b/keyboards/spaceman/pancake/rev2/config.h @@ -16,13 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 // SB -#define PRODUCT_ID 0x5032 // P2 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Spaceman -#define PRODUCT Pancake 2 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json index a5a4aad132..300d0f6090 100644 --- a/keyboards/spaceman/pancake/rev2/info.json +++ b/keyboards/spaceman/pancake/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Pancake 2", + "manufacturer": "Spaceman", "url": "", "maintainer": "Spaceman", + "usb": { + "vid": "0x5342", + "pid": "0x5032", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h index def4bb9576..05fce09fb0 100644 --- a/keyboards/spaceman/yun65/config.h +++ b/keyboards/spaceman/yun65/config.h @@ -16,13 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 // "SB" -#define PRODUCT_ID 0x594E // "YN" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Spaceman -#define PRODUCT Yun 65 - /* Key Matrix perameter */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json index 113b6983a6..0caaa1521e 100644 --- a/keyboards/spaceman/yun65/info.json +++ b/keyboards/spaceman/yun65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "yun65", + "keyboard_name": "Yun 65", + "manufacturer": "Spaceman", "url": "", "maintainer": "Spaceman", + "usb": { + "vid": "0x5342", + "pid": "0x594E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h index 93eae10402..7b0f43efcd 100644 --- a/keyboards/spacetime/config.h +++ b/keyboards/spacetime/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0A0C -#define DEVICE_VER 0x0100 -#define MANUFACTURER Kyle Terry -#define PRODUCT spacetime - /* key matrix size */ #define MATRIX_ROWS 4*2 #define MATRIX_COLS 7 diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index 8076154f8c..682342cede 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "spacetime", + "manufacturer": "Kyle Terry", "url": "https://github.com/kyleterry/spacetime-keyboard", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0A0C", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h index 52923d2f8e..9e13e086ee 100644 --- a/keyboards/spacey/config.h +++ b/keyboards/spacey/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5641 // "VA" -#define PRODUCT_ID 0x2045 // "Space E" -#define DEVICE_VER 0x0001 -#define MANUFACTURER vanilla -#define PRODUCT spacey - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json index 94d68addf4..e70efd6c75 100644 --- a/keyboards/spacey/info.json +++ b/keyboards/spacey/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "spacey", + "manufacturer": "vanilla", "url": "", "maintainer": "vanilla", + "usb": { + "vid": "0x5641", + "pid": "0x2045", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sparrow62/config.h b/keyboards/sparrow62/config.h index 4b8460c2f8..dcf8f3ed8a 100644 --- a/keyboards/sparrow62/config.h +++ b/keyboards/sparrow62/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xDA74 -#define PRODUCT_ID 0x7461 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Atsushi_Morimoto_74th -#define PRODUCT sparrow62 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json index c6e1e6a008..a1a1152c97 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "sparrow62", + "manufacturer": "Atsushi_Morimoto_74th", "url": "https://github.com/74th/sparrow62-buildguide", "maintainer": "Atsushi Morimoto (@74th)", + "usb": { + "vid": "0xDA74", + "pid": "0x7461", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h index 8478a31e71..0bf33d8afa 100644 --- a/keyboards/specskeys/config.h +++ b/keyboards/specskeys/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCAFE -#define PRODUCT_ID 0x0080 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Specs32 -#define PRODUCT Specskeys - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/specskeys/info.json b/keyboards/specskeys/info.json index 41af598318..8138be8c35 100644 --- a/keyboards/specskeys/info.json +++ b/keyboards/specskeys/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "specskeys", + "keyboard_name": "Specskeys", + "manufacturer": "Specs32", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xCAFE", + "pid": "0x0080", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_tkl_iso_tsangan" }, diff --git a/keyboards/spiderisland/split78/config.h b/keyboards/spiderisland/split78/config.h index b67b3fafff..30c5ec23a8 100644 --- a/keyboards/spiderisland/split78/config.h +++ b/keyboards/spiderisland/split78/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xF4E4 -#define DEVICE_VER 0x0001 -#define MANUFACTURER SpiderIsland -#define PRODUCT Split 78-key - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 14 diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json index 5506336ba2..b833b0ef44 100644 --- a/keyboards/spiderisland/split78/info.json +++ b/keyboards/spiderisland/split78/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Spider Island 78-key split", + "keyboard_name": "Split 78-key", + "manufacturer": "SpiderIsland", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0xF4E4", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h index aead3f5998..a6988896af 100644 --- a/keyboards/splitish/config.h +++ b/keyboards/splitish/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6464 -#define DEVICE_VER 0x0001 -#define MANUFACTIRER Reid Schneyer -#define PRODUCT Splitish - #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json index 96c7de53e0..6f8f8da1da 100644 --- a/keyboards/splitish/info.json +++ b/keyboards/splitish/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "splitish", + "keyboard_name": "Splitish", + "manufacturer": "Reid Schneyer", "url": "", "maintainer": "RSchneyer", + "usb": { + "vid": "0xFEED", + "pid": "0x6464", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 7e79e7f359..9e3fff8cd0 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8D1D -#define PRODUCT_ID 0xF75B -#define DEVICE_VER 0x0001 -#define MANUFACTURER splitkb -#define PRODUCT Zima - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 8e3ca411a5..0afcbe5b6e 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Zima", + "manufacturer": "splitkb", "url": "splitkb.com", "maintainer": "splitkb.com, drashna", + "usb": { + "vid": "0x8D1D", + "pid": "0xF75B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/splitography/config.h b/keyboards/splitography/config.h index 19afdec862..d66360f8f4 100644 --- a/keyboards/splitography/config.h +++ b/keyboards/splitography/config.h @@ -18,9 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT Splitography - /* Key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h index 68ea1b9411..1494753e15 100644 --- a/keyboards/splitty/config.h +++ b/keyboards/splitty/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1D50 -#define PRODUCT_ID 0x6052 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Nicolas Schodet -#define PRODUCT Splitty - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json index 1cccfa124b..71e31132e5 100644 --- a/keyboards/splitty/info.json +++ b/keyboards/splitty/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Splitty", + "manufacturer": "Nicolas Schodet", "url": "https://git.ni.fr.eu.org/splitty.git/about/", "maintainer": "schodet", + "usb": { + "vid": "0x1D50", + "pid": "0x6052", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sporewoh/banime40/config.h b/keyboards/sporewoh/banime40/config.h index 58173b58be..55b93ce1f5 100644 --- a/keyboards/sporewoh/banime40/config.h +++ b/keyboards/sporewoh/banime40/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBEAF -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0000 -#define MANUFACTURER sporewoh -#define PRODUCT banime40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index 36a7ee9eb5..74198ad3bb 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "banime40", + "manufacturer": "sporewoh", "url": "https://github.com/ChrisChrisLoLo/banime40", "maintainer": "sporewoh", + "usb": { + "vid": "0xBEAF", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h index e4d5ec2c89..7f90993265 100644 --- a/keyboards/star75/config.h +++ b/keyboards/star75/config.h @@ -5,13 +5,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B35 -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DXWS -#define PRODUCT Star75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json index ccf8646431..f7d0f17e50 100644 --- a/keyboards/star75/info.json +++ b/keyboards/star75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Star75", + "manufacturer": "DXWS", "url": "https://item.taobao.com/item.htm?id=656392112467", "maintainer": "qmk", + "usb": { + "vid": "0x4B35", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"Ins", "x":15, "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":"Home", "x":15, "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":"PgUp", "x":15, "y":2.25}, {"label":"Capslock", "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":"PgDn", "x":15, "y":3.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":1.75}, {"label":"Up", "x":14, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Fn", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":11.25, "y":5.25, "w":1.25}, {"label":"Left", "x":13, "y":5.25}, {"label":"Down", "x":14, "y":5.25}, {"label":"Right", "x":15, "y":5.25}] diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h index 5316f351d7..e60b7d598b 100644 --- a/keyboards/stello65/beta/config.h +++ b/keyboards/stello65/beta/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5559 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER @wekey -#define PRODUCT Stello65 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json index 7f2e785858..3beb747bec 100644 --- a/keyboards/stello65/beta/info.json +++ b/keyboards/stello65/beta/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Stello65", + "manufacturer": "@wekey", "url": "", "maintainer": "@wekey", + "usb": { + "vid": "0x5559", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"esc", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"bs", "x":13, "y":0}, {"label":"del", "x":14, "y":0}, {"label":"home", "x":15, "y":0}, {"label":"vold", "x":16.25, "y":0}, {"label":"volu", "x":17.25, "y":0}, {"label":"tab", "x":0, "y":1, "w":1.5}, {"label":"q", "x":1.5, "y":1}, {"label":"w", "x":2.5, "y":1}, {"label":"e", "x":3.5, "y":1}, {"label":"r", "x":4.5, "y":1}, {"label":"t", "x":5.5, "y":1}, {"label":"y", "x":6.5, "y":1}, {"label":"u", "x":7.5, "y":1}, {"label":"i", "x":8.5, "y":1}, {"label":"o", "x":9.5, "y":1}, {"label":"p", "x":10.5, "y":1}, {"label":"[", "x":11.5, "y":1}, {"label":"]", "x":12.5, "y":1}, {"label":"\\", "x":13.5, "y":1, "w":1.5}, {"label":"end", "x":15, "y":1}, {"label":"caps", "x":0, "y":2, "w":1.75}, {"label":"a", "x":1.75, "y":2}, {"label":"s", "x":2.75, "y":2}, {"label":"d", "x":3.75, "y":2}, {"label":"f", "x":4.75, "y":2}, {"label":"g", "x":5.75, "y":2}, {"label":"h", "x":6.75, "y":2}, {"label":"j", "x":7.75, "y":2}, {"label":"k", "x":8.75, "y":2}, {"label":"l", "x":9.75, "y":2}, {"label":";", "x":10.75, "y":2}, {"label":"'", "x":11.75, "y":2}, {"label":"enter", "x":12.75, "y":2, "w":2.25}, {"label":"pgup", "x":15, "y":2}, {"label":"shift", "x":0, "y":3, "w":1.25}, {"label":"\\", "x":1.25, "y":3}, {"label":"z", "x":2.25, "y":3}, {"label":"x", "x":3.25, "y":3}, {"label":"c", "x":4.25, "y":3}, {"label":"v", "x":5.25, "y":3}, {"label":"b", "x":6.25, "y":3}, {"label":"n", "x":7.25, "y":3}, {"label":"m", "x":8.25, "y":3}, {"label":",", "x":9.25, "y":3}, {"label":".", "x":10.25, "y":3}, {"label":"/", "x":11.25, "y":3}, {"label":"shift", "x":12.25, "y":3, "w":1.75}, {"label":"up", "x":14, "y":3}, {"label":"pgdn", "x":15, "y":3}, {"label":"ctrl", "x":0, "y":4, "w":1.25}, {"label":"gui", "x":1.25, "y":4, "w":1.25}, {"label":"alt", "x":2.5, "y":4, "w":1.25}, {"label":"spacce", "x":3.75, "y":4, "w":6.25}, {"label":"alt", "x":10, "y":4, "w":1.25}, {"label":"ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"left", "x":13, "y":4}, {"label":"down", "x":14, "y":4}, {"label":"right", "x":15, "y":4}] diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h index 45b0c5ffb3..dbc5bf732c 100644 --- a/keyboards/stello65/hs_rev1/config.h +++ b/keyboards/stello65/hs_rev1/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5559 -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER @wekey -#define PRODUCT Stello65 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json index a743abc34d..f68e0333a2 100644 --- a/keyboards/stello65/hs_rev1/info.json +++ b/keyboards/stello65/hs_rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Stello65", + "manufacturer": "@wekey", "url": "", "maintainer": "@wekey", + "usb": { + "vid": "0x5559", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"1,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"1,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"1,6", "x":13, "y":0, "w":2}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":6.5, "y":1}, {"label":"3,3", "x":7.5, "y":1}, {"label":"2,4", "x":8.5, "y":1}, {"label":"3,4", "x":9.5, "y":1}, {"label":"2,5", "x":10.5, "y":1}, {"label":"3,5", "x":11.5, "y":1}, {"label":"2,6", "x":12.5, "y":1}, {"label":"3,6", "x":13.5, "y":1, "w":1.5}, {"label":"2,7", "x":15, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"4,1", "x":1.75, "y":2}, {"label":"5,0", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":6.75, "y":2}, {"label":"5,3", "x":7.75, "y":2}, {"label":"4,4", "x":8.75, "y":2}, {"label":"5,4", "x":9.75, "y":2}, {"label":"4,5", "x":10.75, "y":2}, {"label":"5,5", "x":11.75, "y":2}, {"label":"5,6", "x":12.75, "y":2, "w":2.25}, {"label":"4,7", "x":15, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"6,1", "x":2.25, "y":3}, {"label":"7,0", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":7.25, "y":3}, {"label":"7,3", "x":8.25, "y":3}, {"label":"6,4", "x":9.25, "y":3}, {"label":"7,4", "x":10.25, "y":3}, {"label":"6,5", "x":11.25, "y":3}, {"label":"7,5", "x":12.25, "y":3}, {"label":"7,6", "x":13.25, "y":3, "w":1.75}, {"label":"6,7", "x":15, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.25}, {"label":"9,0", "x":1.25, "y":4, "w":1.25}, {"label":"8,1", "x":2.5, "y":4, "w":1.25}, {"label":"9,1", "x":3.75, "y":4, "w":6.25}, {"label":"8,5", "x":10, "y":4, "w":1.25}, {"label":"9,5", "x":11.25, "y":4, "w":1.25}, {"label":"8,6", "x":13, "y":4}, {"label":"9,6", "x":14, "y":4}, {"label":"8,7", "x":15, "y":4}] diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h index bbf7c0a80f..1d98f23a17 100644 --- a/keyboards/stello65/sl_rev1/config.h +++ b/keyboards/stello65/sl_rev1/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5559 -#define PRODUCT_ID 0x0005 -#define DEVICE_VER 0x0001 -#define MANUFACTURER @wekey -#define PRODUCT Stello65 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json index 1a1f044b3b..95eb2ccb3c 100644 --- a/keyboards/stello65/sl_rev1/info.json +++ b/keyboards/stello65/sl_rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Stello65", + "manufacturer": "@wekey", "url": "", "maintainer": "@wekey", + "usb": { + "vid": "0x5559", + "pid": "0x0005", + "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":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":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":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h index 09aac207af..ae95db5162 100644 --- a/keyboards/stratos/config.h +++ b/keyboards/stratos/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xD5D0 -#define PRODUCT_ID 0x992D -#define DEVICE_VER 0x0001 -#define MANUFACTURER eggyolk -#define PRODUCT stratos - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json index 0ddffc7592..e281d4eed4 100644 --- a/keyboards/stratos/info.json +++ b/keyboards/stratos/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "stratos", + "manufacturer": "eggyolk", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0xD5D0", + "pid": "0x992D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h index afb8bb858f..07ac871795 100644 --- a/keyboards/studiokestra/bourgeau/config.h +++ b/keyboards/studiokestra/bourgeau/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define PRODUCT_ID 0x7501 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Studio Kestra -#define PRODUCT Bourgeau - #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json index a2170cabf6..6b9169ba0a 100644 --- a/keyboards/studiokestra/bourgeau/info.json +++ b/keyboards/studiokestra/bourgeau/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Bourgeau", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/bourgeau/", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x7501", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_75_ansi_rwkl" }, diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h index 1ef4c21e50..beb88e69ab 100644 --- a/keyboards/studiokestra/cascade/config.h +++ b/keyboards/studiokestra/cascade/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define PRODUCT_ID 0x6001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Studio Kestra -#define PRODUCT Cascade - #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json index 5bbc25f1e5..eb5e9b5ffb 100644 --- a/keyboards/studiokestra/cascade/info.json +++ b/keyboards/studiokestra/cascade/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Cascade", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/cascade/", "maintainer": "Studio Kestra", + "usb": { + "vid": "0x7C10", + "pid": "0x6001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h index dc4aee20aa..1e9f715a6e 100644 --- a/keyboards/studiokestra/nue/config.h +++ b/keyboards/studiokestra/nue/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define PRODUCT_ID 0x0701 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Studio Kestra -#define PRODUCT Nue - #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json index 9abe8f3e5c..874f827546 100644 --- a/keyboards/studiokestra/nue/info.json +++ b/keyboards/studiokestra/nue/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Nue", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/nue", "maintainer": "Studio Kestra", + "usb": { + "vid": "0x7C10", + "pid": "0x0701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/suavity/ehan/config.h b/keyboards/suavity/ehan/config.h index 1f5c7cd321..af31fd6385 100644 --- a/keyboards/suavity/ehan/config.h +++ b/keyboards/suavity/ehan/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5344 // 5344 short for "SD" (Suavity Designs) -#define PRODUCT_ID 0x4548 // 4548 short for "EH" (EHan) -#define DEVICE_VER 0x0001 -#define MANUFACTURER Suavity Designs -#define PRODUCT ehan - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json index 0f2ad67561..aec9c84cf5 100755 --- a/keyboards/suavity/ehan/info.json +++ b/keyboards/suavity/ehan/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ehan", + "manufacturer": "Suavity Designs", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5344", + "pid": "0x4548", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h index d53805b62f..219b2792bf 100644 --- a/keyboards/subatomic/config.h +++ b/keyboards/subatomic/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6063 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ortholinear Keyboards -#define PRODUCT The Subatomic Keyboard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/subatomic/info.json b/keyboards/subatomic/info.json index b4a18c3487..3b53a6ceda 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Subatomic", + "manufacturer": "OLKB", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6063", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x14": { "layout": [ diff --git a/keyboards/subrezon/la_nc/config.h b/keyboards/subrezon/la_nc/config.h index 6d5aad031a..3770bdc26e 100644 --- a/keyboards/subrezon/la_nc/config.h +++ b/keyboards/subrezon/la_nc/config.h @@ -5,11 +5,6 @@ #include "config_common.h" -// USB device parameters -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1A7C -#define DEVICE_VER 0x0100 - // key matrix #define MATRIX_ROWS 6 #define MATRIX_ROW_PINS {D3, F4, D2, B2, B5, B6} diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/info.json index d668d94b4b..f6ba95e261 100644 --- a/keyboards/subrezon/la_nc/info.json +++ b/keyboards/subrezon/la_nc/info.json @@ -1,6 +1,11 @@ { "keyboard_name": "la_nc", "url": "https://github.com/subrezon/la_nc", + "usb": { + "vid": "0xFEED", + "pid": "0x1A7C", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h index 77583a5825..b377e8735b 100644 --- a/keyboards/superuser/ext/config.h +++ b/keyboards/superuser/ext/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5355 -#define PRODUCT_ID 0x4558 -#define DEVICE_VER 0x0001 -#define MANUFACTURER superuser -#define PRODUCT ext - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json index c19fc3a913..d19f1e524d 100644 --- a/keyboards/superuser/ext/info.json +++ b/keyboards/superuser/ext/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ext", + "manufacturer": "superuser", "url": "", "maintainer": "kaylanm", + "usb": { + "vid": "0x5355", + "pid": "0x4558", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_tkl": "LAYOUT_all" }, diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h index 47ff3decf7..f025de6dc0 100644 --- a/keyboards/superuser/frl/config.h +++ b/keyboards/superuser/frl/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5355 -#define PRODUCT_ID 0x4652 -#define DEVICE_VER 0x0001 -#define MANUFACTURER superuser -#define PRODUCT frl - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json index d565bcde38..5a01d0a39d 100644 --- a/keyboards/superuser/frl/info.json +++ b/keyboards/superuser/frl/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "frl", + "manufacturer": "superuser", "url": "", "maintainer": "superuser", + "usb": { + "vid": "0x5355", + "pid": "0x4652", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl": { "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":"Bksp", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "y":3}, {"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":"Ctrl", "x":13.5, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h index e60435e6c0..9877485101 100644 --- a/keyboards/superuser/tkl/config.h +++ b/keyboards/superuser/tkl/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5355 -#define PRODUCT_ID 0x544B -#define DEVICE_VER 0x0001 -#define MANUFACTURER superuser -#define PRODUCT tkl - - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json index 4ffe528176..ff8a6b7895 100644 --- a/keyboards/superuser/tkl/info.json +++ b/keyboards/superuser/tkl/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "tkl", + "manufacturer": "superuser", "url": "", "maintainer": "kaylanm", + "usb": { + "vid": "0x5355", + "pid": "0x544B", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_tkl": "LAYOUT_all" }, diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index e604eda419..2031595fec 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB0C -#define DEVICE_VER 0x0001 -#define MANUFACTURER Swiftrax -#define PRODUCT Retropad - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 2 diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 6148e95edb..4e3137edb0 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Retropad", + "manufacturer": "Swiftrax", "url": "https://github.com/swiftrax", "maintainer": "swiftrax", + "usb": { + "vid": "0x04D8", + "pid": "0xEB0C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,1", "x":0.5, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1, "y":2.5}] diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h index 20fe48eb9b..af6c447091 100644 --- a/keyboards/switchplate/southpaw_65/config.h +++ b/keyboards/switchplate/southpaw_65/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4084 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Switchplate Peripherals -#define PRODUCT Southpaw Extended 65% - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json index ab8916ed3c..0a47fd95b2 100644 --- a/keyboards/switchplate/southpaw_65/info.json +++ b/keyboards/switchplate/southpaw_65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Southpaw Extended 65%", + "manufacturer": "Switchplate Peripherals", "url": "https://geekhack.org/index.php?topic=92344.0", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x4084", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"!", "x":5, "y":0}, {"label":"@", "x":6, "y":0}, {"label":"#", "x":7, "y":0}, {"label":"$", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"^", "x":10, "y":0}, {"label":"&", "x":11, "y":0}, {"label":"*", "x":12, "y":0}, {"label":"(", "x":13, "y":0}, {"label":")", "x":14, "y":0}, {"label":"_", "x":15, "y":0}, {"label":"+", "x":16, "y":0}, {"label":"Backspace", "x":17, "y":0}, {"label":"Backspace", "x":18, "y":0}, {"label":"Home", "x":19, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.5}, {"label":"Q", "x":5.5, "y":1}, {"label":"W", "x":6.5, "y":1}, {"label":"E", "x":7.5, "y":1}, {"label":"R", "x":8.5, "y":1}, {"label":"T", "x":9.5, "y":1}, {"label":"Y", "x":10.5, "y":1}, {"label":"U", "x":11.5, "y":1}, {"label":"I", "x":12.5, "y":1}, {"label":"O", "x":13.5, "y":1}, {"label":"P", "x":14.5, "y":1}, {"label":"{", "x":15.5, "y":1}, {"label":"}", "x":16.5, "y":1}, {"label":"|", "x":17.5, "y":1, "w":1.5}, {"label":"End", "x":19, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":2}, {"label":"Caps Lock", "x":4, "y":2, "w":1.75}, {"label":"A", "x":5.75, "y":2}, {"label":"S", "x":6.75, "y":2}, {"label":"D", "x":7.75, "y":2}, {"label":"F", "x":8.75, "y":2}, {"label":"G", "x":9.75, "y":2}, {"label":"H", "x":10.75, "y":2}, {"label":"J", "x":11.75, "y":2}, {"label":"K", "x":12.75, "y":2}, {"label":"L", "x":13.75, "y":2}, {"label":":", "x":14.75, "y":2}, {"label":"\"", "x":15.75, "y":2}, {"label":"~", "x":16.75, "y":2}, {"label":"Enter", "x":17.75, "y":2, "w":1.25}, {"label":"Page Up", "x":19, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Num Enter", "x":3, "y":3}, {"label":"LShift", "x":4, "y":3, "w":1.25}, {"label":"|", "x":5.25, "y":3}, {"label":"Z", "x":6.25, "y":3}, {"label":"X", "x":7.25, "y":3}, {"label":"C", "x":8.25, "y":3}, {"label":"V", "x":9.25, "y":3}, {"label":"B", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"RShift", "x":16.25, "y":3, "w":1.75}, {"label":"Up", "x":18, "y":3}, {"label":"Page Down", "x":19, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"0", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Num Enter", "x":3, "y":4}, {"label":"LCtrl", "x":4, "y":4, "w":1.25}, {"label":"Win", "x":5.25, "y":4, "w":1.25}, {"label":"LAlt", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":6.25}, {"label":"RAlt", "x":14, "y":4}, {"label":"RCtrl", "x":15, "y":4}, {"label":"Fn0", "x":16, "y":4}, {"label":"Left", "x":17, "y":4}, {"label":"Down", "x":18, "y":4}, {"label":"Right", "x":19, "y":4}] diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h index fb407383ad..f5ab736f40 100644 --- a/keyboards/switchplate/southpaw_fullsize/config.h +++ b/keyboards/switchplate/southpaw_fullsize/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0017 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Switchplate Peripherals -#define PRODUCT Southpaw Fullsize - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 22 diff --git a/keyboards/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json index 3c02cfdc1a..c90954ead7 100644 --- a/keyboards/switchplate/southpaw_fullsize/info.json +++ b/keyboards/switchplate/southpaw_fullsize/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "southpaw_fullsize", + "keyboard_name": "Southpaw Fullsize", + "manufacturer": "Switchplate Peripherals", "url": "", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0017", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h index e1e50411c4..d0fb70988d 100644 --- a/keyboards/switchplate/switchplate910/config.h +++ b/keyboards/switchplate/switchplate910/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x54F3 -#define PRODUCT_ID 0x2065 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Switchplate Peripherals -#define PRODUCT 910 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/info.json index 748bd71c79..7d31742fae 100644 --- a/keyboards/switchplate/switchplate910/info.json +++ b/keyboards/switchplate/switchplate910/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "southpaw910", + "keyboard_name": "910", + "manufacturer": "Switchplate Peripherals", "url": "", "maintainer": "MxBluE", + "usb": { + "vid": "0x54F3", + "pid": "0x2065", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index a2da819400..b24710f78c 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5154 // "QT" -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Quantrik -#define PRODUCT SX60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json index 2e710b3c5a..dddc5873a8 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "SX60", + "manufacturer": "Quantrik", "url": "", "maintainer": "https://github.com/amnobis", + "usb": { + "vid": "0x5154", + "pid": "0x0010", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"ANSIEnter", "x":15, "y":2, "w":1}, {"label":"ISOEnter", "x":16, "y":2, "w":1.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":1.25}, {"label":"\\|", "x":2.5, "y":3, "w":1}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}] diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h index 809194afe8..a06269b437 100644 --- a/keyboards/synapse/config.h +++ b/keyboards/synapse/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7170 -#define PRODUCT_ID 0x5359 -#define DEVICE_VER 0x0001 -#define MANUFACTURER drmmr -#define PRODUCT synapse - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json index c7b8611256..b9acdae09d 100644 --- a/keyboards/synapse/info.json +++ b/keyboards/synapse/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "synapse", + "manufacturer": "drmmr", "url": "", "maintainer": "qpockets", + "usb": { + "vid": "0x7170", + "pid": "0x5359", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h index 02fbd7abe0..affb70befc 100644 --- a/keyboards/synthlabs/solo/config.h +++ b/keyboards/synthlabs/solo/config.h @@ -5,10 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define MANUFACTURER Synth Labs -#define PRODUCT Solo - #define ENCODERS 1 #define ENCODER_RESOLUTION 4 #define ENCODERS_PAD_A { B2 } diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index 18a144a8b3..14a51fda36 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -1,5 +1,6 @@ { - "keyboard_name": "Synth Labs Solo", + "keyboard_name": "Solo", + "manufacturer": "Synth Labs", "url": "http://solo.synthlabs.io", "maintainer": "hongaaronc", "bootloader": "atmel-dfu", diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 19752d58de..4a50e4d64c 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -// USB device descriptor parameter -#define VENDOR_ID 0x3384 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER System76 -#define PRODUCT Launch Configurable Keyboard (launch_1) - // Key matrix size #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index 10d39cc758..e369a4d304 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "System76 Launch Configurable Keyboard (launch_1)", + "keyboard_name": "Launch Configurable Keyboard (launch_1)", + "manufacturer": "System76", "url": "https://system76.com/accessories/launch", + "usb": { + "vid": "0x3384", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |