From 51d5aad25b92a34bc051849616fcd93e3ae407fc Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 15 Aug 2022 13:30:12 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: D-E (#17956) --- keyboards/dailycraft/bat43/config.h | 7 -- keyboards/dailycraft/bat43/info.json | 75 ++++++++++++++++++++++ keyboards/dailycraft/bat43/rev1/info.json | 69 -------------------- keyboards/dailycraft/bat43/rev2/info.json | 69 -------------------- keyboards/dailycraft/claw44/rev1/config.h | 7 -- keyboards/dailycraft/claw44/rev1/info.json | 8 ++- keyboards/dailycraft/sandbox/rev1/config.h | 7 -- keyboards/dailycraft/sandbox/rev1/info.json | 6 ++ keyboards/dailycraft/sandbox/rev2/config.h | 7 -- keyboards/dailycraft/sandbox/rev2/info.json | 6 ++ keyboards/dailycraft/stickey4/config.h | 7 -- keyboards/dailycraft/stickey4/info.json | 11 ++++ keyboards/dailycraft/wings42/rev1/config.h | 7 -- keyboards/dailycraft/wings42/rev1/info.json | 6 ++ keyboards/dailycraft/wings42/rev1_extkeys/config.h | 7 -- .../dailycraft/wings42/rev1_extkeys/info.json | 6 ++ keyboards/dailycraft/wings42/rev2/config.h | 7 -- keyboards/dailycraft/wings42/rev2/info.json | 6 ++ keyboards/delikeeb/vanana/config.h | 4 -- keyboards/delikeeb/vanana/info.json | 6 +- keyboards/delikeeb/vanana/rev1/config.h | 4 -- keyboards/delikeeb/vanana/rev1/info.json | 6 ++ keyboards/delikeeb/vanana/rev2/config.h | 4 -- keyboards/delikeeb/vanana/rev2/info.json | 6 ++ keyboards/delikeeb/waaffle/config.h | 4 -- keyboards/delikeeb/waaffle/rev3/config.h | 4 -- keyboards/delikeeb/waaffle/rev3/info.json | 8 ++- keyboards/deltasplit75/info.json | 12 ---- keyboards/deltasplit75/v2/config.h | 7 -- keyboards/deltasplit75/v2/info.json | 18 ++++++ keyboards/duck/octagon/v1/config.h | 7 -- keyboards/duck/octagon/v1/info.json | 6 ++ keyboards/duck/octagon/v2/config.h | 7 -- keyboards/duck/octagon/v2/info.json | 6 ++ keyboards/duck/orion/info.json | 10 --- keyboards/duck/orion/v3/config.h | 7 -- keyboards/duck/orion/v3/info.json | 16 +++++ keyboards/dumbpad/config.h | 6 -- keyboards/dumbpad/info.json | 10 +++ keyboards/dumbpad/v0x/config.h | 3 - keyboards/dumbpad/v0x/info.json | 6 +- keyboards/dumbpad/v0x_dualencoder/config.h | 3 - keyboards/dumbpad/v0x_dualencoder/info.json | 6 +- keyboards/dumbpad/v0x_right/config.h | 3 - keyboards/dumbpad/v0x_right/info.json | 6 +- keyboards/dumbpad/v1x/info.json | 6 +- keyboards/dumbpad/v1x_dualencoder/config.h | 3 - keyboards/dumbpad/v1x_dualencoder/info.json | 6 +- keyboards/dumbpad/v1x_oled/config.h | 5 -- keyboards/dumbpad/v1x_oled/info.json | 7 +- keyboards/dumbpad/v1x_right/config.h | 3 - keyboards/dumbpad/v1x_right/info.json | 6 +- keyboards/durgod/dgk6x/config.h | 4 -- keyboards/durgod/dgk6x/galaxy/config.h | 5 -- keyboards/durgod/dgk6x/galaxy/info.json | 8 ++- keyboards/durgod/dgk6x/hades/config.h | 5 -- keyboards/durgod/dgk6x/hades/info.json | 8 ++- keyboards/durgod/dgk6x/venus/config.h | 5 -- keyboards/durgod/dgk6x/venus/info.json | 8 ++- keyboards/durgod/k3x0/config.h | 4 -- keyboards/durgod/k3x0/k310/base/config.h | 4 -- keyboards/durgod/k3x0/k310/config.h | 8 --- keyboards/durgod/k3x0/k310/info.json | 8 ++- keyboards/durgod/k3x0/k320/base/config.h | 4 -- keyboards/durgod/k3x0/k320/config.h | 8 --- keyboards/durgod/k3x0/k320/info.json | 8 ++- keyboards/dztech/dz60rgb/info.json | 4 ++ keyboards/dztech/dz60rgb/v1/config.h | 7 -- keyboards/dztech/dz60rgb/v1/info.json | 6 ++ keyboards/dztech/dz60rgb/v2/config.h | 7 -- keyboards/dztech/dz60rgb/v2/info.json | 6 ++ keyboards/dztech/dz60rgb/v2_1/config.h | 7 -- keyboards/dztech/dz60rgb/v2_1/info.json | 6 ++ keyboards/dztech/dz60rgb_ansi/info.json | 6 +- keyboards/dztech/dz60rgb_ansi/v1/config.h | 7 -- keyboards/dztech/dz60rgb_ansi/v1/info.json | 6 ++ keyboards/dztech/dz60rgb_ansi/v2/config.h | 7 -- keyboards/dztech/dz60rgb_ansi/v2/info.json | 6 ++ keyboards/dztech/dz60rgb_ansi/v2_1/config.h | 7 -- keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 6 ++ keyboards/dztech/dz60rgb_wkl/info.json | 6 +- keyboards/dztech/dz60rgb_wkl/v1/config.h | 7 -- keyboards/dztech/dz60rgb_wkl/v1/info.json | 6 ++ keyboards/dztech/dz60rgb_wkl/v2/config.h | 7 -- keyboards/dztech/dz60rgb_wkl/v2/info.json | 6 ++ keyboards/dztech/dz60rgb_wkl/v2_1/config.h | 7 -- keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 6 ++ keyboards/dztech/dz65rgb/info.json | 6 +- keyboards/dztech/dz65rgb/v1/config.h | 7 -- keyboards/dztech/dz65rgb/v1/info.json | 6 ++ keyboards/dztech/dz65rgb/v2/config.h | 7 -- keyboards/dztech/dz65rgb/v2/info.json | 6 ++ keyboards/dztech/dz65rgb/v3/config.h | 7 -- keyboards/dztech/dz65rgb/v3/info.json | 6 ++ keyboards/eco/config.h | 6 -- keyboards/eco/info.json | 7 +- keyboards/eco/rev1/config.h | 2 - keyboards/eco/rev1/info.json | 5 ++ keyboards/eco/rev2/config.h | 2 - keyboards/eco/rev2/info.json | 5 ++ keyboards/edi/hardlight/mk1/config.h | 7 -- keyboards/edi/hardlight/mk1/info.json | 9 +++ keyboards/edi/hardlight/mk2/config.h | 7 -- keyboards/edi/hardlight/mk2/info.json | 9 +++ keyboards/ergodox_ez/base/info.json | 6 ++ keyboards/ergodox_ez/base/rules.mk | 0 keyboards/ergodox_ez/config.h | 7 -- keyboards/ergodox_ez/glow/config.h | 26 -------- keyboards/ergodox_ez/glow/info.json | 6 ++ keyboards/ergodox_ez/info.json | 6 +- keyboards/ergodox_ez/rules.mk | 2 + keyboards/ergodox_ez/shine/config.h | 26 -------- keyboards/ergodox_ez/shine/info.json | 6 ++ keyboards/ergoslab/info.json | 63 ------------------ keyboards/ergoslab/rev1/config.h | 7 -- keyboards/ergoslab/rev1/info.json | 69 ++++++++++++++++++++ keyboards/ergotravel/info.json | 13 ---- keyboards/ergotravel/rev1/config.h | 7 -- keyboards/ergotravel/rev1/info.json | 18 ++++++ keyboards/ericrlau/numdiscipline/info.json | 19 ------ keyboards/ericrlau/numdiscipline/rev1/config.h | 7 -- keyboards/ericrlau/numdiscipline/rev1/info.json | 25 ++++++++ keyboards/exclusive/e85/config.h | 5 -- keyboards/exclusive/e85/hotswap/config.h | 18 ------ keyboards/exclusive/e85/hotswap/info.json | 8 ++- keyboards/exclusive/e85/soldered/config.h | 18 ------ keyboards/exclusive/e85/soldered/info.json | 8 ++- 127 files changed, 535 insertions(+), 698 deletions(-) create mode 100644 keyboards/dailycraft/bat43/info.json delete mode 100644 keyboards/dailycraft/bat43/rev1/info.json delete mode 100644 keyboards/dailycraft/bat43/rev2/info.json create mode 100644 keyboards/dailycraft/stickey4/info.json create mode 100644 keyboards/delikeeb/vanana/rev1/info.json create mode 100644 keyboards/delikeeb/vanana/rev2/info.json delete mode 100644 keyboards/deltasplit75/info.json create mode 100644 keyboards/deltasplit75/v2/info.json delete mode 100644 keyboards/duck/orion/info.json create mode 100644 keyboards/duck/orion/v3/info.json create mode 100644 keyboards/dumbpad/info.json create mode 100644 keyboards/dztech/dz60rgb/v1/info.json create mode 100644 keyboards/dztech/dz60rgb/v2/info.json create mode 100644 keyboards/dztech/dz60rgb/v2_1/info.json create mode 100644 keyboards/dztech/dz60rgb_ansi/v1/info.json create mode 100644 keyboards/dztech/dz60rgb_ansi/v2/info.json create mode 100644 keyboards/dztech/dz60rgb_ansi/v2_1/info.json create mode 100644 keyboards/dztech/dz60rgb_wkl/v1/info.json create mode 100644 keyboards/dztech/dz60rgb_wkl/v2/info.json create mode 100644 keyboards/dztech/dz60rgb_wkl/v2_1/info.json create mode 100644 keyboards/dztech/dz65rgb/v1/info.json create mode 100644 keyboards/dztech/dz65rgb/v2/info.json create mode 100644 keyboards/dztech/dz65rgb/v3/info.json create mode 100644 keyboards/eco/rev1/info.json create mode 100644 keyboards/eco/rev2/info.json create mode 100644 keyboards/edi/hardlight/mk1/info.json create mode 100644 keyboards/edi/hardlight/mk2/info.json create mode 100644 keyboards/ergodox_ez/base/info.json create mode 100644 keyboards/ergodox_ez/base/rules.mk delete mode 100644 keyboards/ergodox_ez/glow/config.h create mode 100644 keyboards/ergodox_ez/glow/info.json delete mode 100644 keyboards/ergodox_ez/shine/config.h create mode 100644 keyboards/ergodox_ez/shine/info.json delete mode 100644 keyboards/ergoslab/info.json create mode 100644 keyboards/ergoslab/rev1/info.json delete mode 100644 keyboards/ergotravel/info.json create mode 100644 keyboards/ergotravel/rev1/info.json delete mode 100644 keyboards/ericrlau/numdiscipline/info.json create mode 100644 keyboards/ericrlau/numdiscipline/rev1/info.json delete mode 100644 keyboards/exclusive/e85/hotswap/config.h delete mode 100644 keyboards/exclusive/e85/soldered/config.h diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h index 4c42f6a06d..9d572f57dc 100644 --- a/keyboards/dailycraft/bat43/config.h +++ b/keyboards/dailycraft/bat43/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT bat43 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json new file mode 100644 index 0000000000..ce05fe8a5a --- /dev/null +++ b/keyboards/dailycraft/bat43/info.json @@ -0,0 +1,75 @@ +{ + "keyboard_name": "bat43", + "manufacturer": "yfuku", + "url": "", + "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0002", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"k00", "x":0, "y":1.43}, + {"label":"k01", "x":1, "y":1.11}, + {"label":"k02", "x":2, "y":0.38}, + {"label":"k03", "x":3, "y":0}, + {"label":"k04", "x":4, "y":0.05}, + {"label":"k05", "x":5, "y":0.16}, + + {"label":"k40", "x":9, "y":0.16}, + {"label":"k41", "x":10, "y":0.05}, + {"label":"k42", "x":11, "y":0}, + {"label":"k43", "x":12, "y":0.38}, + {"label":"k44", "x":13, "y":1.11}, + {"label":"k45", "x":14, "y":1.43}, + + {"label":"k10", "x":0, "y":2.43}, + {"label":"k11", "x":1, "y":2.11}, + {"label":"k12", "x":2, "y":1.38}, + {"label":"k13", "x":3, "y":1}, + {"label":"k14", "x":4, "y":1.05}, + {"label":"k15", "x":5, "y":1.16}, + + {"label":"k30", "x":7, "y":1.16}, + + {"label":"k50", "x":9, "y":1.16}, + {"label":"k51", "x":10, "y":1.05}, + {"label":"k52", "x":11, "y":1}, + {"label":"k53", "x":12, "y":1.38}, + {"label":"k54", "x":13, "y":2.11}, + {"label":"k55", "x":14, "y":2.43}, + + {"label":"k20", "x":0, "y":3.43}, + {"label":"k21", "x":1, "y":3.11}, + {"label":"k22", "x":2, "y":2.38}, + {"label":"k23", "x":3, "y":2}, + {"label":"k24", "x":4, "y":2.05}, + {"label":"k25", "x":5, "y":2.16}, + + {"label":"k60", "x":9, "y":2.16}, + {"label":"k61", "x":10, "y":2.05}, + {"label":"k62", "x":11, "y":2}, + {"label":"k63", "x":12, "y":2.38}, + {"label":"k64", "x":13, "y":3.11}, + {"label":"k65", "x":14, "y":3.43}, + + {"label":"k33", "x":4, "y":3.3}, + {"label":"k34", "x":5, "y":3.3}, + {"label":"k35", "x":6, "y":3.3}, + + {"label":"k70", "x":8, "y":3.3}, + {"label":"k71", "x":9, "y":3.3}, + {"label":"k72", "x":10, "y":3.3}, + + {"label":"k75", "x":5.1, "y":4.3, "w":0.8, "h":0.8}, + {"label":"k74", "x":6.1, "y":4.3, "w":0.8, "h":0.8}, + + {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8}, + {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8}, + {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8} + ] + } + } +} diff --git a/keyboards/dailycraft/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/info.json deleted file mode 100644 index 0384bb5feb..0000000000 --- a/keyboards/dailycraft/bat43/rev1/info.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "keyboard_name": "bat43", - "url": "", - "maintainer": "yfuku", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"k00", "x":0, "y":1.43}, - {"label":"k01", "x":1, "y":1.11}, - {"label":"k02", "x":2, "y":0.38}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0.05}, - {"label":"k05", "x":5, "y":0.16}, - - {"label":"k40", "x":9, "y":0.16}, - {"label":"k41", "x":10, "y":0.05}, - {"label":"k42", "x":11, "y":0}, - {"label":"k43", "x":12, "y":0.38}, - {"label":"k44", "x":13, "y":1.11}, - {"label":"k45", "x":14, "y":1.43}, - - {"label":"k10", "x":0, "y":2.43}, - {"label":"k11", "x":1, "y":2.11}, - {"label":"k12", "x":2, "y":1.38}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1.05}, - {"label":"k15", "x":5, "y":1.16}, - - {"label":"k30", "x":7, "y":1.16}, - - {"label":"k50", "x":9, "y":1.16}, - {"label":"k51", "x":10, "y":1.05}, - {"label":"k52", "x":11, "y":1}, - {"label":"k53", "x":12, "y":1.38}, - {"label":"k54", "x":13, "y":2.11}, - {"label":"k55", "x":14, "y":2.43}, - - {"label":"k20", "x":0, "y":3.43}, - {"label":"k21", "x":1, "y":3.11}, - {"label":"k22", "x":2, "y":2.38}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2.05}, - {"label":"k25", "x":5, "y":2.16}, - - {"label":"k60", "x":9, "y":2.16}, - {"label":"k61", "x":10, "y":2.05}, - {"label":"k62", "x":11, "y":2}, - {"label":"k63", "x":12, "y":2.38}, - {"label":"k64", "x":13, "y":3.11}, - {"label":"k65", "x":14, "y":3.43}, - - {"label":"k33", "x":4, "y":3.3}, - {"label":"k34", "x":5, "y":3.3}, - {"label":"k35", "x":6, "y":3.3}, - - {"label":"k70", "x":8, "y":3.3}, - {"label":"k71", "x":9, "y":3.3}, - {"label":"k72", "x":10, "y":3.3}, - - {"label":"k74", "x":5.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k75", "x":6.1, "y":4.3, "w":0.8, "h":0.8}, - - {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8} - ] - } - } -} diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/info.json deleted file mode 100644 index 352d9a6beb..0000000000 --- a/keyboards/dailycraft/bat43/rev2/info.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "keyboard_name": "bat43", - "url": "", - "maintainer": "yfuku", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"k00", "x":0, "y":1.43}, - {"label":"k01", "x":1, "y":1.11}, - {"label":"k02", "x":2, "y":0.38}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0.05}, - {"label":"k05", "x":5, "y":0.16}, - - {"label":"k40", "x":9, "y":0.16}, - {"label":"k41", "x":10, "y":0.05}, - {"label":"k42", "x":11, "y":0}, - {"label":"k43", "x":12, "y":0.38}, - {"label":"k44", "x":13, "y":1.11}, - {"label":"k45", "x":14, "y":1.43}, - - {"label":"k10", "x":0, "y":2.43}, - {"label":"k11", "x":1, "y":2.11}, - {"label":"k12", "x":2, "y":1.38}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1.05}, - {"label":"k15", "x":5, "y":1.16}, - - {"label":"k30", "x":7, "y":1.16}, - - {"label":"k50", "x":9, "y":1.16}, - {"label":"k51", "x":10, "y":1.05}, - {"label":"k52", "x":11, "y":1}, - {"label":"k53", "x":12, "y":1.38}, - {"label":"k54", "x":13, "y":2.11}, - {"label":"k55", "x":14, "y":2.43}, - - {"label":"k20", "x":0, "y":3.43}, - {"label":"k21", "x":1, "y":3.11}, - {"label":"k22", "x":2, "y":2.38}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2.05}, - {"label":"k25", "x":5, "y":2.16}, - - {"label":"k60", "x":9, "y":2.16}, - {"label":"k61", "x":10, "y":2.05}, - {"label":"k62", "x":11, "y":2}, - {"label":"k63", "x":12, "y":2.38}, - {"label":"k64", "x":13, "y":3.11}, - {"label":"k65", "x":14, "y":3.43}, - - {"label":"k33", "x":4, "y":3.3}, - {"label":"k34", "x":5, "y":3.3}, - {"label":"k35", "x":6, "y":3.3}, - - {"label":"k70", "x":8, "y":3.3}, - {"label":"k71", "x":9, "y":3.3}, - {"label":"k72", "x":10, "y":3.3}, - - {"label":"k75", "x":5.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k74", "x":6.1, "y":4.3, "w":0.8, "h":0.8}, - - {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8} - ] - } - } -} diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h index bcfcbababa..c1dc1234fd 100644 --- a/keyboards/dailycraft/claw44/rev1/config.h +++ b/keyboards/dailycraft/claw44/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT claw44 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 3301e7d2ec..88a0237032 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Claw44 rev1", + "keyboard_name": "claw44", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h index 2bd405d2aa..12cfaf9490 100644 --- a/keyboards/dailycraft/sandbox/rev1/config.h +++ b/keyboards/dailycraft/sandbox/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0009 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT sandbox - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 5 diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json index 518225a813..c94f88bd30 100644 --- a/keyboards/dailycraft/sandbox/rev1/info.json +++ b/keyboards/dailycraft/sandbox/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "sandbox rev1", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0009", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h index 06905afe47..bc14effc75 100644 --- a/keyboards/dailycraft/sandbox/rev2/config.h +++ b/keyboards/dailycraft/sandbox/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0011 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT sandbox rev2 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index e561dfec5c..ce1574a0e1 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "sandbox rev2", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0011", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h index d9bd0f3301..b16e466084 100644 --- a/keyboards/dailycraft/stickey4/config.h +++ b/keyboards/dailycraft/stickey4/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT stickey4 - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 8 diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json new file mode 100644 index 0000000000..94f57674b4 --- /dev/null +++ b/keyboards/dailycraft/stickey4/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "stickey4", + "manufacturer": "yfuku", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x5946", + "pid": "0x0010", + "device_version": "0.0.1" + } +} diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h index 0d53ff7634..0c6929f1d2 100644 --- a/keyboards/dailycraft/wings42/rev1/config.h +++ b/keyboards/dailycraft/wings42/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT wings42 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index 863bb3d34e..72ece409da 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "wings42 rev1", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x6_3": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h index b2fe3210b6..c37909b401 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h +++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT wings42 extkeys - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json index b9a793f112..440df65dbf 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "wings42 rev1_extkeys", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h index f1e7716bb4..0cddea3ba6 100644 --- a/keyboards/dailycraft/wings42/rev2/config.h +++ b/keyboards/dailycraft/wings42/rev2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5946 // YF -#define PRODUCT_ID 0x0005 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yfuku -#define PRODUCT wings42 rev2 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 6 diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index 4e78697627..67a642b425 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "wings42 rev2", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0005", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x6_3_2": { "layout": [ diff --git a/keyboards/delikeeb/vanana/config.h b/keyboards/delikeeb/vanana/config.h index 3a5a888945..7879dc1b1a 100644 --- a/keyboards/delikeeb/vanana/config.h +++ b/keyboards/delikeeb/vanana/config.h @@ -18,7 +18,3 @@ along with this program. If not, see . #pragma once #include "config_common.h" - -#define VENDOR_ID 0x9906 -#define PRODUCT_ID 0x0013 -#define MANUFACTURER dELIKEEb diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 78c11fbee2..b8a5f78cf8 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "vanana", + "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", + "usb": { + "vid": "0x9906", + "pid": "0x0013" + }, "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index 8213404eb3..17f2f7b2b8 100644 --- a/keyboards/delikeeb/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define PRODUCT Vanana rev1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json new file mode 100644 index 0000000000..992960c5a2 --- /dev/null +++ b/keyboards/delikeeb/vanana/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Vanana rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index 8397424aa9..52e1d14802 100644 --- a/keyboards/delikeeb/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 -#define PRODUCT Vanana rev2 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 10 diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json new file mode 100644 index 0000000000..c7206e9d97 --- /dev/null +++ b/keyboards/delikeeb/vanana/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Vanana rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/delikeeb/waaffle/config.h b/keyboards/delikeeb/waaffle/config.h index 1b02e32c6d..7879dc1b1a 100644 --- a/keyboards/delikeeb/waaffle/config.h +++ b/keyboards/delikeeb/waaffle/config.h @@ -18,7 +18,3 @@ along with this program. If not, see . #pragma once #include "config_common.h" - -#define VENDOR_ID 0x9906 -#define PRODUCT_ID 0x0012 -#define MANUFACTURER dELIKEEb diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 12ff241f4c..d5fdadddea 100644 --- a/keyboards/delikeeb/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT Waaffle_rev3 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index f855f89732..709ceb1844 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "waaffle", + "keyboard_name": "Waaffle rev3", + "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", + "usb": { + "vid": "0x9906", + "pid": "0x0012", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_ortho_5x16": { "layout": diff --git a/keyboards/deltasplit75/info.json b/keyboards/deltasplit75/info.json deleted file mode 100644 index da5e226cb2..0000000000 --- a/keyboards/deltasplit75/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "keyboard_name": "DeltaSplit75", - "maintainer": "xyxjj & itsaferbie", - "layouts": { - "LAYOUT_v2": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Print", "x":14, "y":0}, {"label":"Scroll", "x":15, "y":0}, {"label":"Pause", "x":16, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Back", "x":14, "y":1}, {"label":"Trns", "x":15, "y":1}, {"label":"Home", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"PgUp", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Trns", "x":13.75, "y":3}, {"label":"Enter", "x":14.75, "y":3, "w":1.25}, {"label":"PgDn", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"Trns", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"End", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}] - }, - "LAYOUT_protosplit": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Insert", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"PgUp", "x":16, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Delete", "x":14, "y":1}, {"label":"End", "x":15, "y":1}, {"label":"PgDn", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"Scroll", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":2.25}, {"label":"Pause", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"Print", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}] - } - } -} diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h index ffc2724e5e..64b86371fc 100644 --- a/keyboards/deltasplit75/v2/config.h +++ b/keyboards/deltasplit75/v2/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 0x3060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER xyxjj -#define PRODUCT DeltaSplit75 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 14 diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json new file mode 100644 index 0000000000..f6326d96ca --- /dev/null +++ b/keyboards/deltasplit75/v2/info.json @@ -0,0 +1,18 @@ +{ + "keyboard_name": "DeltaSplit75", + "manufacturer": "xyxjj", + "maintainer": "xyxjj & itsaferbie", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_v2": { + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Print", "x":14, "y":0}, {"label":"Scroll", "x":15, "y":0}, {"label":"Pause", "x":16, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Back", "x":14, "y":1}, {"label":"Trns", "x":15, "y":1}, {"label":"Home", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"PgUp", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Trns", "x":13.75, "y":3}, {"label":"Enter", "x":14.75, "y":3, "w":1.25}, {"label":"PgDn", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"Trns", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"End", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}] + }, + "LAYOUT_protosplit": { + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Insert", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"PgUp", "x":16, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Delete", "x":14, "y":1}, {"label":"End", "x":15, "y":1}, {"label":"PgDn", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"Scroll", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":2.25}, {"label":"Pause", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"Print", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}] + } + } +} diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h index 7bf69a7b63..834554c45a 100644 --- a/keyboards/duck/octagon/v1/config.h +++ b/keyboards/duck/octagon/v1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x444B // Duck ("DK") -#define PRODUCT_ID 0x4F31 // Octagon V1 ("O1") -#define DEVICE_VER 0x0001 -#define MANUFACTURER Duck -#define PRODUCT Octagon V1 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index 1fae48975b..8912165c6d 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Octagon V1", + "manufacturer": "Duck", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x444B", + "pid": "0x4F31", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_75_ansi": { "layout": [ diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h index 0de966c604..57df912112 100644 --- a/keyboards/duck/octagon/v2/config.h +++ b/keyboards/duck/octagon/v2/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x444B // Duck ("DK") -#define PRODUCT_ID 0x4F32 // Octagon V2 ("O2") -#define DEVICE_VER 0x0002 -#define MANUFACTURER Duck -#define PRODUCT Octagon V2 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index 23911f3403..3b9f84417e 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Octagon V2", + "manufacturer": "Duck", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x444B", + "pid": "0x4F32", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] diff --git a/keyboards/duck/orion/info.json b/keyboards/duck/orion/info.json deleted file mode 100644 index 3ba2d3017b..0000000000 --- a/keyboards/duck/orion/info.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "keyboard_name": "Duck Orion V3", - "url": "", - "maintainer": "qmk", - "layouts": { - "LAYOUT_tkl_ansi": { - "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] - } - } -} diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h index bcc5fb0046..477243e495 100644 --- a/keyboards/duck/orion/v3/config.h +++ b/keyboards/duck/orion/v3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x444B // Duck ("DK") -#define PRODUCT_ID 0x4F52 // Orion ("OR") -#define DEVICE_VER 0x0002 -#define MANUFACTURER Duck -#define PRODUCT Orion V3 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json new file mode 100644 index 0000000000..39f0e1e1bd --- /dev/null +++ b/keyboards/duck/orion/v3/info.json @@ -0,0 +1,16 @@ +{ + "keyboard_name": "Orion V3", + "manufacturer": "Duck", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x444B", + "pid": "0x4F52", + "device_version": "0.0.2" + }, + "layouts": { + "LAYOUT_tkl_ansi": { + "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] + } + } +} diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h index 883eff97f4..b51663981d 100644 --- a/keyboards/dumbpad/config.h +++ b/keyboards/dumbpad/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xDEAF -#define PRODUCT_ID 0x0913 -#define MANUFACTURER imchipwood -#define PRODUCT dumbpad - /* Column/Row IO definitions */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dumbpad/info.json b/keyboards/dumbpad/info.json new file mode 100644 index 0000000000..341a1bcf8b --- /dev/null +++ b/keyboards/dumbpad/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "dumbpad", + "manufacturer": "imchipwood", + "url": "https://www.github.com/imchipwood/dumbpad", + "maintainer": "imchipwood", + "usb": { + "vid": "0xDEAF", + "pid": "0x0913" + } +} diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h index 6d503c9abe..954e833f8c 100644 --- a/keyboards/dumbpad/v0x/config.h +++ b/keyboards/dumbpad/v0x/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0007 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json index 01fe1d5178..5e5feb42ba 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v0x", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.0.7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h index 586e55056c..6879d73960 100644 --- a/keyboards/dumbpad/v0x_dualencoder/config.h +++ b/keyboards/dumbpad/v0x_dualencoder/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0006 - /* Column/Row IO definitions - dualencoder version is true 4x4 */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json index f4bf8be585..150a82f373 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v0x_dualencoder", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.0.6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h index 0380203fdf..00498166f3 100644 --- a/keyboards/dumbpad/v0x_right/config.h +++ b/keyboards/dumbpad/v0x_right/config.h @@ -16,9 +16,6 @@ along with this program. If not, see . */ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0007 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json index 7269fe3d08..657a85542d 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v0x_right", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.0.7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json index d8cd5b2304..6355245982 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v1x", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h index 13f4785d8a..6484a5e42c 100644 --- a/keyboards/dumbpad/v1x_dualencoder/config.h +++ b/keyboards/dumbpad/v1x_dualencoder/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json index 42eb5a3e77..6355245982 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v1x_dualencoder", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h index 2f7963b875..2dba0c3b14 100644 --- a/keyboards/dumbpad/v1x_oled/config.h +++ b/keyboards/dumbpad/v1x_oled/config.h @@ -15,11 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define MANUFACTURER imchipwood -#define PRODUCT dumbpad - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json index dae417e88f..d124c76e14 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/info.json @@ -1,8 +1,7 @@ { - "keyboard_name": "dumbpad", - "keyboard_folder": "dumbpad", - "url": "https://www.github.com/keebd/dumbpad", - "maintainer": "keebd", + "usb": { + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h index 23c2685dde..bb0b42ebdc 100644 --- a/keyboards/dumbpad/v1x_right/config.h +++ b/keyboards/dumbpad/v1x_right/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json index 05734d16b0..44b7abacff 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v1x_right", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h index 28a506cf8d..bfb3f2ba9d 100644 --- a/keyboards/durgod/dgk6x/config.h +++ b/keyboards/durgod/dgk6x/config.h @@ -18,10 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xD60D -#define MANUFACTURER Hoksi Technology - #define WAIT_US_TIMER GPTD3 /* COL2ROW, ROW2COL*/ diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h index e8108f7d11..7da032b967 100644 --- a/keyboards/durgod/dgk6x/galaxy/config.h +++ b/keyboards/durgod/dgk6x/galaxy/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID