From 6f0a1d98ccc4952402ea291380be79b8dc058a82 Mon Sep 17 00:00:00 2001 From: lokher Date: Sat, 25 Nov 2023 10:35:48 +0800 Subject: [PATCH 1/7] fix q6 pro KC_TASK issue --- keyboards/keychron/q6_pro/ansi_encoder/info.json | 2 +- keyboards/keychron/q6_pro/iso_encoder/info.json | 2 +- keyboards/keychron/q6_pro/q6_pro.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/keychron/q6_pro/ansi_encoder/info.json b/keyboards/keychron/q6_pro/ansi_encoder/info.json index 5eb0e0ce7e..31b405b811 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/info.json +++ b/keyboards/keychron/q6_pro/ansi_encoder/info.json @@ -1,7 +1,7 @@ { "usb": { "pid": "0x0660", - "device_version": "1.0.1" + "device_version": "1.0.2" }, "layouts": { "LAYOUT_109_ansi": { diff --git a/keyboards/keychron/q6_pro/iso_encoder/info.json b/keyboards/keychron/q6_pro/iso_encoder/info.json index c0feb6f218..24a3355c75 100755 --- a/keyboards/keychron/q6_pro/iso_encoder/info.json +++ b/keyboards/keychron/q6_pro/iso_encoder/info.json @@ -1,7 +1,7 @@ { "usb": { "pid": "0x0661", - "device_version": "1.0.0" + "device_version": "1.0.1" }, "layouts": { "LAYOUT_110_iso": { diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index bba69f3260..8a50d32611 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -91,9 +91,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return false; // Skip all further processing of this key) case KC_TASK: - if (record->event.pressed) { - ckbt51_factory_reset(); - } case KC_FILE: case KC_SNAP: case KC_CTANA: From eae78fc59139acd62e687df05282256c6169844e Mon Sep 17 00:00:00 2001 From: Min Deng Date: Mon, 8 Jan 2024 10:37:39 +0800 Subject: [PATCH 2/7] k11_pro readme.md updated: fix instruction errors Corrected the compilation & flashing instructions in README.md for k11_pro. --- keyboards/keychron/k11_pro/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keychron/k11_pro/readme.md b/keyboards/keychron/k11_pro/readme.md index 8c70432594..8eb33d2a4f 100755 --- a/keyboards/keychron/k11_pro/readme.md +++ b/keyboards/keychron/k11_pro/readme.md @@ -10,13 +10,13 @@ A customizable 65% and ergonomic keyboard. Make example for this keyboard (after setting up your build environment): - make keychron/k11_pro/ansi:default - make keychron/k11_pro/ansi_encoder:default + make keychron/k11_pro/ansi_encoder/rgb:default + make keychron/k11_pro/ansi_encoder/white:default Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid)) - make keychron/k11_pro/ansi:default:flash - make keychron/k11_pro/ansi_encoder:default:flash + make keychron/k11_pro/ansi_enoder/rgb:default:flash + make keychron/k11_pro/ansi_enoder/white:default:flash **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard. From 11edb733df32a5eb479c292e030afa58fea045c0 Mon Sep 17 00:00:00 2001 From: Sophia <65602967+Sophed@users.noreply.github.com> Date: Tue, 9 Jan 2024 01:27:00 +0000 Subject: [PATCH 3/7] CYCKE -> CYCLE --- keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json b/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json index bf3a1f6bfc..3676b9200f 100755 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json @@ -32,7 +32,7 @@ ["08. CYCLE_OUT_IN", 8], ["09. CYCLE_OUT_IN_DUAL", 9], ["10. CYCLE_PINWHEEL", 10], - ["11. CYCKE_SPIRAL", 11], + ["11. CYCLE_SPIRAL", 11], ["12. DUAL_BEACON", 12], ["13. RAINBOW_BEACON", 13], ["14. JELLYBEAN_RAINDROPS", 14], From 8abf25cfe79dee0e61e92960b87bc7d28d8e9568 Mon Sep 17 00:00:00 2001 From: Sophia <65602967+Sophed@users.noreply.github.com> Date: Tue, 9 Jan 2024 01:36:53 +0000 Subject: [PATCH 4/7] Fix another spelling mistake jis --- keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json b/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json index 85e67eff7d..9360904173 100755 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json @@ -32,7 +32,7 @@ ["08. CYCLE_OUT_IN", 8], ["09. CYCLE_OUT_IN_DUAL", 9], ["10. CYCLE_PINWHEEL", 10], - ["11. CYCKE_SPIRAL", 11], + ["11. CYCLE_SPIRAL", 11], ["12. DUAL_BEACON", 12], ["13. RAINBOW_BEACON", 13], ["14. JELLYBEAN_RAINDROPS", 14], From da3753f9949fa97db2de0e894436c1027bff572a Mon Sep 17 00:00:00 2001 From: Min Deng Date: Wed, 10 Jan 2024 14:07:34 +0800 Subject: [PATCH 5/7] typo fixed in k11_pro/readme.md --- keyboards/keychron/k11_pro/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keychron/k11_pro/readme.md b/keyboards/keychron/k11_pro/readme.md index 8eb33d2a4f..bb51f2fd7b 100755 --- a/keyboards/keychron/k11_pro/readme.md +++ b/keyboards/keychron/k11_pro/readme.md @@ -15,8 +15,8 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid)) - make keychron/k11_pro/ansi_enoder/rgb:default:flash - make keychron/k11_pro/ansi_enoder/white:default:flash + make keychron/k11_pro/ansi_encoder/rgb:default:flash + make keychron/k11_pro/ansi_encoder/white:default:flash **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard. From 5ace91966cc7b8df532f4ee3cee3c5bc5c414cca Mon Sep 17 00:00:00 2001 From: Jeremy Engel <4955347+jeremy-engel@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:17:47 -0800 Subject: [PATCH 6/7] Use expected LED indices for host and battery indicators --- keyboards/keychron/q2_pro/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keychron/q2_pro/config.h b/keyboards/keychron/q2_pro/config.h index fef8025b2e..e168da84b3 100644 --- a/keyboards/keychron/q2_pro/config.h +++ b/keyboards/keychron/q2_pro/config.h @@ -47,10 +47,10 @@ # define LED_DRIVER_SHUTDOWN_PIN C14 # define HOST_LED_MATRIX_LIST \ - { 16, 17, 18 } + { 15, 16, 17 } # define BAT_LEVEL_LED_LIST \ - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 } + { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 } /* Backlit disable timeout when keyboard is disconnected(unit: second) */ # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 From c1ef96df3ec6fa3728080333765403e4487f53f9 Mon Sep 17 00:00:00 2001 From: Jeremy Engel <4955347+jeremy-engel@users.noreply.github.com> Date: Thu, 29 Feb 2024 08:15:11 -0800 Subject: [PATCH 7/7] Use digits to indicate battery level Co-authored-by: lokher --- keyboards/keychron/q2_pro/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/q2_pro/config.h b/keyboards/keychron/q2_pro/config.h index e168da84b3..cf5b2ffbeb 100644 --- a/keyboards/keychron/q2_pro/config.h +++ b/keyboards/keychron/q2_pro/config.h @@ -50,7 +50,7 @@ { 15, 16, 17 } # define BAT_LEVEL_LED_LIST \ - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 } + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10} /* Backlit disable timeout when keyboard is disconnected(unit: second) */ # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40