From 30796913913c0f6dc0cce317ad8249de2b602294 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 10:47:05 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A (#17941) --- keyboards/8pack/config.h | 6 ------ keyboards/8pack/info.json | 5 +++++ keyboards/8pack/rev11/config.h | 3 --- keyboards/8pack/rev11/info.json | 5 +++++ keyboards/8pack/rev12/config.h | 3 --- keyboards/8pack/rev12/info.json | 5 +++++ 6 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 keyboards/8pack/rev11/config.h create mode 100644 keyboards/8pack/rev11/info.json delete mode 100644 keyboards/8pack/rev12/config.h create mode 100644 keyboards/8pack/rev12/info.json (limited to 'keyboards/8pack') diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h index 88bd1f351b..b9b7abebe7 100644 --- a/keyboards/8pack/config.h +++ b/keyboards/8pack/config.h @@ -2,12 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x2171 -#define MANUFACTURER Charles Garcia -#define PRODUCT 8-Pack - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index fc1bcb8ef8..f36f4c9dc3 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "8-Pack", + "manufacturer": "Charles Garcia", "url": "https://github.com/cgarcia2097/8-Pack", "maintainer": "Charles Garcia", + "usb": { + "vid": "0xFEED", + "pid": "0x2171" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/8pack/rev11/config.h b/keyboards/8pack/rev11/config.h deleted file mode 100644 index 83ad51ada3..0000000000 --- a/keyboards/8pack/rev11/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define DEVICE_VER 0x0001 diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/8pack/rev11/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/8pack/rev12/config.h b/keyboards/8pack/rev12/config.h deleted file mode 100644 index 9a527501a5..0000000000 --- a/keyboards/8pack/rev12/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define DEVICE_VER 0x0002 diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/8pack/rev12/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} -- cgit v1.2.3