diff options
84 files changed, 271 insertions, 315 deletions
| diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h index d19ecd78a0..311f355589 100644 --- a/keyboards/gami_studio/lex60/config.h +++ b/keyboards/gami_studio/lex60/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       0x7353 -#define PRODUCT_ID      0x0160 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Evyd13 -#define PRODUCT         Lex60 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index b8535c7fd9..7422287bd6 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Gami Studio Lex60", +    "keyboard_name": "Lex60", +    "manufacturer": "Evyd13",      "url": "",      "maintainer": "GamiStudio", +    "usb": { +        "vid": "0x7353", +        "pid": "0x0160", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index 69632cd4f7..84e1899081 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -2,12 +2,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x1337 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    g Heavy Industries -#define PRODUCT         Butter Stick  #define VERSION 		"Paula Deen"  #define DEBOUNCE 5 diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 6bfd58e594..158769dbd1 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "Butter Stick", +    "manufacturer": "g Heavy Industries",      "url": "",      "maintainer": "germ", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x1337", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_butter": {              "layout": [ diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index d415e77dc6..21d14144d9 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -23,13 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define VERBOSE -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x1337 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    g Heavy Industries  -#define PRODUCT         ErgoTaco -  /* key matrix size */  #define MATRIX_ROWS 12  #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index e7794e6ee3..bd1863288e 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "ErgoTaco", +    "manufacturer": "g Heavy Industries",      "url": "http://gboards.ca",      "maintainer": "germ", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x1337", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index f2e73da899..e3da59a781 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -30,13 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define NO_ACTION_ONESHOT  #define IGNORE_MOD_TAP_INTERRUPT -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x1337 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    g Heavy Industries  -#define PRODUCT         Georgi -  /* key matrix size */  #define MATRIX_ROWS 14  #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 213b14f352..0bfe2a52aa 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "Georgi", +    "manufacturer": "g Heavy Industries",      "url": "http://gboards.ca",      "maintainer": "germ", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x1337", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_georgi": {              "layout": [ diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 9d56c0e24f..1308312950 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -35,13 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define VERBOSE -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x1307 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    g Heavy Industries -#define PRODUCT         Gergo -  /* key matrix size */  #define MATRIX_ROWS 14  #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index be52e49046..e3f8b1caff 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -1,7 +1,13 @@  { -    "maintainer": "germ",      "keyboard_name": "Gergo", +    "manufacturer": "g Heavy Industries",      "url": "http://gboards.ca", +    "maintainer": "germ", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x1307", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_gergo": {              "layout": [ diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h index 6a73ccc4ea..f118bb4017 100644 --- a/keyboards/gboards/gergoplex/config.h +++ b/keyboards/gboards/gergoplex/config.h @@ -21,13 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #pragma once  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6B0A -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER g Heavy Industries -#define PRODUCT GergoPlex -  /* key matrix size */  #define MATRIX_ROWS 10  #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index 5aa696d5de..462c2434a3 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "GergoPlex", +    "manufacturer": "g Heavy Industries",      "url": "",      "maintainer": "germ", +    "usb": { +        "vid": "0x6B0A", +        "pid": "0x0002", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_split_3x5_3": {              "layout": [ diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index cb671bfab7..69c87cd154 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -15,13 +15,6 @@   */  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0x0483 -#define PRODUCT_ID      0xA372 -#define DEVICE_VER      0x0002 -#define MANUFACTURER    GeekBoards -#define PRODUCT         Macropad v2 -  /* key matrix size */  #define MATRIX_ROWS 2  #define MATRIX_COLS 4 diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index 770ebbb0f4..b62620af9b 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -1,7 +1,13 @@  { -  "keyboard_name": "macropad_v2", +  "keyboard_name": "Macropad v2", +  "manufacturer": "GeebBoards",    "url": "https://geekboards.ru/",    "maintainer": "ruddy17", +  "usb": { +    "vid": "0x0483", +    "pid": "0xA372", +    "device_version": "0.0.2" +  },    "layouts": {      "LAYOUT": {        "layout": [ diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index ac3b95c7e7..47cb82f215 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -2,14 +2,6 @@  #include "config_common.h" - -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x1319 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Geekboards -#define PRODUCT         Geekboards Tester - -  #define MATRIX_ROWS 2  #define MATRIX_COLS 4 diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index 9882aa6850..2da610fb3f 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Geekboards 8-keys macropad", +    "keyboard_name": "Tester", +    "manufacturer": "Geekboards",      "url": "",      "maintainer": "moyi4681", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x1319", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h index 9d4f0c19b4..41cf77a389 100644 --- a/keyboards/generic_panda/panda65_01/config.h +++ b/keyboards/generic_panda/panda65_01/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    0x6770 // gp generic_panda -#define PRODUCT_ID   0x6501 // 65_01 -#define DEVICE_VER   0x0001 -#define MANUFACTURER generic_panda -#define PRODUCT      panda65_01 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json index a2ad377615..83daae6631 100644 --- a/keyboards/generic_panda/panda65_01/info.json +++ b/keyboards/generic_panda/panda65_01/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "Panda65_01", +    "manufacturer": "generic_panda",      "url": "https://github.com/JesseLeung97/qmk_firmware/tree/master/keyboards/generic_panda/panda65_01",      "maintainer": "generic_panda", +    "usb": { +        "vid": "0x6770", +        "pid": "0x6501", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_split_bs": {              "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "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":"PgDn", "x":15, "y":2}, {"label":"LShift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"FN", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h index e9869e3694..c13f04ad29 100644 --- a/keyboards/genone/eclipse_65/config.h +++ b/keyboards/genone/eclipse_65/config.h @@ -18,13 +18,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x2222 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    GEN ONE LLC -#define PRODUCT         Eclipse65 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/info.json index df0607946f..72d721d612 100644 --- a/keyboards/genone/eclipse_65/info.json +++ b/keyboards/genone/eclipse_65/info.json @@ -1,7 +1,13 @@  { -  "keyboard_name": "eclipse_65", +  "keyboard_name": "Eclipse65", +  "manufacturer": "GEN ONE LLC",    "url": "https://genonemerch.com",    "maintainer": "rojasa1990", +  "usb": { +    "vid": "0xFEED", +    "pid": "0x2222", +    "device_version": "0.0.1" +  },    "layouts": {        "LAYOUT_65_ansi": {            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/genone/g1_65/config.h b/keyboards/genone/g1_65/config.h index 3236160c12..ecbbf6e8c4 100644 --- a/keyboards/genone/g1_65/config.h +++ b/keyboards/genone/g1_65/config.h @@ -18,13 +18,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xE720 // GEN ONE -#define PRODUCT_ID      0x0001 // G1_65 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    GEN ONE LLC -#define PRODUCT         G1_65 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 diff --git a/keyboards/genone/g1_65/info.json b/keyboards/genone/g1_65/info.json index c73d2d64d0..670b219380 100644 --- a/keyboards/genone/g1_65/info.json +++ b/keyboards/genone/g1_65/info.json @@ -1,7 +1,13 @@  {    "keyboard_name": "G1_65", +  "manufacturer": "GEN ONE LLC",    "url": "https://genonemerch.com",    "maintainer": "rojasa1990", +  "usb": { +    "vid": "0xE720", +    "pid": "0x0001", +    "device_version": "0.0.1" +  },    "layouts": {        "LAYOUT_65_ansi": {            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/gentleman65/config.h b/keyboards/gentleman65/config.h index 34cd4d4899..a58111d7df 100644 --- a/keyboards/gentleman65/config.h +++ b/keyboards/gentleman65/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       0x00FA -#define PRODUCT_ID      0x2020 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    JJ48_24 & Omar Afzal -#define PRODUCT         Gentleman 65 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 diff --git a/keyboards/gentleman65/info.json b/keyboards/gentleman65/info.json index d42b3ff6db..3a8e6168aa 100644 --- a/keyboards/gentleman65/info.json +++ b/keyboards/gentleman65/info.json @@ -1,7 +1,13 @@  { -    "name": "The Gentleman 65",  +    "name": "Gentleman 65",  +    "manufacturer": "JJ48_24 & Omar Afzal",      "url": "https://jkeys.design/products/gentleman-65",       "maintainer": "0marA",  +    "usb": { +        "vid": "0x00FA", +        "pid": "0x2020", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_all": {            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h index 52f6fc8524..298d6ab354 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/config.h +++ b/keyboards/ggkeyboards/genesis/hotswap/config.h @@ -18,13 +18,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID    0xBB00 -#define PRODUCT_ID   0xD4D3 -#define DEVICE_VER   0x0001 -#define MANUFACTURER GG Keyboards -#define PRODUCT      Genesis Hotswap -  /* key matrix size */  #define MATRIX_ROWS  6  #define MATRIX_COLS  18 diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json index 8843b6a4bc..149e0e1d80 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "Genesis Hotswap", +    "manufacturer": "GG Keyboards",      "url": "",      "maintainer": "Spooknik", +    "usb": { +        "vid": "0xBB00", +        "pid": "0xD4D3", +        "device_version": "0.0.1" +    },      "layout_aliases": {          "LAYOUT": "LAYOUT_tkl_ansi"      }, diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h index 6bfeaf9a54..1d4bafdd0d 100644 --- a/keyboards/ggkeyboards/genesis/solder/config.h +++ b/keyboards/ggkeyboards/genesis/solder/config.h @@ -18,13 +18,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xBB00 -#define PRODUCT_ID      0xD4D2 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    GG Keyboards -#define PRODUCT         Genesis Solder -  /* key matrix size */  #define MATRIX_ROWS 6  #define MATRIX_COLS 18 diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json index a316ad019d..9b07ecd290 100644 --- a/keyboards/ggkeyboards/genesis/solder/info.json +++ b/keyboards/ggkeyboards/genesis/solder/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "Genesis Solder", +    "manufacturer": "GG Keyboards",      "url": "",      "maintainer": "Spooknik", +    "usb": { +        "vid": "0xBB00", +        "pid": "0xD4D2", +        "device_version": "0.0.1" +    },      "layout_aliases": {          "LAYOUT": "LAYOUT_all"      }, diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h index 527bf4c959..f7f85bfaf7 100644 --- a/keyboards/gh60/revc/config.h +++ b/keyboards/gh60/revc/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    0x4335 // GEEKhack -#define PRODUCT_ID   0x0001 -#define DEVICE_VER   0x0001 -#define MANUFACTURER    geekhack -#define PRODUCT         GH60 Rev C -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 14 diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json index 116cf233c6..1b7fb2e40b 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "GH60 Rev C", +    "manufacturer": "geekhack",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4335", +        "pid": "0x0001", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_all": {              "layout": [ diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index 98218d8466..487400d574 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/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       0x4335 -#define PRODUCT_ID      0x0002 -#define DEVICE_VER      0x0003 -#define MANUFACTURER    SATAN -#define PRODUCT         GH60 Satan -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 14 diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 167025799b..bfd44c42e4 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -1,7 +1,13 @@  {    "keyboard_name": "GH60 Satan", +  "manufacturer": "SATAN",    "url": "",    "maintainer": "qmk", +  "usb": { +    "vid": "0x4335", +    "pid": "0x0002", +    "device_version": "0.0.3" +  },    "layouts": {      "LAYOUT_all": {        "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0}, {"label":"k05", "x":5, "y":0}, {"label":"k06", "x":6, "y":0}, {"label":"k07", "x":7, "y":0}, {"label":"k08", "x":8, "y":0}, {"label":"k09", "x":9, "y":0}, {"label":"k0a", "x":10, "y":0}, {"label":"k0b", "x":11, "y":0}, {"label":"k0c", "x":12, "y":0}, {"label":"k0d", "x":13, "y":0}, {"label":"k49", "x":14, "y":0}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k16", "x":6.5, "y":1}, {"label":"k17", "x":7.5, "y":1}, {"label":"k18", "x":8.5, "y":1}, {"label":"k19", "x":9.5, "y":1}, {"label":"k1a", "x":10.5, "y":1}, {"label":"k1b", "x":11.5, "y":1}, {"label":"k1c", "x":12.5, "y":1}, {"label":"k1d", "x":13.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.75}, {"label":"k21", "x":1.75, "y":2}, {"label":"k22", "x":2.75, "y":2}, {"label":"k23", "x":3.75, "y":2}, {"label":"k24", "x":4.75, "y":2}, {"label":"k25", "x":5.75, "y":2}, {"label":"k26", "x":6.75, "y":2}, {"label":"k27", "x":7.75, "y":2}, {"label":"k28", "x":8.75, "y":2}, {"label":"k29", "x":9.75, "y":2}, {"label":"k2a", "x":10.75, "y":2}, {"label":"k2b", "x":11.75, "y":2}, {"label":"k2c", "x":12.75, "y":2}, {"label":"k2d", "x":13.75, "y":2, "w":1.25}, {"label":"k30", "x":0, "y":3, "w":1.25}, {"label":"k31", "x":1.25, "y":3}, {"label":"k32", "x":2.25, "y":3}, {"label":"k33", "x":3.25, "y":3}, {"label":"k34", "x":4.25, "y":3}, {"label":"k35", "x":5.25, "y":3}, {"label":"k36", "x":6.25, "y":3}, {"label":"k37", "x":7.25, "y":3}, {"label":"k38", "x":8.25, "y":3}, {"label":"k39", "x":9.25, "y":3}, {"label":"k3a", "x":10.25, "y":3}, {"label":"k3b", "x":11.25, "y":3}, {"label":"k3d", "x":12.25, "y":3, "w":1.75}, {"label":"k3c", "x":14, "y":3}, {"label":"k40", "x":0, "y":4, "w":1.25}, {"label":"k41", "x":1.25, "y":4, "w":1.25}, {"label":"k42", "x":2.5, "y":4, "w":1.25}, {"label":"k45", "x":3.75, "y":4, "w":6.25}, {"label":"k4a", "x":10, "y":4, "w":1.25}, {"label":"k4b", "x":11.25, "y":4, "w":1.25}, {"label":"k4c", "x":12.5, "y":4, "w":1.25}, {"label":"k4d", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h index 211dff948f..6d5d56915b 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/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    Unknown -#define PRODUCT         GH60 v1.3 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json index 8e09949e0f..7b5ac465b9 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "GH60 v1.3", +    "manufacturer": "Unknown",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x0000", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_all": {              "layout": [ diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h index 71adb3e249..1476722c74 100644 --- a/keyboards/gh80_3000/config.h +++ b/keyboards/gh80_3000/config.h @@ -2,13 +2,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x3000 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    farmakon -#define PRODUCT         GH80-3000 -  /* key matrix size */  #define MATRIX_ROWS 11  #define MATRIX_COLS 11 diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json index abd041df67..4d9c52fced 100644 --- a/keyboards/gh80_3000/info.json +++ b/keyboards/gh80_3000/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "GH80-3000", +    "manufacturer": "farmakon",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x3000", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K007", "x":18.5, "y":0}, {"label":"K008", "x":19.5, "y":0}, {"label":"K009", "x":20.5, "y":0}, {"label":"K010", "x":21.5, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K409", "x":13, "y":1.5}, {"label":"K410", "x":14, "y":1.5}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K210", "x":21.5, "y":2.5}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K810", "x":21.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":1.75}, {"label":"K710", "x":14, "y":4.5}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"K910", "x":21.5, "y":4.5}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA01", "x":1.5, "y":5.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"KA03", "x":4, "y":5.5}, {"label":"K804", "x":5, "y":5.5, "w":2}, {"label":"K805", "x":7, "y":5.5}, {"label":"K806", "x":8, "y":5.5, "w":2}, {"label":"K604", "x":10, "y":5.5}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K904", "x":12.5, "y":5.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5}, {"label":"KA08", "x":19.5, "y":5.5}, {"label":"KA09", "x":20.5, "y":5.5}, {"label":"KA10", "x":21.5, "y":5.5}] diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h index d97e8841f1..33ce4f0e5c 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/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 0x0645 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Gone Hacking Studio -#define PRODUCT GHS.RAR -  /* key matrix size */  #define MATRIX_ROWS 12  #define MATRIX_COLS 8 diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index ed362b40f6..2f5a75a4f4 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "GHS.RAR", +    "manufacturer": "Gone Hacking Studio",      "url": "https://gonehacking.studio/",      "maintainer": "Gone Hacking Studio", +    "usb": { +        "vid": "0x0645", +        "pid": "0x0001", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_ansi": {              "layout": [ diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h index f437840f91..5bc2e400bf 100755 --- a/keyboards/gizmo_engineering/gk6/config.h +++ b/keyboards/gizmo_engineering/gk6/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       0x6532 -#define PRODUCT_ID      0x0001 -#define DEVICE_VER      0x3031 -#define MANUFACTURER    Gizmo Engineering -#define PRODUCT         GK6 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 12 diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json index ffd59e41b1..8dfdfbf93b 100755 --- a/keyboards/gizmo_engineering/gk6/info.json +++ b/keyboards/gizmo_engineering/gk6/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Gizmo Engineering GK6", +    "keyboard_name": "GK6", +    "manufacturer": "Gizmo Engineering",      "url": "https://gizmo.engineering/",      "maintainer": "federicoweber", +    "usb": { +        "vid": "0x6532", +        "pid": "0x0001", +        "device_version": "30.3.1" +    },      "layouts": {          "LAYOUT_gk6_2x2u": {              "layout": [ diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h index 690ecf42d1..3e89084879 100644 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ b/keyboards/gkeyboard/gkb_m16/config.h @@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID    0x474B     // "GK" -#define PRODUCT_ID   0x4201 -#define DEVICE_VER   0x0001 -#define MANUFACTURER gkeyboard -#define PRODUCT      GKB-M16  /* key matrix size */  #define MATRIX_ROWS 4  #define MATRIX_COLS 4 diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index 1a3817b88b..ff299c5b89 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "gkb_m16", +    "keyboard_name": "GKB-M16", +    "manufacturer": "gkeyboard",      "url": "",      "maintainer": "gkeyboard", +    "usb": { +        "vid": "0x474B", +        "pid": "0x4201", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_ortho_4x4": {              "layout": [ diff --git a/keyboards/gl516/a52gl/config.h b/keyboards/gl516/a52gl/config.h index c9f54e0928..8c7ea45bbd 100644 --- a/keyboards/gl516/a52gl/config.h +++ b/keyboards/gl516/a52gl/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      0xE8D1 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Salicylic_Acid -#define PRODUCT         a52gl -  /* key matrix size */  #define MATRIX_ROWS 8  #define MATRIX_COLS 7 diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json index b2332c0eda..39f872e5cf 100644 --- a/keyboards/gl516/a52gl/info.json +++ b/keyboards/gl516/a52gl/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "a52gl",  +    "manufacturer": "Salicylic_Acid",      "url": "https://salicylic-acid3.hatenablog.com/",       "maintainer": "Salicylic_acid3",  +    "usb": { +        "vid": "0x04D8", +        "pid": "0xE8D1", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h index 50d745ebb1..01dc309a5c 100644 --- a/keyboards/gl516/j73gl/config.h +++ b/keyboards/gl516/j73gl/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      0xE8D0 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Salicylic_Acid -#define PRODUCT         j73gl -  /* key matrix size */  #define MATRIX_ROWS 10  #define MATRIX_COLS 8 diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index 32b771c983..4ef656f230 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "j73gl",  +    "manufacturer": "Salicylic_Acid",      "url": "https://salicylic-acid3.hatenablog.com/",       "maintainer": "Salicylic_acid3",  +    "usb": { +        "vid": "0x04D8", +        "pid": "0xE8D0", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h index ea50fcfa1a..69e770a6b9 100644 --- a/keyboards/gl516/n51gl/config.h +++ b/keyboards/gl516/n51gl/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      0xE8CF -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Salicylic_Acid -#define PRODUCT         n51gl -  /* key matrix size */  #define MATRIX_ROWS 8  #define MATRIX_COLS 7 diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json index 6c94d32e30..99ae8d764f 100644 --- a/keyboards/gl516/n51gl/info.json +++ b/keyboards/gl516/n51gl/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "n51gl",  +    "manufacturer": "Salicylic_Acid",      "url": "https://salicylic-acid3.hatenablog.com/",       "maintainer": "Salicylic_acid3",  +    "usb": { +        "vid": "0x04D8", +        "pid": "0xE8CF", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/glenpickle/chimera_ergo/config.h b/keyboards/glenpickle/chimera_ergo/config.h index 616d8af24e..e7492f7297 100644 --- a/keyboards/glenpickle/chimera_ergo/config.h +++ b/keyboards/glenpickle/chimera_ergo/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    unknown -#define PRODUCT         Chimera Ergo -  /* key matrix size */  #define MATRIX_ROWS 6  #define MATRIX_COLS 12 diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json index 28a9689bae..26faa0343a 100644 --- a/keyboards/glenpickle/chimera_ergo/info.json +++ b/keyboards/glenpickle/chimera_ergo/info.json @@ -1,7 +1,13 @@  {    "keyboard_name": "Chimera Ergo", +  "manufacturer": "Unknown",    "url": "",    "maintainer": "qmk", +  "usb": { +    "vid": "0xFEED", +    "pid": "0x6060", +    "device_version": "0.0.1" +  },    "layouts": {      "LAYOUT": {        "layout": [{"label":"k00", "x":0, "y":1}, {"label":"k01", "x":1, "y":0.75}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.25}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.25}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k10", "x":11, "y":0.75}, {"label":"k11", "x":12, "y":1}, {"label":"k12", "x":0, "y":2}, {"label":"k13", "x":1, "y":1.75}, {"label":"k14", "x":2, "y":1.25}, {"label":"k15", "x":3, "y":1}, {"label":"k16", "x":4, "y":1.25}, {"label":"k17", "x":5, "y":1.5}, {"label":"k18", "x":7, "y":1.5}, {"label":"k19", "x":8, "y":1.25}, {"label":"k20", "x":9, "y":1}, {"label":"k21", "x":10, "y":1.25}, {"label":"k22", "x":11, "y":1.75}, {"label":"k23", "x":12, "y":2}, {"label":"k24", "x":0, "y":3}, {"label":"k25", "x":1, "y":2.75}, {"label":"k26", "x":2, "y":2.25}, {"label":"k27", "x":3, "y":2}, {"label":"k28", "x":4, "y":2.25}, {"label":"k29", "x":5, "y":2.5}, {"label":"k30", "x":7, "y":2.5}, {"label":"k31", "x":8, "y":2.25}, {"label":"k32", "x":9, "y":2}, {"label":"k33", "x":10, "y":2.25}, {"label":"k34", "x":11, "y":2.75}, {"label":"k35", "x":12, "y":3}, {"label":"k36", "x":0, "y":4}, {"label":"k37", "x":1, "y":3.75}, {"label":"k38", "x":2, "y":3.25}, {"label":"k39", "x":3, "y":3}, {"label":"k40", "x":4, "y":3.25}, {"label":"k41", "x":5, "y":3.5}, {"label":"k42", "x":7, "y":3.5}, {"label":"k43", "x":8, "y":3.25}, {"label":"k44", "x":9, "y":3}, {"label":"k45", "x":10, "y":3.25}, {"label":"k46", "x":11, "y":3.75}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":4, "y":4.75}, {"label":"k49", "x":5, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k51", "x":8, "y":4.75}] diff --git a/keyboards/glenpickle/chimera_ls/config.h b/keyboards/glenpickle/chimera_ls/config.h index f5da32e3c3..581f133571 100644 --- a/keyboards/glenpickle/chimera_ls/config.h +++ b/keyboards/glenpickle/chimera_ls/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    unknown -#define PRODUCT         Chimera Lets Split -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 12 diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json index b6585a5c28..02b9aba091 100644 --- a/keyboards/glenpickle/chimera_ls/info.json +++ b/keyboards/glenpickle/chimera_ls/info.json @@ -1,7 +1,13 @@  { -  "keyboard_name": "Chimera LS", +  "keyboard_name": "Chimera Lets Split", +  "manufacturer": "Unknown",    "url": "",    "maintainer": "qmk", +  "usb": { +    "vid": "0xFEED", +    "pid": "0x6060", +    "device_version": "0.0.1" +  },    "layouts": {      "LAYOUT_ortho_4x12": {        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/glenpickle/chimera_ortho/config.h b/keyboards/glenpickle/chimera_ortho/config.h index 8ae25c1eb4..1310866fbb 100644 --- a/keyboards/glenpickle/chimera_ortho/config.h +++ b/keyboards/glenpickle/chimera_ortho/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    unknown -#define PRODUCT         Chimera Ortho -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 10 diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json index 73e15c64f3..ac4ecfb201 100644 --- a/keyboards/glenpickle/chimera_ortho/info.json +++ b/keyboards/glenpickle/chimera_ortho/info.json @@ -1,6 +1,12 @@  {    "keyboard_name": "Chimera Ortho", +  "manufacturer": "Unknown",    "maintainer": "qmk", +  "usb": { +    "vid": "0xFEED", +    "pid": "0x6060", +    "device_version": "0.0.1" +  },    "layouts": {      "LAYOUT": {        "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho_plus/config.h b/keyboards/glenpickle/chimera_ortho_plus/config.h index 4846a1b20d..e7492f7297 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/config.h +++ b/keyboards/glenpickle/chimera_ortho_plus/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      0xDE1D -#define DEVICE_VER      0x0001 -#define MANUFACTURER    unknown -#define PRODUCT         Chimera Ortho Plus -  /* key matrix size */  #define MATRIX_ROWS 6  #define MATRIX_COLS 12 diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json index 29a2c2a634..fb7dfbbf6c 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/info.json +++ b/keyboards/glenpickle/chimera_ortho_plus/info.json @@ -1,6 +1,12 @@  {    "keyboard_name": "Chimera Ortho Plus", +  "manufacturer": "Unknown",    "maintainer": "qmk", +  "usb": { +    "vid": "0xFEED", +    "pid": "0xDE1D", +    "device_version": "0.0.1" +  },    "layouts": {      "LAYOUT": {        "layout": [ diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index 5e2fe57327..85dfe0a339 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -2,13 +2,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0x4E45  // NE -#define PRODUCT_ID      0x3630  // 60 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    GON -#define PRODUCT         NerD 60 -  /* key matrix size */  #define MATRIX_ROWS 10  #define MATRIX_COLS 8 diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 66db3f1185..baf67fe528 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "GON NerD 60", +    "keyboard_name": "NerD 60", +    "manufacturer": "GON",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4E45", +        "pid": "0x3630", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_all": {              "layout": [ diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h index 74d67f30d4..ec2cbc8a32 100644 --- a/keyboards/gon/nerdtkl/config.h +++ b/keyboards/gon/nerdtkl/config.h @@ -2,13 +2,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0x4E45  // NE -#define PRODUCT_ID      0x5244  // RD -#define DEVICE_VER      0x0001 -#define MANUFACTURER    GON -#define PRODUCT         NerD TKL -  /* key matrix size */  #define MATRIX_ROWS 10  #define MATRIX_COLS 9 diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index 45155fd737..1af13bf237 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "GON NerD TKL", +    "keyboard_name": "NerD TKL", +    "manufacturer": "GON",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4E45", +        "pid": "0x5244", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_tkl": {              "layout": [ diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h index 26643b49f7..7566bd2c3f 100644 --- a/keyboards/gopolar/gg86/config.h +++ b/keyboards/gopolar/gg86/config.h @@ -18,13 +18,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0x0007 -#define PRODUCT_ID      0x0007 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Gopolar -#define PRODUCT         GG86 Tai-Chi -  /* key matrix size */  #define MATRIX_ROWS 6  #define MATRIX_COLS 17 diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index fbe92b93b7..9fbca5b36d 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "GG86",  +    "keyboard_name": "GG86 Tai-Chi",  +    "manufacturer": "Gopolar",      "url": "",       "maintainer": "Gopolar",  +    "usb": { +        "vid": "0x0007", +        "pid": "0x0007", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_all": {              "layout": [ diff --git a/keyboards/gorthage_truck/config.h b/keyboards/gorthage_truck/config.h index 46a928b9d6..c3777f7318 100644 --- a/keyboards/gorthage_truck/config.h +++ b/keyboards/gorthage_truck/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    0xB33F -#define PRODUCT_ID   0x58E4 -#define DEVICE_VER   0x0001 -#define MANUFACTURER s8erdude -#define PRODUCT      gorthage_truck -  /* key matrix size */  #define MATRIX_ROWS 8  #define MATRIX_COLS 9 diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json index 8f344ee860..8b083b3229 100644 --- a/keyboards/gorthage_truck/info.json +++ b/keyboards/gorthage_truck/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "gorthage_truck", +    "manufacturer": "s8erdude",      "url": "https://github.com/jpuerto96",      "maintainer": "jpuerto96 (s8erdude)", +    "usb": { +        "vid": "0xB33F", +        "pid": "0x58E4", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_3u": {              "layout": [ diff --git a/keyboards/gowla/config.h b/keyboards/gowla/config.h index fed13df57d..8f178c6aba 100644 --- a/keyboards/gowla/config.h +++ b/keyboards/gowla/config.h @@ -17,13 +17,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      0xE9B6 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Gowla -#define PRODUCT         Gowla Macro Board -  /* Matrix size */  #define MATRIX_ROWS 3  #define MATRIX_COLS 3 diff --git a/keyboards/gowla/info.json b/keyboards/gowla/info.json index c4926000bb..bf9f17e4ad 100644 --- a/keyboards/gowla/info.json +++ b/keyboards/gowla/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Gowla Macro Pad", +    "keyboard_name": "Gowla Macro Board", +    "manufacturer": "Gowla",      "url": "https://github.com/SamGowland/Gowla-Macro-Board",      "maintainer": "Gowla", +    "usb": { +        "vid": "0xFEED", +        "pid": "0xE9B6", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_ortho_3x3": {              "layout": [ diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h index f00550fb65..89fc00653a 100644 --- a/keyboards/gray_studio/apollo80/config.h +++ b/keyboards/gray_studio/apollo80/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       0x4753 -#define PRODUCT_ID      0x3001 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Graystudio -#define PRODUCT         apollo80 -  /* key matrix size */  #define MATRIX_ROWS 6  #define MATRIX_COLS 17 diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index c0e3efdb88..32d36d766d 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "apollo 80", +    "keyboard_name": "apollo80", +    "manufacturer": "Graystudio",      "url": "https://graystudio.club/products/gb-space80-apollo",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4753", +        "pid": "0x3001", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h index 466ddcebc0..20612363ec 100644 --- a/keyboards/gray_studio/cod67/config.h +++ b/keyboards/gray_studio/cod67/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       0x4753 -#define PRODUCT_ID      0x1000 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Graystudio -#define PRODUCT         COD67 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 14 diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index b95f5eb8e4..c75d4786a5 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -1,7 +1,13 @@  {    "keyboard_name": "COD67", +  "manufacturer": "Graystudio",    "url": "",    "maintainer": "qmk", +  "usb": { +    "vid": "0x4753", +    "pid": "0x1000", +    "device_version": "0.0.1" +  },    "layouts": {        "LAYOUT": {            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"Shift", "x":11.25, "y":3, "w":1.75}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Win", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4, "w":2}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h index 0e1f0aff42..d1240e6b9c 100644 --- a/keyboards/gray_studio/hb85/config.h +++ b/keyboards/gray_studio/hb85/config.h @@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #pragma once -#define VENDOR_ID       0x4753 -#define PRODUCT_ID      0x2000 -#define DEVICE_VER      0x0200 -#define MANUFACTURER    Gray Studio -#define PRODUCT         HB85 -  /* matrix size */  #define MATRIX_ROWS 8  #define MATRIX_COLS 15 diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index a60047df9a..a2895c1ee6 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Gray Studio HB85",  +    "keyboard_name": "HB85",  +    "manufacturer": "Gray Studio",      "url": "",       "maintainer": "qmk",  +    "usb": { +        "vid": "0x4753", +        "pid": "0x2000", +        "device_version": "2.0.0" +    },      "layouts": {          "LAYOUT_all": {              "layout": [{"x":1.5, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15, "y":1.25}, {"x":16, "y":1.25}, {"x":17, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"x":16, "y":2.25}, {"x":17, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13, "y":5.25}, {"x":14, "y":5.25}, {"x":15, "y":5.25}, {"x":16, "y":5.25}] diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h index 23bf1e7f94..0a67e39bcf 100644 --- a/keyboards/gray_studio/space65/config.h +++ b/keyboards/gray_studio/space65/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       0x4753 -#define PRODUCT_ID      0x3000 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Graystudio -#define PRODUCT         Space65 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index a14df5ca8f..9d3e600307 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Gray Studio Space65", +    "keyboard_name": "Space65", +    "manufacturer": "Graystudio",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4753", +        "pid": "0x3000", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h index b42e3cebdf..c9a8937436 100644 --- a/keyboards/gray_studio/think65/hotswap/config.h +++ b/keyboards/gray_studio/think65/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       0x4753 -#define PRODUCT_ID      0x4001 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Graystudio -#define PRODUCT         Think6.5° Hotswap -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json index 4cbd8744b7..6de7e15c73 100644 --- a/keyboards/gray_studio/think65/hotswap/info.json +++ b/keyboards/gray_studio/think65/hotswap/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "THINK6.5", +    "keyboard_name": "Think6.5° Hotswap", +    "manufacturer": "Graystudio",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4753", +        "pid": "0x4001", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_65_ansi_blocker": {              "layout": [ diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index 32a1769a6b..e2fb811cf9 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/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       0x4753 -#define PRODUCT_ID      0x4000 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Graystudio -#define PRODUCT         Think6.5° -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json index 5a7b7bea00..54c2cd2cc4 100644 --- a/keyboards/gray_studio/think65/solder/info.json +++ b/keyboards/gray_studio/think65/solder/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "THINK6.5", +    "keyboard_name": "Think6.5°", +    "manufacturer": "Graystudio",      "url": "",      "maintainer": "qmk", +    "usb": { +        "vid": "0x4753", +        "pid": "0x4000", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT_65_ansi_blocker": {              "layout": [ diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h index 0f6fe305cb..7afe784e06 100644 --- a/keyboards/grid600/press/config.h +++ b/keyboards/grid600/press/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      0x7539 -#define DEVICE_VER      0x0005 -#define MANUFACTURER    Grid -#define PRODUCT         PRESS -  /* key matrix size */  #define MATRIX_ROWS 1  #define MATRIX_COLS 4 diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index 7ee2a93d0a..e1ed976dc0 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -1,7 +1,13 @@  { -    "keyboard_name": "Grid 600 Type 05 PRESS Cover Module",  +    "keyboard_name": "PRESS",  +    "manufacturer": "Grid",      "url": "",       "maintainer": "qmk",  +    "usb": { +        "vid": "0xFEED", +        "pid": "0x7539", +        "device_version": "0.0.5" +    },      "layouts": {          "LAYOUT": {              "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}] diff --git a/keyboards/gvalchca/ga150/config.h b/keyboards/gvalchca/ga150/config.h index c815217702..0e54d66141 100644 --- a/keyboards/gvalchca/ga150/config.h +++ b/keyboards/gvalchca/ga150/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       0x6776 -#define PRODUCT_ID      0x6135 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Gvalchca -#define PRODUCT         GA15.0 -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json index b81082d32f..b2c5208558 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "GA15.0", +    "manufacturer": "Gvalchca",      "url": "",      "maintainer": "Gvalchca", +    "usb": { +        "vid": "0x6776", +        "pid": "0x6135", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ diff --git a/keyboards/gvalchca/spaccboard/config.h b/keyboards/gvalchca/spaccboard/config.h index 64b13bd9bc..518337ca94 100644 --- a/keyboards/gvalchca/spaccboard/config.h +++ b/keyboards/gvalchca/spaccboard/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       0x6776 -#define PRODUCT_ID      0x5342 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    Gvalchca -#define PRODUCT         SpaccBoard -  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json index 654c3eb4ad..468dd972ab 100644 --- a/keyboards/gvalchca/spaccboard/info.json +++ b/keyboards/gvalchca/spaccboard/info.json @@ -1,7 +1,13 @@  {      "keyboard_name": "SpaccBoard", +    "manufacturer": "Gvalchca",      "url": "https://keebmeup.com",      "maintainer": "Gvalchca", +    "usb": { +        "vid": "0x6776", +        "pid": "0x5342", +        "device_version": "0.0.1" +    },      "layouts": {          "LAYOUT": {              "layout": [ | 
