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/aeboards/constellation/rev1/config.h | 7 ------- keyboards/aeboards/constellation/rev1/info.json | 8 +++++++- keyboards/aeboards/constellation/rev2/config.h | 7 ------- keyboards/aeboards/constellation/rev2/info.json | 8 +++++++- keyboards/aeboards/ext65/info.json | 5 +++++ keyboards/aeboards/ext65/rev1/config.h | 7 ------- keyboards/aeboards/ext65/rev1/info.json | 5 +++++ keyboards/aeboards/ext65/rev2/config.h | 7 ------- keyboards/aeboards/ext65/rev2/info.json | 5 +++++ 9 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 keyboards/aeboards/ext65/rev1/info.json create mode 100644 keyboards/aeboards/ext65/rev2/info.json (limited to 'keyboards/aeboards') diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h index 22dd96f663..eaf1c08bfd 100755 --- a/keyboards/aeboards/constellation/rev1/config.h +++ b/keyboards/aeboards/constellation/rev1/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // AE -#define PRODUCT_ID 0x065C // 65 - Constellation -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Constellation Rev1 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json index af09a0dfc7..7539c9bf45 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Constellation", + "keyboard_name": "Constellation Rev1", + "manufacturer": "AEBoards", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x4145", + "pid": "0x065C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h index de42885b47..77977f4a82 100755 --- a/keyboards/aeboards/constellation/rev2/config.h +++ b/keyboards/aeboards/constellation/rev2/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // AE -#define PRODUCT_ID 0x065C // 65 - Constellation -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Constellation Rev2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json index af09a0dfc7..95da6851c4 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Constellation", + "keyboard_name": "Constellation Rev2", + "manufacturer": "AEBoards", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x4145", + "pid": "0x065C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/aeboards/ext65/info.json b/keyboards/aeboards/ext65/info.json index bc2fe64bf4..09056ce1f4 100644 --- a/keyboards/aeboards/ext65/info.json +++ b/keyboards/aeboards/ext65/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Ext65", + "manufacturer": "AEBoards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4145", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ext65": { "layout": [ diff --git a/keyboards/aeboards/ext65/rev1/config.h b/keyboards/aeboards/ext65/rev1/config.h index cd9c240069..8226dcb954 100644 --- a/keyboards/aeboards/ext65/rev1/config.h +++ b/keyboards/aeboards/ext65/rev1/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // "AE" -#define PRODUCT_ID 0xAE65 // AEboards EXT65 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Ext65 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 10 diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json new file mode 100644 index 0000000000..bb472fcf7f --- /dev/null +++ b/keyboards/aeboards/ext65/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAE65" + } +} diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h index 498e345ad7..0ccbc6353a 100644 --- a/keyboards/aeboards/ext65/rev2/config.h +++ b/keyboards/aeboards/ext65/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4145 // "AE" -#define PRODUCT_ID 0xA652 // AEboards EXT65 Rev2 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AEBoards -#define PRODUCT AEBoards Ext65 Rev2 - /* key matrix size */ /* key matrix size */ #define MATRIX_ROWS 10 diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json new file mode 100644 index 0000000000..cacde3b019 --- /dev/null +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xA652" + } +} -- cgit v1.2.3