From 1c6b0391b4685a2d6e9b8ad9fc3a88c5ad5ea31c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 30 Jul 2022 17:23:55 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven: E (#17815) --- keyboards/e88/config.h | 7 ------- keyboards/e88/info.json | 6 ++++++ keyboards/ealdin/quadrant/config.h | 6 ------ keyboards/ealdin/quadrant/info.json | 6 ++++++ keyboards/earth_rover/config.h | 7 ------- keyboards/earth_rover/info.json | 6 ++++++ keyboards/eason/capsule65/config.h | 7 ------- keyboards/eason/capsule65/info.json | 8 +++++++- keyboards/ebastler/e80_1800/config.h | 7 ------- keyboards/ebastler/e80_1800/info.json | 6 ++++++ keyboards/ebastler/isometria_75/rev1/config.h | 7 ------- keyboards/ebastler/isometria_75/rev1/info.json | 8 +++++++- keyboards/edc40/config.h | 7 ------- keyboards/edc40/info.json | 6 ++++++ keyboards/edda/config.h | 7 ------- keyboards/edda/info.json | 6 ++++++ keyboards/edi/standaside/config.h | 7 ------- keyboards/edi/standaside/info.json | 6 ++++++ keyboards/eek/config.h | 7 ------- keyboards/eek/info.json | 6 ++++++ keyboards/efreet/config.h | 7 ------- keyboards/efreet/info.json | 8 +++++++- keyboards/ein_60/config.h | 7 ------- keyboards/ein_60/info.json | 6 ++++++ keyboards/ekow/akira/config.h | 7 ------- keyboards/ekow/akira/info.json | 8 +++++++- keyboards/elephant42/config.h | 7 ------- keyboards/elephant42/info.json | 6 ++++++ keyboards/emajesty/eiri/config.h | 7 ------- keyboards/emajesty/eiri/info.json | 6 ++++++ keyboards/emery65/config.h | 7 ------- keyboards/emery65/info.json | 6 ++++++ keyboards/emi20/config.h | 7 ------- keyboards/emi20/info.json | 6 ++++++ keyboards/emptystring/NQG/config.h | 7 ------- keyboards/emptystring/NQG/info.json | 8 +++++++- keyboards/eniigmakeyboards/ek60/config.h | 7 ------- keyboards/eniigmakeyboards/ek60/info.json | 8 +++++++- keyboards/eniigmakeyboards/ek65/config.h | 7 ------- keyboards/eniigmakeyboards/ek65/info.json | 8 +++++++- keyboards/eniigmakeyboards/ek87/config.h | 7 ------- keyboards/eniigmakeyboards/ek87/info.json | 8 +++++++- keyboards/ep/40/config.h | 7 ------- keyboards/ep/40/info.json | 6 ++++++ keyboards/ep/96/config.h | 7 ------- keyboards/ep/96/info.json | 6 ++++++ keyboards/ep/comsn/hs68/config.h | 7 ------- keyboards/ep/comsn/hs68/info.json | 6 ++++++ keyboards/ep/comsn/mollydooker/config.h | 7 ------- keyboards/ep/comsn/mollydooker/info.json | 6 ++++++ keyboards/ep/comsn/tf_longeboye/config.h | 7 ------- keyboards/ep/comsn/tf_longeboye/info.json | 8 +++++++- keyboards/epoch80/config.h | 7 ------- keyboards/epoch80/info.json | 6 ++++++ keyboards/ergodox_stm32/config.h | 6 ------ keyboards/ergodox_stm32/info.json | 6 ++++++ keyboards/esca/getawayvan/config.h | 8 -------- keyboards/esca/getawayvan/info.json | 6 ++++++ keyboards/esca/getawayvan_f042/config.h | 7 ------- keyboards/esca/getawayvan_f042/info.json | 6 ++++++ keyboards/eternal_keypad/config.h | 7 ------- keyboards/eternal_keypad/info.json | 6 ++++++ keyboards/eu_isolation/config.h | 7 ------- keyboards/eu_isolation/info.json | 8 +++++++- keyboards/evancookaudio/sleepingdinosaur/config.h | 7 ------- keyboards/evancookaudio/sleepingdinosaur/info.json | 8 +++++++- keyboards/evancookaudio/tenpad/config.h | 7 ------- keyboards/evancookaudio/tenpad/info.json | 8 +++++++- keyboards/eve/meteor/config.h | 6 ------ keyboards/eve/meteor/info.json | 8 +++++++- keyboards/evil80/config.h | 7 ------- keyboards/evil80/info.json | 6 ++++++ keyboards/evolv/config.h | 7 ------- keyboards/evolv/info.json | 6 ++++++ keyboards/evyd13/atom47/rev2/config.h | 7 ------- keyboards/evyd13/atom47/rev2/info.json | 6 ++++++ keyboards/evyd13/atom47/rev3/config.h | 7 ------- keyboards/evyd13/atom47/rev3/info.json | 6 ++++++ keyboards/evyd13/atom47/rev4/config.h | 7 ------- keyboards/evyd13/atom47/rev4/info.json | 6 ++++++ keyboards/evyd13/atom47/rev5/config.h | 7 ------- keyboards/evyd13/atom47/rev5/info.json | 6 ++++++ keyboards/evyd13/eon40/config.h | 7 ------- keyboards/evyd13/eon40/info.json | 6 ++++++ keyboards/evyd13/eon65/config.h | 7 ------- keyboards/evyd13/eon65/info.json | 6 ++++++ keyboards/evyd13/eon75/config.h | 7 ------- keyboards/evyd13/eon75/info.json | 6 ++++++ keyboards/evyd13/eon87/config.h | 7 ------- keyboards/evyd13/eon87/info.json | 6 ++++++ keyboards/evyd13/eon95/config.h | 7 ------- keyboards/evyd13/eon95/info.json | 6 ++++++ keyboards/evyd13/gh80_1800/config.h | 7 ------- keyboards/evyd13/gh80_1800/info.json | 6 ++++++ keyboards/evyd13/gh80_3700/config.h | 7 ------- keyboards/evyd13/gh80_3700/info.json | 6 ++++++ keyboards/evyd13/gud70/config.h | 7 ------- keyboards/evyd13/gud70/info.json | 6 ++++++ keyboards/evyd13/minitomic/config.h | 7 ------- keyboards/evyd13/minitomic/info.json | 6 ++++++ keyboards/evyd13/mx5160/config.h | 7 ------- keyboards/evyd13/mx5160/info.json | 8 +++++++- keyboards/evyd13/nt660/config.h | 7 ------- keyboards/evyd13/nt660/info.json | 6 ++++++ keyboards/evyd13/nt750/config.h | 7 ------- keyboards/evyd13/nt750/info.json | 6 ++++++ keyboards/evyd13/nt980/config.h | 7 ------- keyboards/evyd13/nt980/info.json | 8 +++++++- keyboards/evyd13/omrontkl/config.h | 7 ------- keyboards/evyd13/omrontkl/info.json | 6 ++++++ keyboards/evyd13/plain60/config.h | 7 ------- keyboards/evyd13/plain60/info.json | 6 ++++++ keyboards/evyd13/pockettype/config.h | 7 ------- keyboards/evyd13/pockettype/info.json | 6 ++++++ keyboards/evyd13/quackfire/config.h | 7 ------- keyboards/evyd13/quackfire/info.json | 6 ++++++ keyboards/evyd13/solheim68/config.h | 7 ------- keyboards/evyd13/solheim68/info.json | 6 ++++++ keyboards/evyd13/ta65/config.h | 7 ------- keyboards/evyd13/ta65/info.json | 8 +++++++- keyboards/evyd13/wasdat_code/config.h | 7 ------- keyboards/evyd13/wasdat_code/info.json | 6 ++++++ keyboards/evyd13/wonderland/config.h | 7 ------- keyboards/evyd13/wonderland/info.json | 6 ++++++ keyboards/exclusive/e65/config.h | 7 ------- keyboards/exclusive/e65/info.json | 6 ++++++ keyboards/exclusive/e6_rgb/config.h | 7 ------- keyboards/exclusive/e6_rgb/info.json | 8 +++++++- keyboards/exclusive/e6v2/le/config.h | 7 ------- keyboards/exclusive/e6v2/le/info.json | 6 ++++++ keyboards/exclusive/e6v2/le_bmc/config.h | 7 ------- keyboards/exclusive/e6v2/le_bmc/info.json | 7 +++++++ keyboards/exclusive/e6v2/oe/config.h | 7 ------- keyboards/exclusive/e6v2/oe/info.json | 6 ++++++ keyboards/exclusive/e6v2/oe_bmc/config.h | 7 ------- keyboards/exclusive/e6v2/oe_bmc/info.json | 7 +++++++ keyboards/exclusive/e7v1/config.h | 7 ------- keyboards/exclusive/e7v1/info.json | 6 ++++++ keyboards/exclusive/e7v1se/config.h | 7 ------- keyboards/exclusive/e7v1se/info.json | 8 +++++++- keyboards/exent/config.h | 7 ------- keyboards/exent/info.json | 6 ++++++ keyboards/eyeohdesigns/babyv/config.h | 7 ------- keyboards/eyeohdesigns/babyv/info.json | 6 ++++++ keyboards/eyeohdesigns/sprh/config.h | 7 ------- keyboards/eyeohdesigns/sprh/info.json | 6 ++++++ keyboards/eyeohdesigns/theboulevard/config.h | 7 ------- keyboards/eyeohdesigns/theboulevard/info.json | 6 ++++++ 148 files changed, 464 insertions(+), 534 deletions(-) diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h index e83dfb9b068..89bbbd1d602 100644 --- a/keyboards/e88/config.h +++ b/keyboards/e88/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x0187 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Pink Labs -#define PRODUCT e88 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/e88/info.json b/keyboards/e88/info.json index ed240910ea9..3f2bd18f29f 100644 --- a/keyboards/e88/info.json +++ b/keyboards/e88/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "e88", + "manufacturer": "Pink Labs", "url": "", "maintainer": "2-n", + "usb": { + "vid": "0x4705", + "pid": "0x0187", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h index b37af15ea6c..f78db423ea1 100644 --- a/keyboards/ealdin/quadrant/config.h +++ b/keyboards/ealdin/quadrant/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0192 // Ealdin Keyboards "ƒ" -#define PRODUCT_ID 0x5154 // Quadrant "QT" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ealdin -#define PRODUCT Quadrant E-C /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json index e9e02e3d679..09a258a601e 100644 --- a/keyboards/ealdin/quadrant/info.json +++ b/keyboards/ealdin/quadrant/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Quadrant E-C", + "manufacturer": "Ealdin", "url": "https://github.com/Ealdin/keyboards/tree/master/Quadrant", "maintainer": "Ealdin Keyboards", + "usb": { + "vid": "0x0192", + "pid": "0x5154", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x14": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h index 2e7ceda4e1c..9fbc8c13da4 100644 --- a/keyboards/earth_rover/config.h +++ b/keyboards/earth_rover/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 0xEE11 -#define DEVICE_VER 0x0001 -#define MANUFACTURER k.bigwheel -#define PRODUCT earth_rover - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json index 59249b819e0..8a6ab27b359 100644 --- a/keyboards/earth_rover/info.json +++ b/keyboards/earth_rover/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "earth_rover", + "manufacturer": "k.bigwheel", "url": "https://github.com/bigwheel/earth_rover", "maintainer": "k.bigwheel", + "usb": { + "vid": "0xFEED", + "pid": "0xEE11", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h index 34efb3f2a55..fb65c421f1c 100644 --- a/keyboards/eason/capsule65/config.h +++ b/keyboards/eason/capsule65/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF21E -#define PRODUCT_ID 0x6E6E -#define DEVICE_VER 0x0001 -#define MANUFACTURER eason -#define PRODUCT capsule65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json index cd091b550f9..9af7b497782 100644 --- a/keyboards/eason/capsule65/info.json +++ b/keyboards/eason/capsule65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "CAPSULE65", + "keyboard_name": "capsule65", + "manufacturer": "eason", "url": "", "maintainer": "EasonQian1", + "usb": { + "vid": "0xF21E", + "pid": "0x6E6E", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/ebastler/e80_1800/config.h b/keyboards/ebastler/e80_1800/config.h index 968c7a1fc7c..c21285483ce 100644 --- a/keyboards/ebastler/e80_1800/config.h +++ b/keyboards/ebastler/e80_1800/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6562 // "eb" -#define PRODUCT_ID 0x1338 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ebastler -#define PRODUCT E80-1800 - /* Limit layer count to fit in storage with VIA enabled */ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/info.json index 503cafaa3d6..8680f212d55 100644 --- a/keyboards/ebastler/e80_1800/info.json +++ b/keyboards/ebastler/e80_1800/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "E80_1800", + "manufacturer": "ebastler", "url": "https://github.com/ebastler/E80-1800", "maintainer": "ebastler", + "usb": { + "vid": "0x6562", + "pid": "0x1338", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_1800_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"PgUp", "x":17.5, "y":0}, {"label":"PrtSc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"Scroll Lock", "x":18.5, "y":1}, {"label":"\u00ac", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"\"", "x":2, "y":2}, {"label":"\u00a7", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"&", "x":6, "y":2}, {"label":"/", "x":7, "y":2}, {"label":"(", "x":8, "y":2}, {"label":")", "x":9, "y":2}, {"label":"=", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"`", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2, "w":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"Pause", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"-", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"@", "x":11.75, "y":4}, {"label":"~", "x":12.75, "y":4}, {"label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"label":"+", "x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":1.25}, {"label":"|", "x":1.25, "y":5}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"up", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"AltGr", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"left", "x":13.25, "y":6.25}, {"label":"down", "x":14.25, "y":6.25}, {"label":"right", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}] diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h index 038fa18ac1c..787d33e16d2 100644 --- a/keyboards/ebastler/isometria_75/rev1/config.h +++ b/keyboards/ebastler/isometria_75/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 0x6562 // "eb" -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ebastler -#define PRODUCT isometria 75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json index cbca4c40ff5..ffc847a1d4b 100644 --- a/keyboards/ebastler/isometria_75/rev1/info.json +++ b/keyboards/ebastler/isometria_75/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "isometria_75", + "keyboard_name": "isometria 75", + "manufacturer": "ebastler", "url": "https://github.com/ebastler/isometria-75", "maintainer": "ebastler", + "usb": { + "vid": "0x6562", + "pid": "0x1337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_iso": { "layout": [ diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h index be6cba5138f..8e47136e6be 100644 --- a/keyboards/edc40/config.h +++ b/keyboards/edc40/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F4A // "OJ" -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER OJ -#define PRODUCT edc40 - #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json index ae66ec22976..43b79f6a903 100644 --- a/keyboards/edc40/info.json +++ b/keyboards/edc40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "edc40", + "manufacturer": "OJ", "url": "", "maintainer": "ojthetiny", + "usb": { + "vid": "0x4F4A", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/edda/config.h b/keyboards/edda/config.h index bd9a0ab77d5..33030c2fb65 100644 --- a/keyboards/edda/config.h +++ b/keyboards/edda/config.h @@ -15,13 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D45 -#define PRODUCT_ID 0x4544 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mekanisk -#define PRODUCT Edda PCB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json index 2945b2b22d2..c9cdd45dbe5 100644 --- a/keyboards/edda/info.json +++ b/keyboards/edda/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Edda", + "manufacturer": "Mekanisk", "url": "https://mekanisk.com", "maintainer": "qmk", + "usb": { + "vid": "0x4D45", + "pid": "0x4544", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h index c72c915d82a..83cc9f3eef8 100644 --- a/keyboards/edi/standaside/config.h +++ b/keyboards/edi/standaside/config.h @@ -4,13 +4,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF7E0 -#define PRODUCT_ID 0x0412 -#define DEVICE_VER 0x0003 -#define MANUFACTURER Fate Everywhere -#define PRODUCT Stand Aside - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json index 797a3419b74..464b5b1c84c 100644 --- a/keyboards/edi/standaside/info.json +++ b/keyboards/edi/standaside/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Stand Aside", + "manufacturer": "Fate Everywhere", "url": "", "maintainer": "fateeverywhere", + "usb": { + "vid": "0xF7E0", + "pid": "0x0412", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_ortho_4x16": { "layout": [ diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h index 919c112722c..a9d3d5e75b6 100644 --- a/keyboards/eek/config.h +++ b/keyboards/eek/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4A53 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0004 -#define MANUFACTURER klackygears -#define PRODUCT eek! - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json index b6934c2a393..2566cd6fef5 100644 --- a/keyboards/eek/info.json +++ b/keyboards/eek/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "eek!", + "manufacturer": "klackygears", "url": "http://www.keyboard-layout-editor.com/#/gists/3e4d0cd1534dd4e4b9f25cf2b36d0d63", "maintainer": "klackygears", + "usb": { + "vid": "0x4A53", + "pid": "0x0002", + "device_version": "0.0.4" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h index 90e76d9c5ac..6370544c2b8 100644 --- a/keyboards/efreet/config.h +++ b/keyboards/efreet/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x534F // "SO" -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Soran -#define PRODUCT Efreet - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json index 0b34c4c6f17..2ef2e59a0d0 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "efreet", + "keyboard_name": "Efreet", + "manufacturer": "Soran", "url": "", "maintainer": "amberstarlight", + "usb": { + "vid": "0x534F", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_mit": { "layout": [ diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h index c701f1f6d6c..91311dea370 100644 --- a/keyboards/ein_60/config.h +++ b/keyboards/ein_60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4A53 -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER klackygears -#define PRODUCT EIN_60 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json index c1cd5c7f77c..d7b2c529e16 100644 --- a/keyboards/ein_60/info.json +++ b/keyboards/ein_60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ein_60", + "manufacturer": "klackygears", "url": "", "maintainer": "klackygears", + "usb": { + "vid": "0x4A53", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ekow/akira/config.h b/keyboards/ekow/akira/config.h index 678827543fd..7d6df19f50a 100644 --- a/keyboards/ekow/akira/config.h +++ b/keyboards/ekow/akira/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B59 // KY -#define PRODUCT_ID 0x414B // AK -#define DEVICE_VER 0x0000 -#define MANUFACTURER Keeboyzlab -#define PRODUCT AKIRA - // key matrix size #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/info.json index b6ebf9b8a20..1beb48e899a 100644 --- a/keyboards/ekow/akira/info.json +++ b/keyboards/ekow/akira/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KEYBOYZLAB:AKIRA", + "keyboard_name": "AKIRA", + "manufacturer": "Keeboyzlab", "maintainer": "eugenepy", "url": "http://github.com/EugenePY", + "usb": { + "vid": "0x4B59", + "pid": "0x414B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_hhkb": { "layout": [ diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h index 8b805f937b9..92f13034809 100644 --- a/keyboards/elephant42/config.h +++ b/keyboards/elephant42/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4649 -#define PRODUCT_ID 0x0721 -#define DEVICE_VER 0x0001 -#define MANUFACTURER illness072 -#define PRODUCT elephant42 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json index 0401bb1c916..cbc7b78378e 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "elephant42", + "manufacturer": "illness072", "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42", "maintainer": "illness072", + "usb": { + "vid": "0x4649", + "pid": "0x0721", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h index 99b606770d4..748558719f8 100644 --- a/keyboards/emajesty/eiri/config.h +++ b/keyboards/emajesty/eiri/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 0x9372 -#define DEVICE_VER 0x0001 -#define MANUFACTURER EMajesty -#define PRODUCT eiri - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/info.json index 2816dba4c7e..b2717418804 100644 --- a/keyboards/emajesty/eiri/info.json +++ b/keyboards/emajesty/eiri/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "eiri", + "manufacturer": "EMajesty", "url": "https://github.com/EMajesty/eiri", "maintainer": "EMajesty", + "usb": { + "vid": "0xFEED", + "pid": "0x9372", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/emery65/config.h b/keyboards/emery65/config.h index cbe31b75da6..2e547604d10 100644 --- a/keyboards/emery65/config.h +++ b/keyboards/emery65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8968 -#define PRODUCT_ID 0x4536 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Yiancar-Designs -#define PRODUCT Emery65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json index 9d8058e8315..aba98209286 100644 --- a/keyboards/emery65/info.json +++ b/keyboards/emery65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Emery65", + "manufacturer": "Yiancar-Designs", "url": "https://yiancar-designs.com", "maintainer": "Yiancar-Designs", + "usb": { + "vid": "0x8968", + "pid": "0x4536", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h index 98eefdc6ad7..5bd17756598 100644 --- a/keyboards/emi20/config.h +++ b/keyboards/emi20/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Aquacylinder -#define PRODUCT emi20 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index 408c30d04bc..79f5359e01d 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Emi20", + "manufacturer": "Aquacylinder", "url": "", "maintainer": "Aquacylinder", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/emptystring/NQG/config.h b/keyboards/emptystring/NQG/config.h index 9598707240b..66abf55834a 100644 --- a/keyboards/emptystring/NQG/config.h +++ b/keyboards/emptystring/NQG/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0076 -#define PRODUCT_ID 0x0037 -#define DEVICE_VER 0x0100 -#define MANUFACTURER emptystring -#define PRODUCT NQG - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/emptystring/NQG/info.json b/keyboards/emptystring/NQG/info.json index 14191209d69..6ccbc013708 100644 --- a/keyboards/emptystring/NQG/info.json +++ b/keyboards/emptystring/NQG/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "NQG (Not Quite Gherkin)", + "keyboard_name": "NQG", + "manufacturer": "emptystring", "url": "", "maintainer": "culturalsnow", + "usb": { + "vid": "0x0076", + "pid": "0x0037", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eniigmakeyboards/ek60/config.h b/keyboards/eniigmakeyboards/ek60/config.h index 25653750105..b9bd26b39bf 100644 --- a/keyboards/eniigmakeyboards/ek60/config.h +++ b/keyboards/eniigmakeyboards/ek60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x454B -#define PRODUCT_ID 0x0003 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Eniigma Keyboards -#define PRODUCT ek60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/eniigmakeyboards/ek60/info.json b/keyboards/eniigmakeyboards/ek60/info.json index 37bb01b0bea..d2875196baf 100644 --- a/keyboards/eniigmakeyboards/ek60/info.json +++ b/keyboards/eniigmakeyboards/ek60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ek60", + "keyboard_name": "EK60", + "manufacturer": "Eniigma Keyboards", "url": "", "maintainer": "adamws", + "usb": { + "vid": "0x454B", + "pid": "0x0003", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout":[ diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h index 7a272c1491e..35a38fdbdc5 100644 --- a/keyboards/eniigmakeyboards/ek65/config.h +++ b/keyboards/eniigmakeyboards/ek65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x454B -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Eniigma Keyboards -#define PRODUCT ek65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/eniigmakeyboards/ek65/info.json b/keyboards/eniigmakeyboards/ek65/info.json index 361a444128b..a957ae15126 100644 --- a/keyboards/eniigmakeyboards/ek65/info.json +++ b/keyboards/eniigmakeyboards/ek65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ek65", + "keyboard_name": "EK65", + "manufacturer": "Eniigma Keyboards", "url": "", "maintainer": "adamws", + "usb": { + "vid": "0x454B", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout":[ diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h index 838f46f8441..a15994b7f94 100644 --- a/keyboards/eniigmakeyboards/ek87/config.h +++ b/keyboards/eniigmakeyboards/ek87/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x454B -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Eniigma Keyboards -#define PRODUCT Eniigma Keyboards ek87 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/eniigmakeyboards/ek87/info.json b/keyboards/eniigmakeyboards/ek87/info.json index 6f934e75a8f..c05ca3bcd91 100644 --- a/keyboards/eniigmakeyboards/ek87/info.json +++ b/keyboards/eniigmakeyboards/ek87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ek87", + "keyboard_name": "EK87", + "manufacturer": "Eniigma Keyboards", "url": "", "maintainer": "adamws", + "usb": { + "vid": "0x454B", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout":[ diff --git a/keyboards/ep/40/config.h b/keyboards/ep/40/config.h index 780d64fd699..fb67f5509c4 100644 --- a/keyboards/ep/40/config.h +++ b/keyboards/ep/40/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 0x4040 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Elliot Powell -#define PRODUCT ep40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/info.json index 58e76c608c0..3c482198d58 100644 --- a/keyboards/ep/40/info.json +++ b/keyboards/ep/40/info.json @@ -1,6 +1,12 @@ { "keyboard_name":"ep40", + "manufacturer": "Elliot Powell", "maintainer":"e11i0t23", + "usb": { + "vid": "0xFEED", + "pid": "0x4040", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":2.25}, {"x":5.25, "y":3, "w":2.75}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h index bcb10748671..d057e05c355 100644 --- a/keyboards/ep/96/config.h +++ b/keyboards/ep/96/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 0x9696 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Elliot Powell -#define PRODUCT ep96 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 19 diff --git a/keyboards/ep/96/info.json b/keyboards/ep/96/info.json index 6f216064eb0..8f964f670c3 100644 --- a/keyboards/ep/96/info.json +++ b/keyboards/ep/96/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "ep96", + "manufacturer": "Elliot Powell", "maintainer": "e11i0t23", + "usb": { + "vid": "0xFEED", + "pid": "0x9696", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/comsn/hs68/config.h b/keyboards/ep/comsn/hs68/config.h index e26f07044cd..1a7e681bd21 100644 --- a/keyboards/ep/comsn/hs68/config.h +++ b/keyboards/ep/comsn/hs68/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 0x6868 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Elliot Powell -#define PRODUCT ephs68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ep/comsn/hs68/info.json b/keyboards/ep/comsn/hs68/info.json index 8463ce491b9..631afb029bb 100644 --- a/keyboards/ep/comsn/hs68/info.json +++ b/keyboards/ep/comsn/hs68/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "EPHS68", + "manufacturer": "Elliot Powell", "maintainer": "Elliot Powell (u/e11i0t23)", + "usb": { + "vid": "0xFEED", + "pid": "0x6868", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h index def201cd8b0..879c4405f46 100644 --- a/keyboards/ep/comsn/mollydooker/config.h +++ b/keyboards/ep/comsn/mollydooker/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 0x9696 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Elliot Powell -#define PRODUCT mollydooker - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json index 611efe6c649..58d7bb288ce 100644 --- a/keyboards/ep/comsn/mollydooker/info.json +++ b/keyboards/ep/comsn/mollydooker/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "mollydooker", + "manufacturer": "Elliot Powell", "maintainer": "Elliot Powell (u/e11i0t23)", + "usb": { + "vid": "0xFEED", + "pid": "0x9696", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ep/comsn/tf_longeboye/config.h b/keyboards/ep/comsn/tf_longeboye/config.h index f02d5603306..73ec20acfbf 100644 --- a/keyboards/ep/comsn/tf_longeboye/config.h +++ b/keyboards/ep/comsn/tf_longeboye/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 0x9696 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Elliot Powell -#define PRODUCT TF Longeboye - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/ep/comsn/tf_longeboye/info.json b/keyboards/ep/comsn/tf_longeboye/info.json index e6992f44811..3fa58d61c1b 100644 --- a/keyboards/ep/comsn/tf_longeboye/info.json +++ b/keyboards/ep/comsn/tf_longeboye/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "tf_longeboye", + "keyboard_name": "TF Longeboye", + "manufacturer": "Elliot Powell", "maintainer": "Elliot Powell (u/e11i0t23)", + "usb": { + "vid": "0xFEED", + "pid": "0x9696", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/epoch80/config.h b/keyboards/epoch80/config.h index ba79c4c26c4..f960058d748 100644 --- a/keyboards/epoch80/config.h +++ b/keyboards/epoch80/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6463 -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER caryworks -#define PRODUCT epoch80 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/epoch80/info.json b/keyboards/epoch80/info.json index 97a23cac6d2..f3e74171c08 100644 --- a/keyboards/epoch80/info.json +++ b/keyboards/epoch80/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "epoch80", + "manufacturer": "caryworks", "url": "https://kbdfans.com/collections/80-diy-kit/products/coming-soon-epoch-80-mechanical-keyboard", "maintainer": "kb-elmo", + "usb": { + "vid": "0x6463", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ergodox_stm32/config.h b/keyboards/ergodox_stm32/config.h index b627f44ebb8..46514eaeb70 100644 --- a/keyboards/ergodox_stm32/config.h +++ b/keyboards/ergodox_stm32/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1308 -#define DEVICE_VER 0x0101 -#define MANUFACTURER ErgoDox -#define PRODUCT ErgoDox STM - #define MATRIX_ROWS 14 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) #define MATRIX_COLS 6 diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json index ee406e4743d..e93c71e29c8 100644 --- a/keyboards/ergodox_stm32/info.json +++ b/keyboards/ergodox_stm32/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ErgoDox STM32", + "manufacturer": "ErgoDox", "url": "github.com/codetector1374", "maintainer": "codetector1374", + "usb": { + "vid": "0xFEED", + "pid": "0x1308", + "device_version": "1.0.1" + }, "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h index 34498cc3fb0..a3ccbc7f305 100644 --- a/keyboards/esca/getawayvan/config.h +++ b/keyboards/esca/getawayvan/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xE5CA -#define PRODUCT_ID 0x0401 -#define DEVICE_VER 0x0001 -#define MANUFACTURER esca -#define PRODUCT GetawayVan - - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json index e49d4a8e470..2d793203f38 100644 --- a/keyboards/esca/getawayvan/info.json +++ b/keyboards/esca/getawayvan/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GetawayVan", + "manufacturer": "esca", "url": "", "maintainer": "esca", + "usb": { + "vid": "0xE5CA", + "pid": "0x0401", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}] diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h index 6812d4e52b4..a3ccbc7f305 100644 --- a/keyboards/esca/getawayvan_f042/config.h +++ b/keyboards/esca/getawayvan_f042/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xE5CA -#define PRODUCT_ID 0x0401 -#define DEVICE_VER 0x0001 -#define MANUFACTURER esca -#define PRODUCT GetawayVan - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json index e49d4a8e470..2d793203f38 100644 --- a/keyboards/esca/getawayvan_f042/info.json +++ b/keyboards/esca/getawayvan_f042/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GetawayVan", + "manufacturer": "esca", "url": "", "maintainer": "esca", + "usb": { + "vid": "0xE5CA", + "pid": "0x0401", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}] diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h index 0a333760a93..d98af999602 100644 --- a/keyboards/eternal_keypad/config.h +++ b/keyboards/eternal_keypad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1209 // pid.codes -#define PRODUCT_ID 0xDB00 -#define DEVICE_VER 0x0001 -#define MANUFACTURER duckyb -#define PRODUCT eternal_keypad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 8 diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json index 2bdf9624ce9..55c4d67bed7 100644 --- a/keyboards/eternal_keypad/info.json +++ b/keyboards/eternal_keypad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "eternal_keypad", + "manufacturer": "duckyb", "url": "https://github.com/duckyb/eternal-keypad", "maintainer": "duckyb", + "usb": { + "vid": "0x1209", + "pid": "0xDB00", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eu_isolation/config.h b/keyboards/eu_isolation/config.h index e1564b8d6ba..49355bfec8d 100644 --- a/keyboards/eu_isolation/config.h +++ b/keyboards/eu_isolation/config.h @@ -16,13 +16,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4373 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TuckTuckFloof -#define PRODUCT EU ISOlation - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/eu_isolation/info.json b/keyboards/eu_isolation/info.json index 03de853c428..5713a2ddb8c 100644 --- a/keyboards/eu_isolation/info.json +++ b/keyboards/eu_isolation/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "EUISOlation", + "keyboard_name": "EU ISOlation", + "manufacturer": "TuckTuckFloof", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x4373", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_euiso_ortho": { "layout": [ diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h index ca1bdbf1c2b..c6818085e12 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/config.h +++ b/keyboards/evancookaudio/sleepingdinosaur/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x636F -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0000 -#define MANUFACTURER evancook.audio -#define PRODUCT sleepingdinosaur - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json index 2c21777d491..de5cab5eb4b 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/info.json +++ b/keyboards/evancookaudio/sleepingdinosaur/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "evancook.audio sleepingdinosaur", + "keyboard_name": "sleepingdinosaur", + "manufacturer": "evancook.audio", "url": "https://evancook.audio/", "maintainer": "evanmcook", + "usb": { + "vid": "0x636F", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/evancookaudio/tenpad/config.h b/keyboards/evancookaudio/tenpad/config.h index c9d7d05251e..e49d8e9b1a3 100644 --- a/keyboards/evancookaudio/tenpad/config.h +++ b/keyboards/evancookaudio/tenpad/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x636F -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0000 -#define MANUFACTURER evancook.audio -#define PRODUCT tenpad - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/info.json index 52c62775dc5..02ba27ccf36 100644 --- a/keyboards/evancookaudio/tenpad/info.json +++ b/keyboards/evancookaudio/tenpad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "evancook.audio tenpad", + "keyboard_name": "tenpad", + "manufacturer": "evancook.audio", "url": "https://evancook.audio/", "maintainer": "evanmcook", + "usb": { + "vid": "0x636F", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_2x5": { diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h index a6b2c9b69d9..4947167645a 100644 --- a/keyboards/eve/meteor/config.h +++ b/keyboards/eve/meteor/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x4556 // "EV" -#define PRODUCT_ID 0x4D54 // "MT" -#define DEVICE_VER 0x0200 -#define MANUFACTURER EVE -#define PRODUCT Meteor - #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json index 4c86d09bfde..4ec84888895 100644 --- a/keyboards/eve/meteor/info.json +++ b/keyboards/eve/meteor/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "EVE Meteor", + "keyboard_name": "Meteor", + "manufacturer": "EVE", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4556", + "pid": "0x4D54", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT_all": { "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":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}, {"x":14, "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":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":1.25}, {"x":1.25, "y":4.5}, {"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":1.75}, {"x":14, "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}, {"x":11, "y":5.5}, {"x":12, "y":5.5}, {"x":13, "y":5.5}, {"x":14, "y":5.5}] diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h index 6876c0e086f..25fb7d4a0b5 100644 --- a/keyboards/evil80/config.h +++ b/keyboards/evil80/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evil -#define PRODUCT Evil80 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/evil80/info.json b/keyboards/evil80/info.json index b37086c1a73..25d0dea712e 100644 --- a/keyboards/evil80/info.json +++ b/keyboards/evil80/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Evil80", + "manufacturer": "Evil", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h index 3a3ff3be35f..babc1d88c1d 100644 --- a/keyboards/evolv/config.h +++ b/keyboards/evolv/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7865 // NA for NathanAlpha -#define PRODUCT_ID 0x0E75 // For Evolv75 -#define DEVICE_VER 0x0001 // Revision pre-Alpha -#define MANUFACTURER NathanAlpha -#define PRODUCT Evolv75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json index baa7b9c8436..2eaf92e7d4d 100644 --- a/keyboards/evolv/info.json +++ b/keyboards/evolv/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Evolv75", + "manufacturer": "NathanAlpha", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x7865", + "pid": "0x0E75", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_evolv_ansi": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h index 42661c33112..cba27459cdd 100644 --- a/keyboards/evyd13/atom47/rev2/config.h +++ b/keyboards/evyd13/atom47/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 0x4705 -#define PRODUCT_ID 0x8E66 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Atom47 rev2 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 5603c0e2476..6a57c77d641 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Atom47 rev2", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x8E66", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h index 90cb4a1952f..a00f5177fe7 100644 --- a/keyboards/evyd13/atom47/rev3/config.h +++ b/keyboards/evyd13/atom47/rev3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x0E6D -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Atom47 rev3 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index fc602f699b6..bbeaea667e3 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Atom47 rev3", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x0E6D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h index a88c5387169..19add7be46c 100644 --- a/keyboards/evyd13/atom47/rev4/config.h +++ b/keyboards/evyd13/atom47/rev4/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x8446 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Atom47 rev4 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index d0fbf98742e..8e117850cb4 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Atom47 rev4", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x8446", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h index 25c419b4cdd..4ab41e95673 100644 --- a/keyboards/evyd13/atom47/rev5/config.h +++ b/keyboards/evyd13/atom47/rev5/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x92EA -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Atom47 rev5 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json index eae42fe7464..4ecc240182f 100644 --- a/keyboards/evyd13/atom47/rev5/info.json +++ b/keyboards/evyd13/atom47/rev5/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Atom47 rev5", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x92EA", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h index 14cbe420997..a10c3924fca 100644 --- a/keyboards/evyd13/eon40/config.h +++ b/keyboards/evyd13/eon40/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x0140 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Eon40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index 38348b49b9c..e255caf9fc0 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Eon40", + "manufacturer": "Evyd13", "url": "https://maartenwut.com/product/eon40/", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0x0140", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "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":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h index 08922a2d4c0..02d8e964745 100644 --- a/keyboards/evyd13/eon65/config.h +++ b/keyboards/evyd13/eon65/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xAEB4 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Eon65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json index 41b1b056ee3..26f70f5a52b 100644 --- a/keyboards/evyd13/eon65/info.json +++ b/keyboards/evyd13/eon65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Eon65", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0xAEB4", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h index 203cfe8a7d6..4cc5d893002 100644 --- a/keyboards/evyd13/eon75/config.h +++ b/keyboards/evyd13/eon75/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x5C62 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Eon75 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json index 9730b069e84..4fe35a90907 100644 --- a/keyboards/evyd13/eon75/info.json +++ b/keyboards/evyd13/eon75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Eon75", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0x5C62", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h index bfa593db51f..8b233384069 100644 --- a/keyboards/evyd13/eon87/config.h +++ b/keyboards/evyd13/eon87/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xAA6B -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Eon87 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json index 1020ccd06ed..d3bde7565e1 100644 --- a/keyboards/evyd13/eon87/info.json +++ b/keyboards/evyd13/eon87/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Eon87", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0xAA6B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h index 6a6b329c298..c10eab2fcf6 100644 --- a/keyboards/evyd13/eon95/config.h +++ b/keyboards/evyd13/eon95/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x8A18 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Eon95 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 10 diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json index 18cb38ad2f2..c1650889974 100644 --- a/keyboards/evyd13/eon95/info.json +++ b/keyboards/evyd13/eon95/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Eon95", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0x8A18", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h index d2fa370c0d7..2be1840b77a 100644 --- a/keyboards/evyd13/gh80_1800/config.h +++ b/keyboards/evyd13/gh80_1800/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x8B23 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT GH80 1800 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 11 diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json index 5019157c060..d85a412c99b 100644 --- a/keyboards/evyd13/gh80_1800/info.json +++ b/keyboards/evyd13/gh80_1800/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GH80-1800", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-1800", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x8B23", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h index d05ca879586..fdc4b7968c2 100644 --- a/keyboards/evyd13/gh80_3700/config.h +++ b/keyboards/evyd13/gh80_3700/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x633A -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT GH80 3700 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json index 8f6402a45e6..a5c128d29b3 100644 --- a/keyboards/evyd13/gh80_3700/info.json +++ b/keyboards/evyd13/gh80_3700/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GH80-3700", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-3700", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x633A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [ diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h index 395d1c303e5..f942e471640 100644 --- a/keyboards/evyd13/gud70/config.h +++ b/keyboards/evyd13/gud70/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x198B -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Gud70 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json index bf0ac9df4ee..c7d94c93a89 100644 --- a/keyboards/evyd13/gud70/info.json +++ b/keyboards/evyd13/gud70/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Gud70", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/gud70-pcb", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x198B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h index 01af62d69dc..118ea3693b1 100644 --- a/keyboards/evyd13/minitomic/config.h +++ b/keyboards/evyd13/minitomic/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x0145 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Minitomic - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json index 388569fac82..650442a7369 100644 --- a/keyboards/evyd13/minitomic/info.json +++ b/keyboards/evyd13/minitomic/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Minitomic", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0x0145", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.75}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3, "w":1.25}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}] diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h index 3d25e1704fc..caa88da9a58 100644 --- a/keyboards/evyd13/mx5160/config.h +++ b/keyboards/evyd13/mx5160/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x5160 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT MX-5160 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 10 diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json index 7c1a0bb396a..c1d70680482 100644 --- a/keyboards/evyd13/mx5160/info.json +++ b/keyboards/evyd13/mx5160/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "mx5160", + "keyboard_name": "MX-5160", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/mx-5160", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0x5160", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":19, "y":0}, {"x":20, "y":0}, {"x":21, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":19, "y":1}, {"x":20, "y":1}, {"x":21, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, {"x":16.25, "y":2, "w":1.25}, {"x":18, "y":2}, {"x":19, "y":2}, {"x":20, "y":2}, {"x":21, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":18, "y":3}, {"x":19, "y":3}, {"x":20, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"x":13.5, "y":4, "w":1.5}, {"x":16, "y":4, "w":1.5}, {"x":18, "y":4}, {"x":19, "y":4}, {"x":20, "y":4}, {"x":21, "y":3, "h":2}] diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h index f633a4206e7..716c9109110 100644 --- a/keyboards/evyd13/nt660/config.h +++ b/keyboards/evyd13/nt660/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x1F02 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT nt660 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index 8f087c68c32..fb7f694e95b 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "nt660", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x1F02", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h index 076bb344a50..68d7603202d 100644 --- a/keyboards/evyd13/nt750/config.h +++ b/keyboards/evyd13/nt750/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x3320 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT nt750 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json index 5342807d65a..414d1f8ba1d 100644 --- a/keyboards/evyd13/nt750/info.json +++ b/keyboards/evyd13/nt750/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "nt750", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/nt-series/tree/main/nt-750", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x3320", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h index e483ab46c96..785507d0c82 100644 --- a/keyboards/evyd13/nt980/config.h +++ b/keyboards/evyd13/nt980/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xAAF8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT nt980 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json index 8b1b32449ed..c8c1060d42c 100644 --- a/keyboards/evyd13/nt980/info.json +++ b/keyboards/evyd13/nt980/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "nt980", + "manufacturer": "Evyd13", "url": "", - "maintainer": "maartenwut", + "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0xAAF8", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h index 40f83848311..40ba73dfe98 100644 --- a/keyboards/evyd13/omrontkl/config.h +++ b/keyboards/evyd13/omrontkl/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xEA78 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT OmronTKL - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/info.json index 3f0dfb9bc3f..6e9b2423f6e 100644 --- a/keyboards/evyd13/omrontkl/info.json +++ b/keyboards/evyd13/omrontkl/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "OmronTKL", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0xEA78", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/plain60/config.h b/keyboards/evyd13/plain60/config.h index 987081a9f10..2cb4ad565c4 100644 --- a/keyboards/evyd13/plain60/config.h +++ b/keyboards/evyd13/plain60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x0160 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Plain60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json index 64eb3054642..3b08a935dc0 100644 --- a/keyboards/evyd13/plain60/info.json +++ b/keyboards/evyd13/plain60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Plain60", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x0160", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h index b62c3549f81..f4755a1b427 100644 --- a/keyboards/evyd13/pockettype/config.h +++ b/keyboards/evyd13/pockettype/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xFA7D -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT PocketType - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index f81dbec5391..f54e382e6a3 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "PocketType", + "manufacturer": "Evyd13", "url": "https://mechboards.co.uk/shop/kits/pockettype/", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0xFA7D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "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":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h index 4df2abd5a85..60d1164551a 100644 --- a/keyboards/evyd13/quackfire/config.h +++ b/keyboards/evyd13/quackfire/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x87C9 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Quackfire - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 15 diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json index 68a0767c948..88b168aa634 100644 --- a/keyboards/evyd13/quackfire/info.json +++ b/keyboards/evyd13/quackfire/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Quackfire", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/quackfire-controller", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x87C9", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h index ef449ab7d40..d5d8d4fc24a 100644 --- a/keyboards/evyd13/solheim68/config.h +++ b/keyboards/evyd13/solheim68/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x7BFF -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Solheim68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json index b0776223b64..1cadeeb9fa6 100644 --- a/keyboards/evyd13/solheim68/info.json +++ b/keyboards/evyd13/solheim68/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Solheim68", + "manufacturer": "Evyd13", "url": "https://github.com/evyd13/solheim68", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0x7BFF", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h index 518c854d9bc..4ea54f6a2a8 100644 --- a/keyboards/evyd13/ta65/config.h +++ b/keyboards/evyd13/ta65/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0x7465 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT ta-65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json index 5d390c9f6eb..f24f599df1f 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ta65", + "keyboard_name": "ta-65", + "manufacturer": "Evyd13", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4705", + "pid": "0x7465", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h index a8b5c032ca6..84c2614c39f 100644 --- a/keyboards/evyd13/wasdat_code/config.h +++ b/keyboards/evyd13/wasdat_code/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xB00E -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Wasdat Code - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json index 1c0f14ed3d0..4ebbc5aa15e 100644 --- a/keyboards/evyd13/wasdat_code/info.json +++ b/keyboards/evyd13/wasdat_code/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Wasdat Code", + "manufacturer": "Evyd13", "url": "https://maartenwut.com/product/wasdat-code/", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0xB00E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h index c5c7a8b6c66..538c1ef8895 100644 --- a/keyboards/evyd13/wonderland/config.h +++ b/keyboards/evyd13/wonderland/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xA71C -#define DEVICE_VER 0x0003 -#define MANUFACTURER Evyd13 -#define PRODUCT Wonderland - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index fd91f32dc1e..8e94e2fe20d 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Wonderland", + "manufacturer": "Evyd13", "url": "", "maintainer": "evyd13", + "usb": { + "vid": "0x4705", + "pid": "0xA71C", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h index 1d43011b80f..49f4e916d99 100644 --- a/keyboards/exclusive/e65/config.h +++ b/keyboards/exclusive/e65/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4558 // "EX" -#define PRODUCT_ID 0xE605 // E6.5 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E6.5 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json index 409f110a094..6b7aa9b069f 100644 --- a/keyboards/exclusive/e65/info.json +++ b/keyboards/exclusive/e65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "E6.5", + "manufacturer": "Exclusive / E-Team", "url": "", "maintainer": "masterzen", + "usb": { + "vid": "0x4558", + "pid": "0xE605", + "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "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":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"↑", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"x":12, "y":4}, {"label":"←", "x":13, "y":4}, {"label":"↓", "x":14, "y":4}, {"label":"→", "x":15, "y":4}] diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h index fd221f1765d..d00a6ac7152 100644 --- a/keyboards/exclusive/e6_rgb/config.h +++ b/keyboards/exclusive/e6_rgb/config.h @@ -6,13 +6,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4154 //AT -#define PRODUCT_ID 0x4536 //E6 -#define DEVICE_VER 0x0062 -#define MANUFACTURER astro -#define PRODUCT e6rgb - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json index c08cd12ae6d..46c90a71635 100644 --- a/keyboards/exclusive/e6_rgb/info.json +++ b/keyboards/exclusive/e6_rgb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "e6_rgb", + "keyboard_name": "E6 RGB", + "manufacturer": "astro", "url": "", "maintainer": "yulei", + "usb": { + "vid": "0x4154", + "pid": "0x4536", + "device_version": "0.6.2" + }, "layout_aliases": { "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h index f9295145ec9..0999d13bf11 100644 --- a/keyboards/exclusive/e6v2/le/config.h +++ b/keyboards/exclusive/e6v2/le/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 0x6060 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E6-V2 LE - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json index 095fe66a024..bec33b82166 100644 --- a/keyboards/exclusive/e6v2/le/info.json +++ b/keyboards/exclusive/e6v2/le/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "E6-V2 LE", + "manufacturer": "Exclusive / E-Team", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.75}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.25}, {"label":"Win", "x":3, "y":4, "w":1.25}, {"label":"Alt", "x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":2.75}, {"x":8.25, "y":4, "w":1.75}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h index 8115f4ae121..9e7b65d565d 100644 --- a/keyboards/exclusive/e6v2/le_bmc/config.h +++ b/keyboards/exclusive/e6v2/le_bmc/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4558 -#define PRODUCT_ID 0xE62D -#define DEVICE_VER 0x0001 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E6-V2 LE BMC - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 11 diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json index e6a8a0ccbfc..2d493afad3a 100644 --- a/keyboards/exclusive/e6v2/le_bmc/info.json +++ b/keyboards/exclusive/e6v2/le_bmc/info.json @@ -1,5 +1,12 @@ { + "keyboard_name": "E6-V2 LE BMC", + "manufacturer": "Exclusive / E-Team", "maintainer": "qmk", + "usb": { + "vid": "0x4558", + "pid": "0xE62D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h index d9362cfc030..213fb349477 100644 --- a/keyboards/exclusive/e6v2/oe/config.h +++ b/keyboards/exclusive/e6v2/oe/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 0x6060 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E6-V2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json index 16cf613d30c..46281fbbd25 100644 --- a/keyboards/exclusive/e6v2/oe/info.json +++ b/keyboards/exclusive/e6v2/oe/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "E6-V2 OE", + "manufacturer": "Exclusive / E-Team", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h index 3f2a50cdef1..9e7b65d565d 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/config.h +++ b/keyboards/exclusive/e6v2/oe_bmc/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4558 -#define PRODUCT_ID 0xE62B -#define DEVICE_VER 0x0001 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E6-V2 OE BMC - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 11 diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json index e6a8a0ccbfc..6dadde916a2 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/info.json +++ b/keyboards/exclusive/e6v2/oe_bmc/info.json @@ -1,5 +1,12 @@ { + "keyboard_name": "E6-V2 OE BMC", + "manufacturer": "Exclusive / E-Team", "maintainer": "qmk", + "usb": { + "vid": "0x4558", + "pid": "0xE62B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h index 5809144ba3c..217885e44f3 100644 --- a/keyboards/exclusive/e7v1/config.h +++ b/keyboards/exclusive/e7v1/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4558 // EX -#define PRODUCT_ID 0xE701 // E7-V1 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E7-V1 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json index 0d341e7af49..2d1f6a19d04 100644 --- a/keyboards/exclusive/e7v1/info.json +++ b/keyboards/exclusive/e7v1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "E7-V1", + "manufacturer": "Exclusive / E-Team", "url": "", "maintainer": "masterzen", + "usb": { + "vid": "0x4558", + "pid": "0xE701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"Z", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5}, {"label":"Win", "x":11, "y":5.5}, {"x":12, "y":5.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}] diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h index cce08878ebf..2eee4ef01f9 100644 --- a/keyboards/exclusive/e7v1se/config.h +++ b/keyboards/exclusive/e7v1se/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 0x7051 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Exclusive / E-Team -#define PRODUCT E7-V1 SE - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index f72eaebb68d..43a8cba0fec 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "e7v1se", + "keyboard_name": "E7-V1 SE", + "manufacturer": "Exclusive / E-Team", "url": "https://geekhack.org/index.php?topic=101363", "maintainer": "Bart Riemens", + "usb": { + "vid": "0xFEED", + "pid": "0x7051", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h index e9dc026867c..6f51688db77 100644 --- a/keyboards/exent/config.h +++ b/keyboards/exent/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5143 // "QC" -#define PRODUCT_ID 0x4558 // "EX" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Quadcube -#define PRODUCT Exent - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 14 diff --git a/keyboards/exent/info.json b/keyboards/exent/info.json index c783086ff87..d69c6163ae7 100644 --- a/keyboards/exent/info.json +++ b/keyboards/exent/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Exent", + "manufacturer": "Quadcube", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5143", + "pid": "0x4558", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h index f90d68e2e5e..75b5e193841 100644 --- a/keyboards/eyeohdesigns/babyv/config.h +++ b/keyboards/eyeohdesigns/babyv/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Eye Oh Designs -#define PRODUCT babyv - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json index 79ae8b23f55..65453ffaf6a 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "babyv", + "manufacturer": "Eye Oh Designs", "url": "", "maintainer": "eye oh designs", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_2u": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"label":"Ctl", "x":0, "y":3}, {"label":"Alt", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"label":"Fn", "x":9, "y":3}, {"label":"OS", "x":12, "y":3}] diff --git a/keyboards/eyeohdesigns/sprh/config.h b/keyboards/eyeohdesigns/sprh/config.h index 45a31585368..319fd17ad69 100644 --- a/keyboards/eyeohdesigns/sprh/config.h +++ b/keyboards/eyeohdesigns/sprh/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Eye Oh Designs -#define PRODUCT sprh - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json index 7e79dd821e1..ed26433daf0 100644 --- a/keyboards/eyeohdesigns/sprh/info.json +++ b/keyboards/eyeohdesigns/sprh/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "sprh", + "manufacturer": "Eye Oh Designs", "url": "https://github.com/joedinkle/eyeohdesigns/tree/main/keyboards/sprh", "maintainer": "joedinkle", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ac5": { "layout": [ diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h index db734bbb6cf..ad3d630f4f4 100644 --- a/keyboards/eyeohdesigns/theboulevard/config.h +++ b/keyboards/eyeohdesigns/theboulevard/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER eye oh designs -#define PRODUCT theboulevard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json index ca2b888648a..439cf7ed1d0 100644 --- a/keyboards/eyeohdesigns/theboulevard/info.json +++ b/keyboards/eyeohdesigns/theboulevard/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "the boulevard", + "manufacturer": "eye oh designs", "url": "", "maintainer": "eye oh designs", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho1": { "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5}, {"x":6.5, "y":4.5, "w":2}, {"x":8.5, "y":4.5}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]