From a8744b163074457253da2c63affd3b4cceefe04a Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:12:37 +1000 Subject: Move keyboard USB IDs and strings to data driven: S (#17889) --- keyboards/system76/launch_1/config.h | 7 ------- keyboards/system76/launch_1/info.json | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'keyboards/system76/launch_1') diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 19752d58de..4a50e4d64c 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -// USB device descriptor parameter -#define VENDOR_ID 0x3384 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER System76 -#define PRODUCT Launch Configurable Keyboard (launch_1) - // Key matrix size #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index 10d39cc758..e369a4d304 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -1,6 +1,12 @@ { - "keyboard_name": "System76 Launch Configurable Keyboard (launch_1)", + "keyboard_name": "Launch Configurable Keyboard (launch_1)", + "manufacturer": "System76", "url": "https://system76.com/accessories/launch", + "usb": { + "vid": "0x3384", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3 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/system76/launch_1/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/system76/launch_1') diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 4a50e4d64c..50a6e6f9d7 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -30,7 +30,6 @@ */ #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } #define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 } -#define UNUSED_PINS /* * Diode Direction -- cgit v1.2.3 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/system76/launch_1/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/system76/launch_1') diff --git a/keyboards/system76/launch_1/readme.md b/keyboards/system76/launch_1/readme.md index 1dcdeccc39..f012f86160 100644 --- a/keyboards/system76/launch_1/readme.md +++ b/keyboards/system76/launch_1/readme.md @@ -58,5 +58,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: - **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard. -- **Keycode in layout**: Press the key mapped to `RESET` in the second layer (Escape). +- **Keycode in layout**: Press the key mapped to `QK_BOOT` in the second layer (Escape). - **Electrical reset**: Briefly short AVR ISP's GND (6) and RST (5) pads on the back of the PCB. -- cgit v1.2.3 From 5c0e87608fb63cac3bd1dc4453d8de875497a87e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 3 Sep 2022 06:50:44 +0100 Subject: Remove more RESET keycode references (#18252) --- keyboards/system76/launch_1/launch_1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/system76/launch_1') diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c index 74288edf03..fd780f6fee 100644 --- a/keyboards/system76/launch_1/launch_1.c +++ b/keyboards/system76/launch_1/launch_1.c @@ -182,7 +182,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } switch (keycode) { - case RESET: + case QK_BOOT: if (record->event.pressed) { system76_ec_unlock(); } -- cgit v1.2.3