From be5b1a24bf650d9bc0bff4cf3b27a9c641d262fd Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 04:39:00 +1000 Subject: Move keyboard USB IDs and strings to data driven: O (#17874) --- keyboards/omkbd/ergodash/mini/config.h | 7 ------- keyboards/omkbd/ergodash/mini/info.json | 8 +++++++- keyboards/omkbd/ergodash/rev1/config.h | 7 ------- keyboards/omkbd/ergodash/rev1/info.json | 6 ++++++ keyboards/omkbd/runner3680/3x6/config.h | 7 ------- keyboards/omkbd/runner3680/3x6/info.json | 6 ++++++ keyboards/omkbd/runner3680/3x7/config.h | 7 ------- keyboards/omkbd/runner3680/3x7/info.json | 6 ++++++ keyboards/omkbd/runner3680/3x8/config.h | 7 ------- keyboards/omkbd/runner3680/3x8/info.json | 6 ++++++ keyboards/omkbd/runner3680/4x6/config.h | 7 ------- keyboards/omkbd/runner3680/4x6/info.json | 6 ++++++ keyboards/omkbd/runner3680/4x7/config.h | 7 ------- keyboards/omkbd/runner3680/4x7/info.json | 6 ++++++ keyboards/omkbd/runner3680/4x8/config.h | 7 ------- keyboards/omkbd/runner3680/4x8/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x6/config.h | 7 ------- keyboards/omkbd/runner3680/5x6/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x6_5x8/config.h | 7 ------- keyboards/omkbd/runner3680/5x6_5x8/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x7/config.h | 7 ------- keyboards/omkbd/runner3680/5x7/info.json | 6 ++++++ keyboards/omkbd/runner3680/5x8/config.h | 7 ------- keyboards/omkbd/runner3680/5x8/info.json | 6 ++++++ 24 files changed, 73 insertions(+), 85 deletions(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index b936e0f54e..67fe7e1603 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -20,13 +20,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 0x0100 -#define MANUFACTURER Omkbd -#define PRODUCT ErgoDashmini - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 1a0c1766f6..d8e9bc634f 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ErgoDash mini", + "keyboard_name": "ErgoDash Mini", + "manufacturer": "Omkbd", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [{"label":"L00", "x":0, "y":1.375}, {"label":"L01", "x":1, "y":1.375}, {"label":"L02", "x":2, "y":1.125}, {"label":"L03", "x":3, "y":1}, {"label":"L04", "x":4, "y":1.125}, {"label":"L05", "x":5, "y":1.25}, {"label":"L06", "x":6, "y":1.75}, {"label":"R00", "x":11, "y":1.75}, {"label":"R01", "x":12, "y":1.25}, {"label":"R02", "x":13, "y":1.125}, {"label":"R03", "x":14, "y":1}, {"label":"R04", "x":15, "y":1.125}, {"label":"R05", "x":16, "y":1.375}, {"label":"R06", "x":17, "y":1.375}, {"label":"L10", "x":0, "y":2.375}, {"label":"L11", "x":1, "y":2.375}, {"label":"L12", "x":2, "y":2.125}, {"label":"L13", "x":3, "y":2}, {"label":"L14", "x":4, "y":2.125}, {"label":"L15", "x":5, "y":2.25}, {"label":"L16", "x":6, "y":2.75}, {"label":"R10", "x":11, "y":2.75}, {"label":"R11", "x":12, "y":2.25}, {"label":"R12", "x":13, "y":2.125}, {"label":"R13", "x":14, "y":2}, {"label":"R14", "x":15, "y":2.125}, {"label":"R15", "x":16, "y":2.375}, {"label":"R16", "x":17, "y":2.375}, {"label":"L20", "x":0, "y":3.375}, {"label":"L21", "x":1, "y":3.375}, {"label":"L22", "x":2, "y":3.125}, {"label":"L23", "x":3, "y":3}, {"label":"L24", "x":4, "y":3.125}, {"label":"L25", "x":5, "y":3.25}, {"label":"L26", "x":6.5, "y":4.25}, {"label":"R20", "x":10.5, "y":4.25}, {"label":"R21", "x":12, "y":3.25}, {"label":"R22", "x":13, "y":3.125}, {"label":"R23", "x":14, "y":3}, {"label":"R24", "x":15, "y":3.125}, {"label":"R25", "x":16, "y":3.375}, {"label":"R26", "x":17, "y":3.375}, {"label":"L30", "x":0, "y":4.375}, {"label":"L31", "x":1, "y":4.375}, {"label":"L32", "x":2, "y":4.125}, {"label":"L33", "x":3, "y":4}, {"label":"L34", "x":5.5, "y":5.25}, {"label":"L35", "x":6.5, "y":5.25}, {"label":"L36", "x":7.5, "y":4.25, "h":2}, {"label":"R30", "x":9.5, "y":4.25, "h":2}, {"label":"R31", "x":10.5, "y":5.25}, {"label":"R32", "x":11.5, "y":5.25}, {"label":"R33", "x":14, "y":4}, {"label":"R34", "x":15, "y":4.125}, {"label":"R35", "x":16, "y":4.375}, {"label":"R36", "x":17, "y":4.375}] diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 07282cdad2..56fe46f52a 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -20,13 +20,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 0x0100 -#define MANUFACTURER Omkbd -#define PRODUCT ErgoDash - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index bb491b5f50..1d78f82bd7 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "ErgoDash rev1.2", + "manufacturer": "Omkbd", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_4key": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index af8e6eb32b..33a4bcc8a2 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index c54fe46106..404fda2b92 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 3x6", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index 789dda45fd..44c54091e5 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index 1a5ac8221e..f19b5a2a1e 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 3x7", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index b1d1db1171..307916f645 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 6 diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index d8e71f97e0..8e7ddf00ff 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 3x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index 12596acd9a..9b9d7a578a 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index 41ea3e0061..de912073ee 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 4x6", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index bbfdd383c0..74541c0d3f 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index 43876dd57e..2c587c38e6 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 4x7", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index 82e2dc7ee8..401ad2ddb6 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index 4502a86404..e955ea4178 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 4x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index d2f288546d..7c127c22e0 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index 02c65ec7cc..58c399e07b 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x6", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 815da24950..6348f10eb1 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3680 -#define PRODUCT_ID 0x5658 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index e8fb4c0927..eebbfe11fb 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x6+5x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0x3680", + "pid": "0x5658", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index 6bcbeeda54..9a1a0a4110 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index c60177d38c..d103c8949a 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x7", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index 29cfba78d1..c8a65dd171 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index 70e3cc7833..4556ae7520 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "runner3680 5x8", + "manufacturer": "Omkbd", "url": "", "maintainer": "omkbd", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.1