From bcb8600a31843304ab51e67dfc7c9ad555739714 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 29 Jul 2022 22:40:16 +1000 Subject: Move keyboard USB IDs and strings to data driven: I (#17836) --- keyboards/idobao/id67/config.h | 7 ------- keyboards/idobao/id67/info.json | 6 ++++++ keyboards/idobao/id75/v1/config.h | 7 ------- keyboards/idobao/id75/v1/info.json | 8 +++++++- keyboards/idobao/id75/v2/config.h | 7 ------- keyboards/idobao/id75/v2/info.json | 8 +++++++- keyboards/idobao/id80/v3/config.h | 8 -------- keyboards/idobao/id80/v3/info.json | 6 ++++++ keyboards/idobao/id87/v1/config.h | 7 ------- keyboards/idobao/id87/v1/info.json | 6 ++++++ keyboards/idobao/id87/v2/config.h | 7 ------- keyboards/idobao/id87/v2/info.json | 6 ++++++ keyboards/idobao/id96/config.h | 7 ------- keyboards/idobao/id96/info.json | 8 +++++++- keyboards/idobao/montex/v1/config.h | 7 ------- keyboards/idobao/montex/v1/info.json | 8 +++++++- keyboards/idobao/montex/v1rgb/config.h | 7 ------- keyboards/idobao/montex/v1rgb/info.json | 8 +++++++- 18 files changed, 59 insertions(+), 69 deletions(-) (limited to 'keyboards/idobao') diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h index f94606c9e7..64b0001cfb 100644 --- a/keyboards/idobao/id67/config.h +++ b/keyboards/idobao/id67/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 /* "id" */ -#define PRODUCT_ID 0x0067 -#define DEVICE_VER 0x0002 -#define MANUFACTURER IDOBAO -#define PRODUCT ID67 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json index 545cd863d8..f626bd88e5 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ID67", + "manufacturer": "IDOBAO", "url": "https://idobao.net", "maintainer": "thewerther", + "usb": { + "vid": "0x6964", + "pid": "0x0067", + "device_version": "0.0.2" + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 918dc16481..16cffdfbad 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 // ID -#define PRODUCT_ID 0x0075 -#define DEVICE_VER 0x0001 -#define MANUFACTURER IDOBAO -#define PRODUCT ID75 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index bacdc42235..cb1e21e554 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IDOBO", + "keyboard_name": "ID75", + "manufacturer": "IDOBAO", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x6964", + "pid": "0x0075", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x15": { "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}, {"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":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":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":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":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":14, "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}, {"x":14, "y":4}] diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h index c2e54f611d..a36ba404a6 100644 --- a/keyboards/idobao/id75/v2/config.h +++ b/keyboards/idobao/id75/v2/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 // ID -#define PRODUCT_ID 0x0075 -#define DEVICE_VER 0x0002 -#define MANUFACTURER IDOBAO -#define PRODUCT ID75 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 7babe0de1a..b1afe268de 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ID75 v2", + "keyboard_name": "ID75", + "manufacturer": "IDOBAO", "url": "", "maintainer": "peepeetee", + "usb": { + "vid": "0x6964", + "pid": "0x0075", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_ortho_5x15": { "layout": [ diff --git a/keyboards/idobao/id80/v3/config.h b/keyboards/idobao/id80/v3/config.h index 4b2fb8d056..e962cf1922 100644 --- a/keyboards/idobao/id80/v3/config.h +++ b/keyboards/idobao/id80/v3/config.h @@ -20,14 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 /* "id" */ -#define PRODUCT_ID 0x0080 -#define DEVICE_VER 0x0003 -#define MANUFACTURER IDOBAO -#define PRODUCT ID80 v3 - - /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 11 diff --git a/keyboards/idobao/id80/v3/info.json b/keyboards/idobao/id80/v3/info.json index 0dc8efaf02..b011e1d6e6 100644 --- a/keyboards/idobao/id80/v3/info.json +++ b/keyboards/idobao/id80/v3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ID80 v3", + "manufacturer": "IDOBAO", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x6964", + "pid": "0x0080", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index a268091d40..6ae4cee1b5 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -16,13 +16,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 // "id" -#define PRODUCT_ID 0x0087 -#define DEVICE_VER 0x0001 -#define MANUFACTURER IDOBAO -#define PRODUCT IDOBAO ID87 - /* key matrix size */ #define MATRIX_ROWS 11 #define MATRIX_COLS 9 diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index f154bbd940..9f7c94619f 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ID87", + "manufacturer": "IDOBAO", "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", "maintainer": "qmk", + "usb": { + "vid": "0x6964", + "pid": "0x0087", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h index f094ef0638..a9d00d518b 100644 --- a/keyboards/idobao/id87/v2/config.h +++ b/keyboards/idobao/id87/v2/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 // "id" -#define PRODUCT_ID 0x0087 -#define DEVICE_VER 0x0002 -#define MANUFACTURER IDOBAO -#define PRODUCT ID87 - /* key matrix size */ #define MATRIX_ROWS 11 #define MATRIX_COLS 9 diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index e4e252aa64..ef18643d70 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ID87", + "manufacturer": "IDOBAO", "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", "maintainer": "qmk", + "usb": { + "vid": "0x6964", + "pid": "0x0087", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 6bf1f14c43..3b0d9afc16 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -20,13 +20,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 // "id" -#define PRODUCT_ID 0x0096 -#define DEVICE_VER 0x0001 -#define MANUFACTURER IDOBAO -#define PRODUCT ID96 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index f972af64a2..0732bce154 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "id96", + "keyboard_name": "ID96", + "manufacturer": "IDOBAO", "url": "https://www.idobao.net/collections/90/products/idobao-id96-aluminum-keyboard-kit", "maintainer": "vinorodrigues", + "usb": { + "vid": "0x6964", + "pid": "0x0096", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 2321ce364e..c21dda65a7 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Idobao -#define PRODUCT Montex - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index c205e0027a..f683456174 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "montex numpad", + "keyboard_name": "Montex", + "manufacturer": "IDOBAO", "url": "https://www.idobao.net/products/ldobao-montex-pad-hot-swappable-mechanical-keyboard-kit", "maintainer": "NachoxMacho", + "usb": { + "vid": "0x6964", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_6x5": { "layout": [ diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index 609aeb417e..670b43462b 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -5,13 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6964 // "id" -#define PRODUCT_ID 0x0127 -#define DEVICE_VER 0x0001 -#define MANUFACTURER IDOBAO -#define PRODUCT Montex RGB - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index 27144e499c..9001a3dfec 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -1,5 +1,11 @@ { - "keyboard_name": "IDOBAO MONTEX RGB", + "keyboard_name": "Montex RGB", + "manufacturer": "IDOBAO", + "usb": { + "vid": "0x6964", + "pid": "0x0127", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_6x5": { "layout": [ -- cgit v1.2.3