diff options
author | Ryan <fauxpark@gmail.com> | 2022-08-20 10:31:48 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-20 10:31:48 +1000 |
commit | 48792b030b754c8b3983a97071db1b09ae6353d4 (patch) | |
tree | 2b6d8d40e7ed59a59a41f26de00e4bf4898c02a4 /keyboards/handwired/onekey | |
parent | 39f0fb7beaaf3a1e6ac8d52db0bc51ed786fad17 (diff) |
Move keyboard USB IDs and strings to data driven, pass 2: handwired (#18079)
Diffstat (limited to 'keyboards/handwired/onekey')
35 files changed, 57 insertions, 39 deletions
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h index 3825d3f7ec..467a2df729 100644 --- a/keyboards/handwired/onekey/blackpill_f401/config.h +++ b/keyboards/handwired/onekey/blackpill_f401/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Blackpill STM32F401 - #define MATRIX_COL_PINS { B0 } #define MATRIX_ROW_PINS { A7 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json new file mode 100644 index 0000000000..50afb4b9b0 --- /dev/null +++ b/keyboards/handwired/onekey/blackpill_f401/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Blackpill STM32F401" +} diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h index 3797217153..7447ef6e4c 100644 --- a/keyboards/handwired/onekey/blackpill_f411/config.h +++ b/keyboards/handwired/onekey/blackpill_f411/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Blackpill STM32F411 - #define MATRIX_COL_PINS { B0 } #define MATRIX_ROW_PINS { A7 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json new file mode 100644 index 0000000000..0b2c14d5b9 --- /dev/null +++ b/keyboards/handwired/onekey/blackpill_f411/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Blackpill STM32F411" +} diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h index 44ec0bfc6e..defc092733 100755 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Blackpill STM32F411 TinyUF2 - #define MATRIX_COL_PINS { B0 } #define MATRIX_ROW_PINS { A7 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json new file mode 100644 index 0000000000..59cdec59f7 --- /dev/null +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2" +} diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h index 3eb7699a8b..ba043fc8c1 100644 --- a/keyboards/handwired/onekey/bluepill/config.h +++ b/keyboards/handwired/onekey/bluepill/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Bluepill STM32F103 - #define MATRIX_COL_PINS { B0 } #define MATRIX_ROW_PINS { A7 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json new file mode 100644 index 0000000000..2126c62b05 --- /dev/null +++ b/keyboards/handwired/onekey/bluepill/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Bluepill STM32F103" +} diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h index f491d4d393..26ad3c95e0 100644 --- a/keyboards/handwired/onekey/config.h +++ b/keyboards/handwired/onekey/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6465 -#define DEVICE_VER 0x0001 -#define MANUFACTURER QMK - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h index f495a1c38b..02c81ce743 100644 --- a/keyboards/handwired/onekey/elite_c/config.h +++ b/keyboards/handwired/onekey/elite_c/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Elite-C - #define MATRIX_COL_PINS { F4 } #define MATRIX_ROW_PINS { F5 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json new file mode 100644 index 0000000000..d86f8b4395 --- /dev/null +++ b/keyboards/handwired/onekey/elite_c/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Elite-C" +} diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h index 91ae8b8996..4668809198 100644 --- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h +++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h @@ -4,8 +4,6 @@ #include "config_common.h" -#define PRODUCT Onekey WB32F3G71 - #define MATRIX_COL_PINS { B12 } #define MATRIX_ROW_PINS { B13 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json new file mode 100644 index 0000000000..c4d9d317e5 --- /dev/null +++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey WB32F3G71 Eval" +} diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h index 9014d08f52..4668809198 100644 --- a/keyboards/handwired/onekey/evb_wb32fq95/config.h +++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h @@ -4,8 +4,6 @@ #include "config_common.h" -#define PRODUCT Onekey WB32FQ95 - #define MATRIX_COL_PINS { B12 } #define MATRIX_ROW_PINS { B13 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json new file mode 100644 index 0000000000..ccc65b2e70 --- /dev/null +++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey WB32FQ95 Eval" +} diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json index 7455e9f362..46cdc82827 100644 --- a/keyboards/handwired/onekey/info.json +++ b/keyboards/handwired/onekey/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "onekey handwired", + "manufacturer": "QMK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6465", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_1x1": { "layout": [ diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h index 7aa74f6682..2deb30c34c 100644 --- a/keyboards/handwired/onekey/nucleo_l432kc/config.h +++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h @@ -4,8 +4,6 @@ #include "config_common.h" -#define PRODUCT Onekey L432KC - #define MATRIX_COL_PINS { A2 } #define MATRIX_ROW_PINS { A1 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json new file mode 100644 index 0000000000..3f497fc80a --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Nucleo L432KC" +} diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h index 9c8961d5ca..02c81ce743 100644 --- a/keyboards/handwired/onekey/promicro/config.h +++ b/keyboards/handwired/onekey/promicro/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Pro Micro - #define MATRIX_COL_PINS { F4 } #define MATRIX_ROW_PINS { F5 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json new file mode 100644 index 0000000000..6b35da4d75 --- /dev/null +++ b/keyboards/handwired/onekey/promicro/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Pro Micro" +} diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h index 5600ae33ae..a42672c616 100644 --- a/keyboards/handwired/onekey/proton_c/config.h +++ b/keyboards/handwired/onekey/proton_c/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Proton-C - #define MATRIX_COL_PINS { A2 } #define MATRIX_ROW_PINS { A1 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json new file mode 100644 index 0000000000..47ac089f7a --- /dev/null +++ b/keyboards/handwired/onekey/proton_c/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Proton-C" +} diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json new file mode 100644 index 0000000000..10f661c3d9 --- /dev/null +++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Sipeed Longan Nano" +} diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h index e0f6d00050..105a0ea4b1 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/config.h +++ b/keyboards/handwired/onekey/stm32f0_disco/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey STM32F072 Discovery - #define MATRIX_COL_PINS { B4 } #define MATRIX_ROW_PINS { B5 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json new file mode 100644 index 0000000000..ef4312059b --- /dev/null +++ b/keyboards/handwired/onekey/stm32f0_disco/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey STM32F072 Discovery" +} diff --git a/keyboards/handwired/onekey/stm32f405_feather/config.h b/keyboards/handwired/onekey/stm32f405_feather/config.h index 32d7807975..77546e7b41 100644 --- a/keyboards/handwired/onekey/stm32f405_feather/config.h +++ b/keyboards/handwired/onekey/stm32f405_feather/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Adafruit Feather STM32F405 - #define MATRIX_COL_PINS { C2 } #define MATRIX_ROW_PINS { C3 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/info.json new file mode 100644 index 0000000000..410ddbdd32 --- /dev/null +++ b/keyboards/handwired/onekey/stm32f405_feather/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Adafruit Feather STM32F405" +} diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h index b83262ef05..167373cd39 100644 --- a/keyboards/handwired/onekey/teensy_2/config.h +++ b/keyboards/handwired/onekey/teensy_2/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Teensy 2.0 - #define MATRIX_COL_PINS { F4 } #define MATRIX_ROW_PINS { F5 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json new file mode 100644 index 0000000000..f081d3a25c --- /dev/null +++ b/keyboards/handwired/onekey/teensy_2/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Teensy 2.0" +} diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h index 886ad70cbf..167373cd39 100644 --- a/keyboards/handwired/onekey/teensy_2pp/config.h +++ b/keyboards/handwired/onekey/teensy_2pp/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Teensy 2++ - #define MATRIX_COL_PINS { F4 } #define MATRIX_ROW_PINS { F5 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json new file mode 100644 index 0000000000..bec94fa3dc --- /dev/null +++ b/keyboards/handwired/onekey/teensy_2pp/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Teensy 2.0++" +} diff --git a/keyboards/handwired/onekey/teensy_32/config.h b/keyboards/handwired/onekey/teensy_32/config.h index e388b01af8..1a730a6d46 100644 --- a/keyboards/handwired/onekey/teensy_32/config.h +++ b/keyboards/handwired/onekey/teensy_32/config.h @@ -19,8 +19,6 @@ // TODO: including this causes "error: expected identifier before '(' token" errors //#include "config_common.h" -#define PRODUCT Onekey Teensy 3.2 - #define MATRIX_COL_PINS { D5 } #define MATRIX_ROW_PINS { B2 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/teensy_32/info.json b/keyboards/handwired/onekey/teensy_32/info.json new file mode 100644 index 0000000000..213b4ea153 --- /dev/null +++ b/keyboards/handwired/onekey/teensy_32/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Teensy 3.2" +} diff --git a/keyboards/handwired/onekey/teensy_lc/config.h b/keyboards/handwired/onekey/teensy_lc/config.h index 4e594e7d7e..1a730a6d46 100644 --- a/keyboards/handwired/onekey/teensy_lc/config.h +++ b/keyboards/handwired/onekey/teensy_lc/config.h @@ -19,8 +19,6 @@ // TODO: including this causes "error: expected identifier before '(' token" errors //#include "config_common.h" -#define PRODUCT Onekey Teensy LC - #define MATRIX_COL_PINS { D5 } #define MATRIX_ROW_PINS { B2 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/info.json new file mode 100644 index 0000000000..68eea92235 --- /dev/null +++ b/keyboards/handwired/onekey/teensy_lc/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Teensy LC" +} |