From 51d5aad25b92a34bc051849616fcd93e3ae407fc Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 15 Aug 2022 13:30:12 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: D-E (#17956) --- keyboards/dumbpad/config.h | 6 ------ keyboards/dumbpad/info.json | 10 ++++++++++ keyboards/dumbpad/v0x/config.h | 3 --- keyboards/dumbpad/v0x/info.json | 6 +++--- keyboards/dumbpad/v0x_dualencoder/config.h | 3 --- keyboards/dumbpad/v0x_dualencoder/info.json | 6 +++--- keyboards/dumbpad/v0x_right/config.h | 3 --- keyboards/dumbpad/v0x_right/info.json | 6 +++--- keyboards/dumbpad/v1x/info.json | 6 +++--- keyboards/dumbpad/v1x_dualencoder/config.h | 3 --- keyboards/dumbpad/v1x_dualencoder/info.json | 6 +++--- keyboards/dumbpad/v1x_oled/config.h | 5 ----- keyboards/dumbpad/v1x_oled/info.json | 7 +++---- keyboards/dumbpad/v1x_right/config.h | 3 --- keyboards/dumbpad/v1x_right/info.json | 6 +++--- 15 files changed, 31 insertions(+), 48 deletions(-) create mode 100644 keyboards/dumbpad/info.json (limited to 'keyboards/dumbpad') diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h index 883eff97f4..b51663981d 100644 --- a/keyboards/dumbpad/config.h +++ b/keyboards/dumbpad/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xDEAF -#define PRODUCT_ID 0x0913 -#define MANUFACTURER imchipwood -#define PRODUCT dumbpad - /* Column/Row IO definitions */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dumbpad/info.json b/keyboards/dumbpad/info.json new file mode 100644 index 0000000000..341a1bcf8b --- /dev/null +++ b/keyboards/dumbpad/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "dumbpad", + "manufacturer": "imchipwood", + "url": "https://www.github.com/imchipwood/dumbpad", + "maintainer": "imchipwood", + "usb": { + "vid": "0xDEAF", + "pid": "0x0913" + } +} diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h index 6d503c9abe..954e833f8c 100644 --- a/keyboards/dumbpad/v0x/config.h +++ b/keyboards/dumbpad/v0x/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0007 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json index 01fe1d5178..5e5feb42ba 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v0x", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.0.7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h index 586e55056c..6879d73960 100644 --- a/keyboards/dumbpad/v0x_dualencoder/config.h +++ b/keyboards/dumbpad/v0x_dualencoder/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0006 - /* Column/Row IO definitions - dualencoder version is true 4x4 */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json index f4bf8be585..150a82f373 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v0x_dualencoder", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.0.6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h index 0380203fdf..00498166f3 100644 --- a/keyboards/dumbpad/v0x_right/config.h +++ b/keyboards/dumbpad/v0x_right/config.h @@ -16,9 +16,6 @@ along with this program. If not, see . */ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0007 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json index 7269fe3d08..657a85542d 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v0x_right", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.0.7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json index d8cd5b2304..6355245982 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v1x", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h index 13f4785d8a..6484a5e42c 100644 --- a/keyboards/dumbpad/v1x_dualencoder/config.h +++ b/keyboards/dumbpad/v1x_dualencoder/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json index 42eb5a3e77..6355245982 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v1x_dualencoder", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h index 2f7963b875..2dba0c3b14 100644 --- a/keyboards/dumbpad/v1x_oled/config.h +++ b/keyboards/dumbpad/v1x_oled/config.h @@ -15,11 +15,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define MANUFACTURER imchipwood -#define PRODUCT dumbpad - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json index dae417e88f..d124c76e14 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/info.json @@ -1,8 +1,7 @@ { - "keyboard_name": "dumbpad", - "keyboard_folder": "dumbpad", - "url": "https://www.github.com/keebd/dumbpad", - "maintainer": "keebd", + "usb": { + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h index 23c2685dde..bb0b42ebdc 100644 --- a/keyboards/dumbpad/v1x_right/config.h +++ b/keyboards/dumbpad/v1x_right/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0010 - /* Column/Row IO definitions */ #define MATRIX_ROWS 4 #define MATRIX_COLS 5 diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json index 05734d16b0..44b7abacff 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dumbpad/v1x_right", - "url": "https://www.github.com/imchipwood/dumbpad", - "maintainer": "imchipwood", + "usb": { + "device_version": "0.1.0" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.1