From a8744b163074457253da2c63affd3b4cceefe04a Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:12:37 +1000 Subject: Move keyboard USB IDs and strings to data driven: S (#17889) --- keyboards/salicylic_acid3/7splus/config.h | 7 ------- keyboards/salicylic_acid3/7splus/info.json | 6 ++++++ keyboards/salicylic_acid3/ajisai74/config.h | 7 ------- keyboards/salicylic_acid3/ajisai74/info.json | 6 ++++++ keyboards/salicylic_acid3/ergoarrows/config.h | 7 ------- keyboards/salicylic_acid3/ergoarrows/info.json | 6 ++++++ keyboards/salicylic_acid3/nafuda/config.h | 7 ------- keyboards/salicylic_acid3/nafuda/info.json | 6 ++++++ keyboards/salicylic_acid3/nknl7en/config.h | 7 ------- keyboards/salicylic_acid3/nknl7en/info.json | 6 ++++++ keyboards/salicylic_acid3/nknl7jp/config.h | 7 ------- keyboards/salicylic_acid3/nknl7jp/info.json | 6 ++++++ keyboards/sam/s80/config.h | 7 ------- keyboards/sam/s80/info.json | 8 +++++++- keyboards/sam/sg81m/config.h | 7 ------- keyboards/sam/sg81m/info.json | 8 +++++++- keyboards/sanctified/dystopia/config.h | 7 ------- keyboards/sanctified/dystopia/info.json | 6 ++++++ keyboards/sandwich/keeb68/config.h | 7 ------- keyboards/sandwich/keeb68/info.json | 8 +++++++- keyboards/satt/comet46/config.h | 8 -------- keyboards/satt/comet46/info.json | 6 ++++++ keyboards/satt/vision/config.h | 7 ------- keyboards/satt/vision/info.json | 6 ++++++ keyboards/sauce/mild/config.h | 7 ------- keyboards/sauce/mild/info.json | 8 +++++++- keyboards/sawnsprojects/amber80/solder/config.h | 7 ------- keyboards/sawnsprojects/amber80/solder/info.json | 8 +++++++- keyboards/sawnsprojects/krush/krush60/solder/config.h | 7 ------- keyboards/sawnsprojects/krush/krush60/solder/info.json | 8 +++++++- keyboards/sawnsprojects/krush/krush65/hotswap/config.h | 7 ------- keyboards/sawnsprojects/krush/krush65/hotswap/info.json | 8 +++++++- keyboards/sawnsprojects/krush/krush65/solder/config.h | 7 ------- keyboards/sawnsprojects/krush/krush65/solder/info.json | 8 +++++++- keyboards/sawnsprojects/satxri6key/config.h | 7 ------- keyboards/sawnsprojects/satxri6key/info.json | 6 ++++++ keyboards/sawnsprojects/vcl65/solder/config.h | 7 ------- keyboards/sawnsprojects/vcl65/solder/info.json | 8 +++++++- keyboards/scatter42/config.h | 7 ------- keyboards/scatter42/info.json | 6 ++++++ keyboards/sck/gtm/config.h | 7 ------- keyboards/sck/gtm/info.json | 8 +++++++- keyboards/sck/m0116b/config.h | 7 ------- keyboards/sck/m0116b/info.json | 6 ++++++ keyboards/sck/neiso/config.h | 7 ------- keyboards/sck/neiso/info.json | 6 ++++++ keyboards/sck/osa/config.h | 7 ------- keyboards/sck/osa/info.json | 6 ++++++ keyboards/sekigon/grs_70ec/config.h | 7 ------- keyboards/sekigon/grs_70ec/info.json | 8 +++++++- keyboards/sendyyeah/75pixels/config.h | 7 ------- keyboards/sendyyeah/75pixels/info.json | 8 +++++++- keyboards/sendyyeah/bevi/config.h | 7 ------- keyboards/sendyyeah/bevi/info.json | 6 ++++++ keyboards/sendyyeah/pix/config.h | 7 ------- keyboards/sendyyeah/pix/info.json | 6 ++++++ keyboards/senselessclay/ck60/config.h | 7 ------- keyboards/senselessclay/ck60/info.json | 6 ++++++ keyboards/senselessclay/ck65/config.h | 7 ------- keyboards/senselessclay/ck65/info.json | 6 ++++++ keyboards/senselessclay/gos65/config.h | 7 ------- keyboards/senselessclay/gos65/info.json | 6 ++++++ keyboards/senselessclay/had60/config.h | 7 ------- keyboards/senselessclay/had60/info.json | 6 ++++++ keyboards/sentraq/number_pad/config.h | 7 ------- keyboards/sentraq/number_pad/info.json | 8 +++++++- keyboards/sentraq/s65_plus/config.h | 7 ------- keyboards/sentraq/s65_plus/info.json | 6 ++++++ keyboards/sentraq/s65_x/config.h | 7 ------- keyboards/sentraq/s65_x/info.json | 6 ++++++ keyboards/sergiopoverony/creator_pro/config.h | 8 -------- keyboards/sergiopoverony/creator_pro/info.json | 6 ++++++ keyboards/sets3n/kk980/config.h | 7 ------- keyboards/sets3n/kk980/info.json | 6 ++++++ keyboards/shambles/config.h | 7 ------- keyboards/shambles/info.json | 6 ++++++ keyboards/shapeshifter4060/config.h | 8 -------- keyboards/shapeshifter4060/info.json | 6 ++++++ keyboards/shiro/config.h | 7 ------- keyboards/shiro/info.json | 6 ++++++ keyboards/shk9/config.h | 7 ------- keyboards/shk9/info.json | 6 ++++++ keyboards/sidderskb/majbritt/rev1/config.h | 7 ------- keyboards/sidderskb/majbritt/rev1/info.json | 8 +++++++- keyboards/sidderskb/majbritt/rev2/config.h | 7 ------- keyboards/sidderskb/majbritt/rev2/info.json | 8 +++++++- keyboards/signum/3_0/config.h | 7 ------- keyboards/signum/3_0/info.json | 6 ++++++ keyboards/silverbullet44/config.h | 7 ------- keyboards/silverbullet44/info.json | 6 ++++++ keyboards/singa/config.h | 6 ------ keyboards/singa/info.json | 6 ++++++ keyboards/sirius/uni660/rev1/config.h | 7 ------- keyboards/sirius/uni660/rev1/info.json | 6 ++++++ keyboards/sirius/uni660/rev2/ansi/config.h | 7 ------- keyboards/sirius/uni660/rev2/ansi/info.json | 8 +++++++- keyboards/sirius/uni660/rev2/iso/config.h | 7 ------- keyboards/sirius/uni660/rev2/iso/info.json | 8 +++++++- keyboards/sirius/unigo66/config.h | 7 ------- keyboards/sirius/unigo66/info.json | 6 ++++++ keyboards/sixkeyboard/config.h | 7 ------- keyboards/sixkeyboard/info.json | 8 +++++++- keyboards/skeletn87/hotswap/config.h | 7 ------- keyboards/skeletn87/hotswap/info.json | 8 +++++++- keyboards/skeletn87/soldered/config.h | 7 ------- keyboards/skeletn87/soldered/info.json | 8 +++++++- keyboards/skeletonkbd/skeletonnumpad/config.h | 7 ------- keyboards/skeletonkbd/skeletonnumpad/info.json | 8 +++++++- keyboards/skergo/config.h | 7 ------- keyboards/skergo/info.json | 6 ++++++ keyboards/skippys_custom_pcs/rooboard65/config.h | 7 ------- keyboards/skippys_custom_pcs/rooboard65/info.json | 6 ++++++ keyboards/skippys_custom_pcs/roopad/config.h | 7 ------- keyboards/skippys_custom_pcs/roopad/info.json | 6 ++++++ keyboards/skme/zeno/config.h | 7 ------- keyboards/skme/zeno/info.json | 7 ++++++- keyboards/slz40/config.h | 7 ------- keyboards/slz40/info.json | 6 ++++++ keyboards/smallkeyboard/config.h | 6 ------ keyboards/smallkeyboard/info.json | 6 ++++++ keyboards/smithrune/iron180/config.h | 7 ------- keyboards/smithrune/iron180/info.json | 6 ++++++ keyboards/smk60/config.h | 7 ------- keyboards/smk60/info.json | 6 ++++++ keyboards/snampad/config.h | 7 ------- keyboards/snampad/info.json | 6 ++++++ keyboards/sneakbox/aliceclone/config.h | 7 ------- keyboards/sneakbox/aliceclone/info.json | 8 +++++++- keyboards/sneakbox/aliceclonergb/config.h | 7 ------- keyboards/sneakbox/aliceclonergb/info.json | 8 +++++++- keyboards/sneakbox/ava/config.h | 7 ------- keyboards/sneakbox/ava/info.json | 6 ++++++ keyboards/sneakbox/disarray/ortho/config.h | 7 ------- keyboards/sneakbox/disarray/ortho/info.json | 6 ++++++ keyboards/sneakbox/disarray/staggered/config.h | 7 ------- keyboards/sneakbox/disarray/staggered/info.json | 6 ++++++ keyboards/sofle/keyhive/config.h | 7 ------- keyboards/sofle/keyhive/info.json | 6 ++++++ keyboards/sofle/rev1/config.h | 7 ------- keyboards/sofle/rev1/info.json | 6 ++++++ keyboards/soup10/config.h | 7 ------- keyboards/soup10/info.json | 6 ++++++ keyboards/sowbug/68keys/config.h | 7 ------- keyboards/sowbug/68keys/info.json | 6 ++++++ keyboards/sowbug/ansi_tkl/config.h | 7 ------- keyboards/sowbug/ansi_tkl/info.json | 8 +++++++- keyboards/soy20/config.h | 7 ------- keyboards/soy20/info.json | 6 ++++++ keyboards/spaceholdings/nebula12/config.h | 7 ------- keyboards/spaceholdings/nebula12/info.json | 6 ++++++ keyboards/spaceholdings/nebula12b/config.h | 7 ------- keyboards/spaceholdings/nebula12b/info.json | 6 ++++++ keyboards/spaceholdings/nebula68/config.h | 7 ------- keyboards/spaceholdings/nebula68/info.json | 6 ++++++ keyboards/spaceholdings/nebula68b/config.h | 7 ------- keyboards/spaceholdings/nebula68b/info.json | 6 ++++++ keyboards/spaceman/2_milk/config.h | 7 ------- keyboards/spaceman/2_milk/info.json | 6 ++++++ keyboards/spaceman/pancake/rev1/config.h | 7 ------- keyboards/spaceman/pancake/rev1/info.json | 6 ++++++ keyboards/spaceman/pancake/rev2/config.h | 7 ------- keyboards/spaceman/pancake/rev2/info.json | 6 ++++++ keyboards/spaceman/yun65/config.h | 7 ------- keyboards/spaceman/yun65/info.json | 8 +++++++- keyboards/spacetime/config.h | 7 ------- keyboards/spacetime/info.json | 6 ++++++ keyboards/spacey/config.h | 7 ------- keyboards/spacey/info.json | 6 ++++++ keyboards/sparrow62/config.h | 7 ------- keyboards/sparrow62/info.json | 6 ++++++ keyboards/specskeys/config.h | 7 ------- keyboards/specskeys/info.json | 8 +++++++- keyboards/spiderisland/split78/config.h | 7 ------- keyboards/spiderisland/split78/info.json | 8 +++++++- keyboards/splitish/config.h | 6 ------ keyboards/splitish/info.json | 8 +++++++- keyboards/splitkb/zima/config.h | 7 ------- keyboards/splitkb/zima/info.json | 6 ++++++ keyboards/splitography/config.h | 3 --- keyboards/splitty/config.h | 7 ------- keyboards/splitty/info.json | 6 ++++++ keyboards/sporewoh/banime40/config.h | 7 ------- keyboards/sporewoh/banime40/info.json | 6 ++++++ keyboards/star75/config.h | 7 ------- keyboards/star75/info.json | 6 ++++++ keyboards/stello65/beta/config.h | 7 ------- keyboards/stello65/beta/info.json | 6 ++++++ keyboards/stello65/hs_rev1/config.h | 7 ------- keyboards/stello65/hs_rev1/info.json | 6 ++++++ keyboards/stello65/sl_rev1/config.h | 7 ------- keyboards/stello65/sl_rev1/info.json | 6 ++++++ keyboards/stratos/config.h | 7 ------- keyboards/stratos/info.json | 6 ++++++ keyboards/studiokestra/bourgeau/config.h | 7 ------- keyboards/studiokestra/bourgeau/info.json | 6 ++++++ keyboards/studiokestra/cascade/config.h | 7 ------- keyboards/studiokestra/cascade/info.json | 6 ++++++ keyboards/studiokestra/nue/config.h | 7 ------- keyboards/studiokestra/nue/info.json | 6 ++++++ keyboards/suavity/ehan/config.h | 7 ------- keyboards/suavity/ehan/info.json | 6 ++++++ keyboards/subatomic/config.h | 7 ------- keyboards/subatomic/info.json | 6 ++++++ keyboards/subrezon/la_nc/config.h | 5 ----- keyboards/subrezon/la_nc/info.json | 5 +++++ keyboards/superuser/ext/config.h | 8 -------- keyboards/superuser/ext/info.json | 6 ++++++ keyboards/superuser/frl/config.h | 8 -------- keyboards/superuser/frl/info.json | 6 ++++++ keyboards/superuser/tkl/config.h | 8 -------- keyboards/superuser/tkl/info.json | 6 ++++++ keyboards/swiftrax/retropad/config.h | 7 ------- keyboards/swiftrax/retropad/info.json | 6 ++++++ keyboards/switchplate/southpaw_65/config.h | 7 ------- keyboards/switchplate/southpaw_65/info.json | 6 ++++++ keyboards/switchplate/southpaw_fullsize/config.h | 7 ------- keyboards/switchplate/southpaw_fullsize/info.json | 8 +++++++- keyboards/switchplate/switchplate910/config.h | 7 ------- keyboards/switchplate/switchplate910/info.json | 8 +++++++- keyboards/sx60/config.h | 7 ------- keyboards/sx60/info.json | 6 ++++++ keyboards/synapse/config.h | 7 ------- keyboards/synapse/info.json | 6 ++++++ keyboards/synthlabs/solo/config.h | 4 ---- keyboards/synthlabs/solo/info.json | 3 ++- keyboards/system76/launch_1/config.h | 7 ------- keyboards/system76/launch_1/info.json | 8 +++++++- 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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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 . #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"