From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/keychron/q1/config.h | 5 ----- keyboards/keychron/q1/rev_0100/config.h | 5 ----- keyboards/keychron/q1/rev_0100/info.json | 8 +++++++- keyboards/keychron/q1/rev_0101/config.h | 4 ---- keyboards/keychron/q1/rev_0101/info.json | 8 +++++++- keyboards/keychron/q1/rev_0102/config.h | 5 ----- keyboards/keychron/q1/rev_0102/info.json | 8 +++++++- keyboards/keychron/q2/config.h | 5 ----- keyboards/keychron/q2/rev_0110/config.h | 4 ---- keyboards/keychron/q2/rev_0110/info.json | 8 +++++++- keyboards/keychron/q2/rev_0111/config.h | 4 ---- keyboards/keychron/q2/rev_0111/info.json | 8 +++++++- keyboards/keychron/q2/rev_0112/config.h | 4 ---- keyboards/keychron/q2/rev_0112/info.json | 8 +++++++- keyboards/keychron/q2/rev_0113/config.h | 4 ---- keyboards/keychron/q2/rev_0113/info.json | 8 +++++++- 16 files changed, 49 insertions(+), 47 deletions(-) (limited to 'keyboards/keychron') diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h index de69b9e929..cda8799a79 100644 --- a/keyboards/keychron/q1/config.h +++ b/keyboards/keychron/q1/config.h @@ -16,11 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3434 -#define MANUFACTURER Keychron -#define PRODUCT Keychron Q1 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/keychron/q1/rev_0100/config.h b/keyboards/keychron/q1/rev_0100/config.h index 435f386a59..1b8c65165c 100644 --- a/keyboards/keychron/q1/rev_0100/config.h +++ b/keyboards/keychron/q1/rev_0100/config.h @@ -16,11 +16,6 @@ #pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0100 -#define DEVICE_VER 0x0100 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/keychron/q1/rev_0100/info.json b/keyboards/keychron/q1/rev_0100/info.json index dba3320ba7..b708f15994 100644 --- a/keyboards/keychron/q1/rev_0100/info.json +++ b/keyboards/keychron/q1/rev_0100/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q1", + "keyboard_name": "Q1", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0100", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_82": { "layout": [{"label":"Esc", "x":0, "y":0}, diff --git a/keyboards/keychron/q1/rev_0101/config.h b/keyboards/keychron/q1/rev_0101/config.h index c127a3630a..58d77477ca 100644 --- a/keyboards/keychron/q1/rev_0101/config.h +++ b/keyboards/keychron/q1/rev_0101/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0101 -#define DEVICE_VER 0x0100 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/keychron/q1/rev_0101/info.json b/keyboards/keychron/q1/rev_0101/info.json index 75fb2d04e8..b4e5d002b7 100644 --- a/keyboards/keychron/q1/rev_0101/info.json +++ b/keyboards/keychron/q1/rev_0101/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q1", + "keyboard_name": "Q1", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0101", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/q1/rev_0102/config.h b/keyboards/keychron/q1/rev_0102/config.h index a537ab4e0d..7aa0ae8662 100644 --- a/keyboards/keychron/q1/rev_0102/config.h +++ b/keyboards/keychron/q1/rev_0102/config.h @@ -16,11 +16,6 @@ #pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0102 -#define DEVICE_VER 0x0100 - /* key matrix pins */ #define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/keychron/q1/rev_0102/info.json b/keyboards/keychron/q1/rev_0102/info.json index a71e0b24f0..9ee606b34e 100644 --- a/keyboards/keychron/q1/rev_0102/info.json +++ b/keyboards/keychron/q1/rev_0102/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q1", + "keyboard_name": "Q1", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0102", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h index d019bcee15..bb25a3c982 100644 --- a/keyboards/keychron/q2/config.h +++ b/keyboards/keychron/q2/config.h @@ -16,11 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x3434 -#define MANUFACTURER Keychron -#define PRODUCT Keychron Q2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/keychron/q2/rev_0110/config.h b/keyboards/keychron/q2/rev_0110/config.h index e41857d9b2..f30b81b3af 100644 --- a/keyboards/keychron/q2/rev_0110/config.h +++ b/keyboards/keychron/q2/rev_0110/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0110 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 33 diff --git a/keyboards/keychron/q2/rev_0110/info.json b/keyboards/keychron/q2/rev_0110/info.json index fb34a2427a..65e6c22519 100644 --- a/keyboards/keychron/q2/rev_0110/info.json +++ b/keyboards/keychron/q2/rev_0110/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0110", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/q2/rev_0111/config.h b/keyboards/keychron/q2/rev_0111/config.h index 76cd5d0e78..249e589019 100644 --- a/keyboards/keychron/q2/rev_0111/config.h +++ b/keyboards/keychron/q2/rev_0111/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0111 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 33 diff --git a/keyboards/keychron/q2/rev_0111/info.json b/keyboards/keychron/q2/rev_0111/info.json index f6ce1d9b27..875937baec 100644 --- a/keyboards/keychron/q2/rev_0111/info.json +++ b/keyboards/keychron/q2/rev_0111/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0111", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ansi_67": { "layout": [ diff --git a/keyboards/keychron/q2/rev_0112/config.h b/keyboards/keychron/q2/rev_0112/config.h index 70a60fd026..4bab401a01 100644 --- a/keyboards/keychron/q2/rev_0112/config.h +++ b/keyboards/keychron/q2/rev_0112/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0112 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 34 diff --git a/keyboards/keychron/q2/rev_0112/info.json b/keyboards/keychron/q2/rev_0112/info.json index 5f0d4ab249..3670c87688 100644 --- a/keyboards/keychron/q2/rev_0112/info.json +++ b/keyboards/keychron/q2/rev_0112/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0112", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_iso_68": { "layout": [ diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h index 486d3fd3b8..8f7fbef73a 100644 --- a/keyboards/keychron/q2/rev_0113/config.h +++ b/keyboards/keychron/q2/rev_0113/config.h @@ -16,10 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0113 -#define DEVICE_VER 0x0100 - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 34 #define DRIVER_2_LED_TOTAL 34 diff --git a/keyboards/keychron/q2/rev_0113/info.json b/keyboards/keychron/q2/rev_0113/info.json index 151f42455d..297096aac3 100644 --- a/keyboards/keychron/q2/rev_0113/info.json +++ b/keyboards/keychron/q2/rev_0113/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Keychron Q2", + "keyboard_name": "Q2", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x0113", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_iso_68": { "layout": [ -- cgit v1.2.3