diff options
121 files changed, 354 insertions, 517 deletions
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 <http://www.gnu.org/licenses/>. #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/rev2/info.json b/keyboards/dailycraft/bat43/info.json index 352d9a6beb..ce05fe8a5a 100644 --- a/keyboards/dailycraft/bat43/rev2/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "bat43", + "manufacturer": "yfuku", "url": "", "maintainer": "yfuku", + "usb": { + "vid": "0x5946", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ 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/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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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/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 <http://www.gnu.org/licenses/>. #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/info.json b/keyboards/deltasplit75/v2/info.json index da5e226cb2..f6326d96ca 100644 --- a/keyboards/deltasplit75/info.json +++ b/keyboards/deltasplit75/v2/info.json @@ -1,6 +1,12 @@ { "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}] 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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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/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 <http://www.gnu.org/licenses/>. #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/info.json b/keyboards/duck/orion/v3/info.json index 3ba2d3017b..39f0e1e1bd 100644 --- a/keyboards/duck/orion/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Duck Orion V3", + "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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. */ #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 0x6A1A -#define DEVICE_VER 0x0001 -#define PRODUCT Galaxy 84 HK gaming x DURGOD (QMK) - /* key matrix rows */ #define MATRIX_ROWS 6 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 } diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json index 6fc8959d0b..221d6613aa 100644 --- a/keyboards/durgod/dgk6x/galaxy/info.json +++ b/keyboards/durgod/dgk6x/galaxy/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Galaxy", + "keyboard_name": "Galaxy 84 HK gaming x DURGOD (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.amazon.com/Galaxy-75-Modular-Mechanical-Keyboard/dp/B08PDRD8MP", "maintainer": "dkjer", + "usb": { + "vid": "0xD60D", + "pid": "0x6A1A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_75_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h index c148ae1b1f..a2bba0a5a5 100644 --- a/keyboards/durgod/dgk6x/hades/config.h +++ b/keyboards/durgod/dgk6x/hades/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x4AD3 -#define DEVICE_VER 0x0001 -#define PRODUCT DURGOD Hades (QMK) - /* key matrix rows */ #define MATRIX_ROWS 5 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json index b439ea4acb..345b26adcd 100644 --- a/keyboards/durgod/dgk6x/hades/info.json +++ b/keyboards/durgod/dgk6x/hades/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Hades", + "keyboard_name": "DURGOD Hades (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.amazon.com/gp/product/B08562392T", "maintainer": "J-Sully", + "usb": { + "vid": "0xD60D", + "pid": "0x4AD3", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h index 3bef1ea7ed..207508dead 100644 --- a/keyboards/durgod/dgk6x/venus/config.h +++ b/keyboards/durgod/dgk6x/venus/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x7EC5 -#define DEVICE_VER 0x0001 -#define PRODUCT DURGOD Venus (QMK) - /* key matrix rows */ #define MATRIX_ROWS 5 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json index 21e93d55c2..a2d297d661 100644 --- a/keyboards/durgod/dgk6x/venus/info.json +++ b/keyboards/durgod/dgk6x/venus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Venus", + "keyboard_name": "DURGOD Venus (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.amazon.com/dp/B07XFP5MMZ", "maintainer": "J-Sully", + "usb": { + "vid": "0xD60D", + "pid": "0x7EC5", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k3x0/config.h index 691076ecac..0f2e01cfc1 100644 --- a/keyboards/durgod/k3x0/config.h +++ b/keyboards/durgod/k3x0/config.h @@ -19,10 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xD60D -#define MANUFACTURER Hoksi Technology - #define WAIT_US_TIMER GPTD3 /* key matrix size (rows in specific keyboard variant) */ diff --git a/keyboards/durgod/k3x0/k310/base/config.h b/keyboards/durgod/k3x0/k310/base/config.h index 025369acd7..2ccb2f2f0c 100644 --- a/keyboards/durgod/k3x0/k310/base/config.h +++ b/keyboards/durgod/k3x0/k310/base/config.h @@ -17,7 +17,3 @@ #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define PRODUCT DURGOD Taurus K310 (QMK) -#define DEVICE_VER 0x0001 // Base (no backlight) diff --git a/keyboards/durgod/k3x0/k310/config.h b/keyboards/durgod/k3x0/k310/config.h index 1eadb8e52d..cb936a201f 100644 --- a/keyboards/durgod/k3x0/k310/config.h +++ b/keyboards/durgod/k3x0/k310/config.h @@ -19,14 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x3100 -// Taurus K310 models: -//#define DEVICE_VER 0x0001 // Base (no backlight) -//#define DEVICE_VER 0x0002 // Corona (white led matrix) -//#define DEVICE_VER 0x0003 // Aurora (red & blue led matrix) -//#define DEVICE_VER 0x0004 // Nebula (rgb led matrix) - /* key matrix size (cols in generic keyboard config) */ #define MATRIX_ROWS 8 diff --git a/keyboards/durgod/k3x0/k310/info.json b/keyboards/durgod/k3x0/k310/info.json index bf960ebd94..06e935484e 100644 --- a/keyboards/durgod/k3x0/k310/info.json +++ b/keyboards/durgod/k3x0/k310/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Taurus K310", + "keyboard_name": "DURGOD Taurus K310 (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.durgod.com/page9?product_id=53&_l=en", "maintainer": "tylert", + "usb": { + "vid": "0xD60D", + "pid": "0x3100", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ diff --git a/keyboards/durgod/k3x0/k320/base/config.h b/keyboards/durgod/k3x0/k320/base/config.h index d4eb732b90..2ccb2f2f0c 100644 --- a/keyboards/durgod/k3x0/k320/base/config.h +++ b/keyboards/durgod/k3x0/k320/base/config.h @@ -17,7 +17,3 @@ #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define PRODUCT DURGOD Taurus K320 (QMK) -#define DEVICE_VER 0x0001 // Base (no backlight) diff --git a/keyboards/durgod/k3x0/k320/config.h b/keyboards/durgod/k3x0/k320/config.h index 25b4c63036..2ea9b37fdf 100644 --- a/keyboards/durgod/k3x0/k320/config.h +++ b/keyboards/durgod/k3x0/k320/config.h @@ -19,14 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x3200 -// Taurus K320 models: -//#define DEVICE_VER 0x0001 // Base (no backlight) -//#define DEVICE_VER 0x0002 // Corona (white led matrix) -//#define DEVICE_VER 0x0003 // Aurora (red & blue led matrix) -//#define DEVICE_VER 0x0004 // Nebula (rgb led matrix) - /* key matrix size (cols in generic keyboard config) */ #define MATRIX_ROWS 7 diff --git a/keyboards/durgod/k3x0/k320/info.json b/keyboards/durgod/k3x0/k320/info.json index cc0da77a3f..0386ef7709 100644 --- a/keyboards/durgod/k3x0/k320/info.json +++ b/keyboards/durgod/k3x0/k320/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Taurus K320", + "keyboard_name": "DURGOD Taurus K320 (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.durgod.com/page9?product_id=47&_l=en", "maintainer": "dkjer", + "usb": { + "vid": "0xD60D", + "pid": "0x3200", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json index 5cbce57165..d5179aa09f 100644 --- a/keyboards/dztech/dz60rgb/info.json +++ b/keyboards/dztech/dz60rgb/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "DZ60RGB", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h index 7bdad00144..69d4ac0b90 100644 --- a/keyboards/dztech/dz60rgb/v1/config.h +++ b/keyboards/dztech/dz60rgb/v1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1120 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json new file mode 100644 index 0000000000..914ae82cd9 --- /dev/null +++ b/keyboards/dztech/dz60rgb/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1120", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h index 9426a7be99..1beccc5c08 100644 --- a/keyboards/dztech/dz60rgb/v2/config.h +++ b/keyboards/dztech/dz60rgb/v2/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1121 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json new file mode 100644 index 0000000000..172ca21102 --- /dev/null +++ b/keyboards/dztech/dz60rgb/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1121", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h index 7e5dfd6703..f1fddcb2e9 100644 --- a/keyboards/dztech/dz60rgb/v2_1/config.h +++ b/keyboards/dztech/dz60rgb/v2_1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1121 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json new file mode 100644 index 0000000000..7b2073bd4a --- /dev/null +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1121", + "device_version": "2.1.0" + } +} diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json index 8431f17708..31c04c9599 100644 --- a/keyboards/dztech/dz60rgb_ansi/info.json +++ b/keyboards/dztech/dz60rgb_ansi/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz60rgb_ansi", + "keyboard_name": "DZ60RGB_ANSI", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h index ccfe91b66b..518a3d7d4e 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1220 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_ANSI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json new file mode 100644 index 0000000000..6fcbd0806f --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1220", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h index 865ac2ab21..9efc5b75d3 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1221 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_ANSI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json new file mode 100644 index 0000000000..6d2ac4fbab --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1221", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h index 64e2a40bda..e08286cd64 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1221 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_ANSI - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json new file mode 100644 index 0000000000..f2afc157ed --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1221", + "device_version": "2.1.0" + } +} diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json index 304c571f22..e5d0b7b962 100644 --- a/keyboards/dztech/dz60rgb_wkl/info.json +++ b/keyboards/dztech/dz60rgb_wkl/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz60rgb_wkl", + "keyboard_name": "DZ60RGB_WKL", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h index 9af78167ad..4a341e9df9 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1320 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_WKL - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json new file mode 100644 index 0000000000..767be04f31 --- /dev/null +++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1320", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h index 140d74fee0..bd4ca27e24 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h @@ -1,12 +1,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1321 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_WKL - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json new file mode 100644 index 0000000000..ee69be3b5a --- /dev/null +++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1321", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h index 3ab221391e..1088863891 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1321 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ60RGB_WKL - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json new file mode 100644 index 0000000000..3b2b23e989 --- /dev/null +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1321", + "device_version": "2.1.0" + } +} diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json index 4a97f4fd82..32171cd74a 100644 --- a/keyboards/dztech/dz65rgb/info.json +++ b/keyboards/dztech/dz65rgb/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "dz65rgb", + "keyboard_name": "DZ65RGB", + "manufacturer": "DZTECH", "url": "", "maintainer": "dztech", + "usb": { + "vid": "0x445A" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h index d281eaa51e..0ae5173051 100644 --- a/keyboards/dztech/dz65rgb/v1/config.h +++ b/keyboards/dztech/dz65rgb/v1/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1420 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json new file mode 100644 index 0000000000..752d361728 --- /dev/null +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1420", + "device_version": "1.0.0" + } +} diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h index 5267f42aa2..d2dec023ef 100644 --- a/keyboards/dztech/dz65rgb/v2/config.h +++ b/keyboards/dztech/dz65rgb/v2/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1421 -#define DEVICE_VER 0x0002 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json new file mode 100644 index 0000000000..1cfb5abdbb --- /dev/null +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1421", + "device_version": "2.0.0" + } +} diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h index 6c21fa22c2..87c6555e49 100755 --- a/keyboards/dztech/dz65rgb/v3/config.h +++ b/keyboards/dztech/dz65rgb/v3/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x445A -#define PRODUCT_ID 0x1424 -#define DEVICE_VER 0x0003 -#define MANUFACTURER DZTECH -#define PRODUCT DZ65RGBV3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json new file mode 100644 index 0000000000..f2c2236031 --- /dev/null +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x1424", + "device_version": "3.0.0" + } +} diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index 5c4466985c..5717389e7a 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/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 0x1337 -#define PRODUCT_ID 0x6006 -#define MANUFACTURER Bishop Keyboards -#define PRODUCT The ECO Keyboard - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 2553371de2..36710f9996 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "ECO", + "keyboard_name": "The ECO Keyboard", + "manufacturer": "Bishop Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x1337", + "pid": "0x6006" + }, "layouts": { "LAYOUT": { "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}] diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h index 65cb050d6c..65da0c2b31 100644 --- a/keyboards/eco/rev1/config.h +++ b/keyboards/eco/rev1/config.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "../config.h" -#define DEVICE_VER 0x0001 - /* ECO V1 pin-out */ #define MATRIX_ROW_PINS { B1, B6, B2, B3 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 } diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/eco/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h index bbc0492e06..f711066a3f 100644 --- a/keyboards/eco/rev2/config.h +++ b/keyboards/eco/rev2/config.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "../config.h" -#define DEVICE_VER 0x0002 - /* ECO V2.1 pin-out */ #define MATRIX_ROW_PINS { D7, B5, B4, E6 } #define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 } diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/eco/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h index be136fe9c9..f8b981ab29 100644 --- a/keyboards/edi/hardlight/mk1/config.h +++ b/keyboards/edi/hardlight/mk1/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 0xF7E0 -#define PRODUCT_ID 0x2401 -#define DEVICE_VER 0x0000 -#define MANUFACTURER Everywhere Defense Industries -#define PRODUCT Hard Light - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json new file mode 100644 index 0000000000..f0ff1b915f --- /dev/null +++ b/keyboards/edi/hardlight/mk1/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Hard Light", + "manufacturer": "Everywhere Defense Industries", + "usb": { + "vid": "0xF7E0", + "pid": "0x2401", + "device_version": "0.0.1" + } +} diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 8580aabec5..2cf9ab9af9 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF7E0 -#define PRODUCT_ID 0x2408 -#define DEVICE_VER 0x0007 -#define MANUFACTURER Everywhere Defense Industries -#define PRODUCT Hard Light Mk 2 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json new file mode 100644 index 0000000000..25e9b06d49 --- /dev/null +++ b/keyboards/edi/hardlight/mk2/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Hard Light Mk 2", + "manufacturer": "Everywhere Defense Industries", + "usb": { + "vid": "0xF7E0", + "pid": "0x2408", + "device_version": "0.0.7" + } +} diff --git a/keyboards/ergodox_ez/base/info.json b/keyboards/ergodox_ez/base/info.json new file mode 100644 index 0000000000..be1433ccba --- /dev/null +++ b/keyboards/ergodox_ez/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "ErgoDox EZ", + "usb": { + "pid": "0x4974" + } +} diff --git a/keyboards/ergodox_ez/base/rules.mk b/keyboards/ergodox_ez/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/ergodox_ez/base/rules.mk diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index f25ff162cd..8a3f4eb7dc 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -22,13 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3297 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ZSA Technology Labs -#define PRODUCT_ID 0x4974 -#define PRODUCT ErgoDox EZ - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/ergodox_ez/glow/config.h b/keyboards/ergodox_ez/glow/config.h deleted file mode 100644 index 674b7bffb0..0000000000 --- a/keyboards/ergodox_ez/glow/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> -Copyright 2015 ZSA Technology Labs Inc (@zsa) -Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0x4976 -#undef PRODUCT -#define PRODUCT ErgoDox EZ Glow diff --git a/keyboards/ergodox_ez/glow/info.json b/keyboards/ergodox_ez/glow/info.json new file mode 100644 index 0000000000..dcbb1999ca --- /dev/null +++ b/keyboards/ergodox_ez/glow/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "ErgoDox EZ Glow", + "usb": { + "pid": "0x4976" + } +} diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index 1682f4bb45..46a0fbbacd 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "ErgoDox EZ", + "manufacturer": "ZSA Technology Labs", "url": "ergodox-ez.com", "maintainer": "ZSA via Drashna", + "usb": { + "vid": "0x3297", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index 1b4ace5ee5..021ea0f130 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -38,3 +38,5 @@ AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no MOUSE_SHARED_EP = no + +DEFAULT_FOLDER = ergodox_ez/base diff --git a/keyboards/ergodox_ez/shine/config.h b/keyboards/ergodox_ez/shine/config.h deleted file mode 100644 index cf4f59f3b8..0000000000 --- a/keyboards/ergodox_ez/shine/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> -Copyright 2015 ZSA Technology Labs Inc (@zsa) -Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0x4975 -#undef PRODUCT -#define PRODUCT ErgoDox EZ Shine diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json new file mode 100644 index 0000000000..11c3a8b209 --- /dev/null +++ b/keyboards/ergodox_ez/shine/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "ErgoDox EZ Shine", + "usb": { + "pid": "0x4975" + } +} diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h index b754a7810c..7bb092834b 100644 --- a/keyboards/ergoslab/rev1/config.h +++ b/keyboards/ergoslab/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x5148 -#define DEVICE_VER 0x0100 -#define MANUFACTURER tomsaleeba -#define PRODUCT Ergoslab Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/rev1/info.json index e37a3b7cbf..38530960a5 100644 --- a/keyboards/ergoslab/info.json +++ b/keyboards/ergoslab/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ergoslab", + "keyboard_name": "Ergoslab Keyboard", + "manufacturer": "tomsaleeba", "url": "https://github.com/tomsaleeba/ergoslab", "maintainer": "tomsaleeba", + "usb": { + "vid": "0xFEED", + "pid": "0x5148", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ergoslab": { "layout": [ diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h index 096a85d370..3703884c67 100644 --- a/keyboards/ergotravel/rev1/config.h +++ b/keyboards/ergotravel/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4A50 //JP -#define PRODUCT_ID 0x4554 //ET -#define DEVICE_VER 0x0100 -#define MANUFACTURER JPConstantineau.com -#define PRODUCT ErgoTravel Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/ergotravel/info.json b/keyboards/ergotravel/rev1/info.json index 71e9cf7f4f..5170788eba 100644 --- a/keyboards/ergotravel/info.json +++ b/keyboards/ergotravel/rev1/info.json @@ -1,8 +1,13 @@ { - "keyboard_name": "ErgoTravel", - "identifier": "0x1256", + "keyboard_name": "ErgoTravel Keyboard", + "manufacturer": "JPConstantineau.com", "url": "https://github.com/jpconstantineau/ErgoTravel", "maintainer": "qmk", + "usb": { + "vid": "0x4A50", + "pid": "0x4554", + "device_version": "1.0.0" + }, "bootloader": "caterina", "processor": "atmega32u4", "layouts": { diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h index 72abf556d4..cf885d8474 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/config.h +++ b/keyboards/ericrlau/numdiscipline/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x454C // EL -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ELau -#define PRODUCT NumDiscipline - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/ericrlau/numdiscipline/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json index 202aceda76..cdaa9be039 100644 --- a/keyboards/ericrlau/numdiscipline/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ELau NumDiscipline KB", + "keyboard_name": "NumDiscipline", + "manufacturer": "ELau", "url": "https://github.com/ericrlau/NumDiscipline", "maintainer": "ericrlau", + "usb": { + "vid": "0x454C", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "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":"BackSpace", "x":13, "y":0, "w":2}, {"label":"Del", "x":15.5, "y":0}, {"label":"", "x":16.5, "y":0}, {"label":"", "x":17.5, "y":0}, {"label":"", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1, "h":2}, {"label":"CapsLock", "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":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"Left Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Right Shift", "x":12.25, "y":3, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14.25, "y":3.25}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3, "h":2}, {"label":"Left Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Left Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":6.25}, {"label":"Right Alt", "x":10, "y":4}, {"label":"Right Ctrl", "x":11, "y":4}, {"label":"Func", "x":12, "y":4}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13.25, "y":4.25}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14.25, "y":4.25}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15.25, "y":4.25}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}] diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h index 2683403204..a8be81e784 100644 --- a/keyboards/exclusive/e85/config.h +++ b/keyboards/exclusive/e85/config.h @@ -19,11 +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 0x4558 // EX -#define DEVICE_VER 0x0001 -#define MANUFACTURER Exclusive - /* key matrix size */ #define MATRIX_ROWS 11 #define MATRIX_COLS 9 diff --git a/keyboards/exclusive/e85/hotswap/config.h b/keyboards/exclusive/e85/hotswap/config.h deleted file mode 100644 index a0f957db87..0000000000 --- a/keyboards/exclusive/e85/hotswap/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#define PRODUCT_ID 0xE851 // E8.5 Hotswap -#define PRODUCT E8.5 Hotswap PCB diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json index e8c65f32d2..53ca1e3759 100644 --- a/keyboards/exclusive/e85/hotswap/info.json +++ b/keyboards/exclusive/e85/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Exclusive E8.5 TKL", + "keyboard_name": "E8.5 Hotswap", + "manufacturer": "Exclusive", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4558", + "pid": "0xE851", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi_standard": { "layout": [ diff --git a/keyboards/exclusive/e85/soldered/config.h b/keyboards/exclusive/e85/soldered/config.h deleted file mode 100644 index c76fcf8074..0000000000 --- a/keyboards/exclusive/e85/soldered/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#define PRODUCT_ID 0xE852 // E8.5 Soldered -#define PRODUCT E8.5 Soldered PCB diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json index fa4be15647..937c2ad245 100644 --- a/keyboards/exclusive/e85/soldered/info.json +++ b/keyboards/exclusive/e85/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Exclusive E8.5 TKL", + "keyboard_name": "E8.5 Soldered", + "manufacturer": "Exclusive", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4558", + "pid": "0xE852", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |