dev/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/bluetooth_playground' into homerow

Browse source
This commit is contained in:
Vinicius Souza 2024-07-31 15:09:28 -03:00
commit ae8dda4a9c
7 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json
View file

@ -32,7 +32,7 @@
["08. CYCLE_OUT_IN", 8], ["08. CYCLE_OUT_IN", 8],
["09. CYCLE_OUT_IN_DUAL", 9], ["09. CYCLE_OUT_IN_DUAL", 9],
["10. CYCLE_PINWHEEL", 10], ["10. CYCLE_PINWHEEL", 10],
["11. CYCKE_SPIRAL", 11], ["11. CYCLE_SPIRAL", 11],
["12. DUAL_BEACON", 12], ["12. DUAL_BEACON", 12],
["13. RAINBOW_BEACON", 13], ["13. RAINBOW_BEACON", 13],
["14. JELLYBEAN_RAINDROPS", 14], ["14. JELLYBEAN_RAINDROPS", 14],

2
keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json
View file

@ -32,7 +32,7 @@
["08. CYCLE_OUT_IN", 8], ["08. CYCLE_OUT_IN", 8],
["09. CYCLE_OUT_IN_DUAL", 9], ["09. CYCLE_OUT_IN_DUAL", 9],
["10. CYCLE_PINWHEEL", 10], ["10. CYCLE_PINWHEEL", 10],
["11. CYCKE_SPIRAL", 11], ["11. CYCLE_SPIRAL", 11],
["12. DUAL_BEACON", 12], ["12. DUAL_BEACON", 12],
["13. RAINBOW_BEACON", 13], ["13. RAINBOW_BEACON", 13],
["14. JELLYBEAN_RAINDROPS", 14], ["14. JELLYBEAN_RAINDROPS", 14],

8
keyboards/keychron/k11_pro/readme.md
View file

@ -10,13 +10,13 @@ A customizable 65% and ergonomic keyboard.
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make keychron/k11_pro/ansi:default make keychron/k11_pro/ansi_encoder/rgb:default
make keychron/k11_pro/ansi_encoder: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)) 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/rgb:default:flash
make keychron/k11_pro/ansi_encoder: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. **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.

4
keyboards/keychron/q2_pro/config.h
View file

@ -47,10 +47,10 @@
# define LED_DRIVER_SHUTDOWN_PIN C14 # define LED_DRIVER_SHUTDOWN_PIN C14
# define HOST_LED_MATRIX_LIST \ # define HOST_LED_MATRIX_LIST \
{ 16, 17, 18 } { 15, 16, 17 }
# define BAT_LEVEL_LED_LIST \ # define BAT_LEVEL_LED_LIST \
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 } { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
/* Backlit disable timeout when keyboard is disconnected(unit: second) */ /* Backlit disable timeout when keyboard is disconnected(unit: second) */
# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40

2
keyboards/keychron/q6_pro/ansi_encoder/info.json
View file

@ -1,7 +1,7 @@
{ {
"usb": { "usb": {
"pid": "0x0660", "pid": "0x0660",
"device_version": "1.0.1" "device_version": "1.0.2"
}, },
"layouts": { "layouts": {
"LAYOUT_109_ansi": { "LAYOUT_109_ansi": {

2
keyboards/keychron/q6_pro/iso_encoder/info.json
View file

@ -1,7 +1,7 @@
{ {
"usb": { "usb": {
"pid": "0x0661", "pid": "0x0661",
"device_version": "1.0.0" "device_version": "1.0.1"
}, },
"layouts": { "layouts": {
"LAYOUT_110_iso": { "LAYOUT_110_iso": {

3
keyboards/keychron/q6_pro/q6_pro.c
View file

@ -91,9 +91,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
} }
return false; // Skip all further processing of this key) return false; // Skip all further processing of this key)
case KC_TASK: case KC_TASK:
if (record->event.pressed) {
ckbt51_factory_reset();
}
case KC_FILE: case KC_FILE:
case KC_SNAP: case KC_SNAP:
case KC_CTANA: case KC_CTANA: