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/delikeeb/vanana/config.h | 4 ---- keyboards/delikeeb/vanana/info.json | 6 +++++- keyboards/delikeeb/vanana/rev1/config.h | 4 ---- keyboards/delikeeb/vanana/rev1/info.json | 6 ++++++ keyboards/delikeeb/vanana/rev2/config.h | 4 ---- keyboards/delikeeb/vanana/rev2/info.json | 6 ++++++ keyboards/delikeeb/waaffle/config.h | 4 ---- keyboards/delikeeb/waaffle/rev3/config.h | 4 ---- keyboards/delikeeb/waaffle/rev3/info.json | 8 +++++++- 9 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 keyboards/delikeeb/vanana/rev1/info.json create mode 100644 keyboards/delikeeb/vanana/rev2/info.json (limited to 'keyboards/delikeeb') diff --git a/keyboards/delikeeb/vanana/config.h b/keyboards/delikeeb/vanana/config.h index 3a5a888945..7879dc1b1a 100644 --- a/keyboards/delikeeb/vanana/config.h +++ b/keyboards/delikeeb/vanana/config.h @@ -18,7 +18,3 @@ along with this program. If not, see . #pragma once #include "config_common.h" - -#define VENDOR_ID 0x9906 -#define PRODUCT_ID 0x0013 -#define MANUFACTURER dELIKEEb diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 78c11fbee2..b8a5f78cf8 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "vanana", + "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", + "usb": { + "vid": "0x9906", + "pid": "0x0013" + }, "layouts": { "LAYOUT": { "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":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":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":7, "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":7, "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":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index 8213404eb3..17f2f7b2b8 100644 --- a/keyboards/delikeeb/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define PRODUCT Vanana rev1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json new file mode 100644 index 0000000000..992960c5a2 --- /dev/null +++ b/keyboards/delikeeb/vanana/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Vanana rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index 8397424aa9..52e1d14802 100644 --- a/keyboards/delikeeb/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 -#define PRODUCT Vanana rev2 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 10 diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json new file mode 100644 index 0000000000..c7206e9d97 --- /dev/null +++ b/keyboards/delikeeb/vanana/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Vanana rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/delikeeb/waaffle/config.h b/keyboards/delikeeb/waaffle/config.h index 1b02e32c6d..7879dc1b1a 100644 --- a/keyboards/delikeeb/waaffle/config.h +++ b/keyboards/delikeeb/waaffle/config.h @@ -18,7 +18,3 @@ along with this program. If not, see . #pragma once #include "config_common.h" - -#define VENDOR_ID 0x9906 -#define PRODUCT_ID 0x0012 -#define MANUFACTURER dELIKEEb diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 12ff241f4c..d5fdadddea 100644 --- a/keyboards/delikeeb/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT Waaffle_rev3 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index f855f89732..709ceb1844 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "waaffle", + "keyboard_name": "Waaffle rev3", + "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", + "usb": { + "vid": "0x9906", + "pid": "0x0012", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_ortho_5x16": { "layout": -- cgit v1.2.1