From a939293aca697cb263f4972dbb1521d273fbf499 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 26 Jul 2022 09:04:09 +1000 Subject: Move keyboard USB IDs and strings to data driven: C (#17789) --- keyboards/contender/config.h | 7 ------- keyboards/contender/info.json | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'keyboards/contender') diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h index 9977a5033e..f2ccbc7fe6 100644 --- a/keyboards/contender/config.h +++ b/keyboards/contender/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xC010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER sotoba -#define PRODUCT contender - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json index 1f1d8bf534..945fce0835 100644 --- a/keyboards/contender/info.json +++ b/keyboards/contender/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "contender", + "manufacturer": "sotoba", "url": "https://github.com/sotoba/contender", "maintainer": "sotoba", + "usb": { + "vid": "0xFEED", + "pid": "0xC010", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/contender/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/contender') diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h index f2ccbc7fe6..e6d32c8a62 100644 --- a/keyboards/contender/config.h +++ b/keyboards/contender/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { D4, D3, B5, B7, B4, B2 } #define MATRIX_COL_PINS { C7, D6, B3, B0, B1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.1 From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Aug 2022 11:34:17 +0100 Subject: RESET -> QK_BOOT keyboard readme (#18110) --- keyboards/contender/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/contender') diff --git a/keyboards/contender/readme.md b/keyboards/contender/readme.md index 281ad4dabf..8a3fe08eaf 100644 --- a/keyboards/contender/readme.md +++ b/keyboards/contender/readme.md @@ -23,4 +23,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: * **Physical reset button**: Briefly press the button on the back of the PCB -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available -- cgit v1.2.1