From 1027aed83a264d03cf3bbfd4a85ca7d240217b0f Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 15 Aug 2022 11:53:19 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: F-I (#17958) --- keyboards/flehrad/bigswitch/config.h | 7 ------- keyboards/flehrad/bigswitch/info.json | 8 +++++++- keyboards/flehrad/downbubble/config.h | 7 ------- keyboards/flehrad/downbubble/info.json | 6 ++++++ keyboards/flehrad/numbrero/config.h | 7 ------- keyboards/flehrad/numbrero/info.json | 6 ++++++ keyboards/flehrad/snagpad/config.h | 7 ------- keyboards/flehrad/snagpad/info.json | 6 ++++++ keyboards/flehrad/tradestation/config.h | 7 ------- keyboards/flehrad/tradestation/info.json | 8 +++++++- 10 files changed, 32 insertions(+), 37 deletions(-) (limited to 'keyboards/flehrad') diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h index c0f73366a7..2e711ce3a0 100644 --- a/keyboards/flehrad/bigswitch/config.h +++ b/keyboards/flehrad/bigswitch/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 -#define PRODUCT_ID 0xB195 -#define DEVICE_VER 0x0001 -#define MANUFACTURER flehrad -#define PRODUCT BigSwitch PCB - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json index 8b1411775a..9e600672f8 100644 --- a/keyboards/flehrad/bigswitch/info.json +++ b/keyboards/flehrad/bigswitch/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "Bigswitch PCB", + "keyboard_name": "BigSwitch PCB", + "manufacturer": "flehrad", "maintainer": "qmk", + "usb": { + "vid": "0x1209", + "pid": "0xB195", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0, "w":4, "h":4}] diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h index fa13006a97..8492b97240 100644 --- a/keyboards/flehrad/downbubble/config.h +++ b/keyboards/flehrad/downbubble/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 Flehrad -#define PRODUCT downbubble - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 20 diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json index 6314e4f966..4e3ab26bb6 100644 --- a/keyboards/flehrad/downbubble/info.json +++ b/keyboards/flehrad/downbubble/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "downbubble", + "manufacturer": "Flehrad", "maintainer": "flehrad", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_standard": { "layout": [ diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h index 8360dfb3f9..50a714cb2e 100644 --- a/keyboards/flehrad/numbrero/config.h +++ b/keyboards/flehrad/numbrero/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 Flehrad -#define PRODUCT Numbrero - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 5 diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json index f0bce2bda2..30c93d035c 100644 --- a/keyboards/flehrad/numbrero/info.json +++ b/keyboards/flehrad/numbrero/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Numbrero", + "manufacturer": "Flehrad", "url": "", "maintainer": "Flehrad", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numbrero_numpad": { "layout": [ diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h index 946534ebb8..4b4e10b866 100644 --- a/keyboards/flehrad/snagpad/config.h +++ b/keyboards/flehrad/snagpad/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4443 // "DC" = Don Chiou -#define PRODUCT_ID 0x5350 // "SP" = Snagpad -#define DEVICE_VER 0x0001 -#define MANUFACTURER Flehrad -#define PRODUCT Snagpad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json index 785eaa6a93..c2c8bdadfc 100644 --- a/keyboards/flehrad/snagpad/info.json +++ b/keyboards/flehrad/snagpad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Snagpad", + "manufacturer": "Flehrad", "url": "", "maintainer": "Flehrad", + "usb": { + "vid": "0x4443", + "pid": "0x5350", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h index 6b8f021ebc..6531ef6b3b 100644 --- a/keyboards/flehrad/tradestation/config.h +++ b/keyboards/flehrad/tradestation/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Flehrad -#define PRODUCT Trade Station - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json index cf0344c01b..f61ccb7d2f 100644 --- a/keyboards/flehrad/tradestation/info.json +++ b/keyboards/flehrad/tradestation/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Tradestation", + "keyboard_name": "Trade Station", + "manufacturer": "Flehrad", "url": "", "maintainer": "Flehrad", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tradestation": { "layout": [ -- cgit v1.2.1