From 5f6cf24294c789963415f615db2fa24e46f89fa6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 00:58:29 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven: Q (#17883) --- keyboards/q4z/config.h | 7 ------- keyboards/q4z/info.json | 6 ++++++ keyboards/qpockets/eggman/config.h | 7 ------- keyboards/qpockets/eggman/info.json | 6 ++++++ keyboards/qpockets/space_space/rev1/config.h | 7 ------- keyboards/qpockets/space_space/rev1/info.json | 6 ++++++ keyboards/qpockets/space_space/rev2/config.h | 7 ------- keyboards/qpockets/space_space/rev2/info.json | 6 ++++++ keyboards/qpockets/wanten/config.h | 7 ------- keyboards/qpockets/wanten/info.json | 6 ++++++ keyboards/quad_h/lb75/config.h | 7 ------- keyboards/quad_h/lb75/info.json | 6 ++++++ keyboards/quantrik/kyuu/config.h | 7 ------- keyboards/quantrik/kyuu/info.json | 6 ++++++ keyboards/qvex/lynepad/config.h | 7 ------- keyboards/qvex/lynepad/info.json | 8 +++++++- keyboards/qwertykeys/qk65/hotswap/config.h | 8 -------- keyboards/qwertykeys/qk65/hotswap/info.json | 8 +++++++- keyboards/qwertykeys/qk65/solder/config.h | 8 -------- keyboards/qwertykeys/qk65/solder/info.json | 8 +++++++- keyboards/qwertyydox/config.h | 7 ------- keyboards/qwertyydox/info.json | 6 ++++++ 22 files changed, 69 insertions(+), 82 deletions(-) diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h index 8a591a9a898992bf7597285fce9543dc957637e8..19d618a025ea958b667ac193b65b016aae4f117a 100644 --- a/keyboards/q4z/config.h +++ b/keyboards/q4z/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0001 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER drmmr -#define PRODUCT q4z keyboard - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 10 diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json index 47fe4dd0ed1e29621deb9d7599cdaa2a289f20e9..6b1503f55140a1b06fe32235f39ce067bdc01acb 100644 --- a/keyboards/q4z/info.json +++ b/keyboards/q4z/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "q4z", + "manufacturer": "drmmr", "url": "", "maintainer": "rjboone", + "usb": { + "vid": "0x0001", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h index e1515e6c3d8d3c5631957918e8542a903f2b4346..50f05a0147bccc110fb69a92b9c194a2ee48ac1d 100644 --- a/keyboards/qpockets/eggman/config.h +++ b/keyboards/qpockets/eggman/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7170 -#define PRODUCT_ID 0x656D -#define DEVICE_VER 0x1000 -#define MANUFACTURER qpockets -#define PRODUCT eggman - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 7 diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json index 17e1cb216680b728175a20d47fd21e5bed34fb0d..f9cc6c77b9ce9e65702335de505c490e540a7a42 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "eggman", + "manufacturer": "qpockets", "url": "", "maintainer": "qpockets", + "usb": { + "vid": "0x7170", + "pid": "0x656D", + "device_version": "10.0.0" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h index d52aad4c2b9668ebd5240c01a884dbb37fd1823d..50ef5b3a2092c75704db5621f8a9c404beebae52 100644 --- a/keyboards/qpockets/space_space/rev1/config.h +++ b/keyboards/qpockets/space_space/rev1/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7170 -#define PRODUCT_ID 0x7373 -#define DEVICE_VER 0x3000 -#define MANUFACTURER qpockets -#define PRODUCT space_space - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json index 5bac73c6421a99612e42f7f89b33d8165ac0c100..f882474efe52f5f8f7bb5bf85e3ff8df5c224611 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "space_space", + "manufacturer": "qpockets", "url": "", "maintainer": "qpockets", + "usb": { + "vid": "0x7170", + "pid": "0x7373", + "device_version": "30.0.0" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h index bb8f04da2bc13f8a983f74ac57d9ecb365a14542..5be679fa50995a6196b00cd987690da621f02fdf 100644 --- a/keyboards/qpockets/space_space/rev2/config.h +++ b/keyboards/qpockets/space_space/rev2/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7170 -#define PRODUCT_ID 0x7373 -#define DEVICE_VER 0x3002 -#define MANUFACTURER qpockets -#define PRODUCT space_space - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index 5bac73c6421a99612e42f7f89b33d8165ac0c100..a6cad3665ea04a343bc5dcfee4c9fd3b3983da00 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "space_space", + "manufacturer": "qpockets", "url": "", "maintainer": "qpockets", + "usb": { + "vid": "0x7170", + "pid": "0x7373", + "device_version": "30.0.2" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h index 18a91c1dfdc051d1e99b7e20c7f14f1066f99e96..f2723ef51ced781c706c10ff94075f0d7b99eeeb 100644 --- a/keyboards/qpockets/wanten/config.h +++ b/keyboards/qpockets/wanten/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7170 //qp -#define PRODUCT_ID 0x7774 //wt -#define DEVICE_VER 0x0001 -#define MANUFACTURER qpockets -#define PRODUCT wanten - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json index e6837615826d262667095d013a212117168fe848..d78efd2758cff7640f907d6c7fc4a280abbb4574 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "wanten", + "manufacturer": "qpockets", "url": "", "maintainer": "qpockets", + "usb": { + "vid": "0x7170", + "pid": "0x7774", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h index 36cb275a97b6aad5aa7952475d9103b606e62967..e5e9af0d7aa084aa6fcd08329af27123e117f5f1 100644 --- a/keyboards/quad_h/lb75/config.h +++ b/keyboards/quad_h/lb75/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA103 -#define PRODUCT_ID 0x0007 -#define DEVICE_VER 0x0001 -#define MANUFACTURER QUADH -#define PRODUCT LB75 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index 84916f1b9bd8c7809f39ad6edd7ee670772981fb..10e63cb2d0202b94958f06532dffee23fa62253c 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "LB75", + "manufacturer": "QUADH", "url": "", "maintainer": "ai03", + "usb": { + "vid": "0xA103", + "pid": "0x0007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_continuous_fnrow": { "layout": [ diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h index 772e404ad01512f659a90e8f7ce73d74ddfaf956..e0e30baa63eddf45361477aa0849e077319c730b 100644 --- a/keyboards/quantrik/kyuu/config.h +++ b/keyboards/quantrik/kyuu/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5154 // "QT" -#define PRODUCT_ID 0x0009 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Quantrik -#define PRODUCT Kyuu - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json index c245b8baee8d309f824e5de0ccb856a2d42a1f1f..f30b74c1a7736222b48e982d7bc4ed10ab684421 100644 --- a/keyboards/quantrik/kyuu/info.json +++ b/keyboards/quantrik/kyuu/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Kyuu", + "manufacturer": "Quantrik", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5154", + "pid": "0x0009", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h index d1a5c2eb0bf03840ce77b60fe362381b31ef68cd..e3c38406dbc7f157ba838d0e790711d0d5d47984 100644 --- a/keyboards/qvex/lynepad/config.h +++ b/keyboards/qvex/lynepad/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5156 -#define PRODUCT_ID 0x4C50 -#define DEVICE_VER 0x0001 -#define MANUFACTURER QVEX -#define PRODUCT Lynepad - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 4 diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json index 46612141c17e626ff614e2d769b4835aeee1b148..3a21a1f9b5876a692fc55be6daef9eeec75d84cc 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "QVEX Lynepad", + "keyboard_name": "Lynepad", + "manufacturer": "QVEX", "url": "https://www.tindie.com/products/qvex_tech/qvex-lynepad-macro-keypad/", "maintainer": "KemoNine", + "usb": { + "vid": "0x5156", + "pid": "0x4C50", + "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h index 8dfaf1648d3fb26b856c2a0d206b89392649c9f8..51b4780c225e9a419a7b70ea1c2346d39ec4d55f 100644 --- a/keyboards/qwertykeys/qk65/hotswap/config.h +++ b/keyboards/qwertykeys/qk65/hotswap/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4F53 //0x4F53 for qwertykeys -#define PRODUCT_ID 0x514B //0x514B QK for QK65 -#define DEVICE_VER 0x0001 -#define MANUFACTURER qwertykeys -#define PRODUCT QK65 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index 21d30bd49112311fac66e297db0317c7a69a8677..a4684a27db12e0c2f073f114240920d8f78df7d6 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "qk65", + "keyboard_name": "QK65 Hotswap", + "manufacturer": "qwertykeys", "url": "", "maintainer": "qwertykeys", + "usb": { + "vid": "0x4F53", + "pid": "0x514B", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_hotswap": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h index be8c11bbdaa09d3433b7840b0154c78c94116508..b12d6d41214cf340efffd39264d72eb7945d33de 100644 --- a/keyboards/qwertykeys/qk65/solder/config.h +++ b/keyboards/qwertykeys/qk65/solder/config.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter s*/ -#define VENDOR_ID 0x4F53 // 0x4F53 for qwertykeys -#define PRODUCT_ID 0x5153 //0x5153 QS for QK65 Solder -#define DEVICE_VER 0x0001 -#define MANUFACTURER qwertykeys -#define PRODUCT QK65 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 53c5179f42878ff1dc201f72b6e13608f6711687..332f881cb3a609b0f55a1c8764e36bb782f72d85 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "qk65", + "keyboard_name": "QK65 Solder", + "manufacturer": "qwertykeys", "url": "", "maintainer": "qwertykeys", + "usb": { + "vid": "0x4F53", + "pid": "0x5153", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_solder": "LAYOUT_all", "LAYOUT_iso": "LAYOUT_65_iso_blocker" diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h index 4ca8fed1927d7ddd40fe3688c192472cd49fea2d..748999ac64c3c2dbbf896bde73b9e937ecf5117a 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCEEB -#define PRODUCT_ID 0x1256 -#define DEVICE_VER 0x0100 -#define MANUFACTURER AYDENandDAD Youtube -#define PRODUCT QWERTYYdox - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json index 53de10d3f638ae961c3d7fab31f52bf5087a3d3e..ee19ee58c0a212fc59826bebe08adf5298091588 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/info.json @@ -1,8 +1,14 @@ { "keyboard_name": "QWERTYYdox", + "manufacturer": "AYDENandDAD Youtube", "identifier": "0x1256", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xCEEB", + "pid": "0x1256", + "device_version": "1.0.0" + }, "bootloader": "caterina", "processor": "atmega32u4", "layouts": {