Commit graph

14160 commits

Author SHA1 Message Date
lokher
cf10e4b6a0
Merge pull request #131 from lalalademaxiya1/keychron_q4_pro
Keychron q4 pro
2023-07-10 14:43:03 +08:00
lokher
ae552cd279
Update keyboards/keychron/q4_pro/rules.mk 2023-07-10 14:42:56 +08:00
lokher
ba984dc555
Update keyboards/keychron/q4_pro/iso/config.h 2023-07-10 14:42:51 +08:00
lokher
172053a65e
Update keyboards/keychron/q4_pro/q4_pro.h 2023-07-10 14:42:45 +08:00
lokher
40ad734dd2
Update keyboards/keychron/q4_pro/info.json 2023-07-10 14:42:37 +08:00
lokher
2be2459e5f
Update keyboards/keychron/q4_pro/ansi/config.h 2023-07-10 14:42:32 +08:00
lokher
89db92dc29
Update keyboards/keychron/q4_pro/ansi/config.h 2023-07-10 14:42:26 +08:00
lokher
e04c83bbe2
Merge pull request #130 from lalalademaxiya1/keychron_k12_pro
Keychron k12 pro
2023-07-10 14:34:23 +08:00
lokher
a955f76e1c
Update keyboards/keychron/k12_pro/ansi/white/config.h 2023-07-10 14:29:14 +08:00
lokher
2f5382a49c
Update keyboards/keychron/k12_pro/ansi/rgb/config.h 2023-07-10 14:29:05 +08:00
lokher
c311f482b7
Update keyboards/keychron/k12_pro/k12_pro.h 2023-07-10 14:28:56 +08:00
lokher
03752c710a
Update keyboards/keychron/k12_pro/info.json 2023-07-10 14:28:47 +08:00
lokher
45341b6f63
Update keyboards/keychron/k12_pro/ansi/white/config.h 2023-07-10 14:28:27 +08:00
lokher
f5bd7daa0f
Update keyboards/keychron/k12_pro/ansi/rgb/config.h 2023-07-10 14:26:51 +08:00
lokher
d9e50ca004
Update keyboards/keychron/k12_pro/ansi/rgb/config.h 2023-07-10 14:26:43 +08:00
lalalademaxiya1
7ecdfa8005 Updated default keymap of q3 pro iso version 2023-07-08 15:17:25 +08:00
lalalademaxiya1
72b964fcca Replaced v1 with se and delete suffix v2 2023-07-08 15:14:10 +08:00
lalalademaxiya1
7ca5fed13a Added q2 pro iso version 2023-07-08 15:02:02 +08:00
lalalademaxiya1
d0a6fa1b1b Added q3 pre v2 and q3 v1 iso version 2023-07-08 11:21:09 +08:00
lokher
6e6f5936cb Fix left rows keys being pressed on low power wakeup when using eager debounce 2023-07-07 09:32:25 +08:00
lokher
f1b144d48e update firmware files 2023-07-06 11:23:10 +08:00
lokher
f78393413b Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmware into bluetooth_playground 2023-07-06 10:16:57 +08:00
lokher
009d525f93 fix system sleep not working 2023-07-06 10:16:21 +08:00
lokher
22ff96d139
Merge pull request #126 from lalalademaxiya1/keychron_q6_pro
Add q6 pro
2023-07-03 09:32:45 +08:00
lalalademaxiya1
94d0939cc0 Updated q6 pro 2023-06-30 11:48:42 +08:00
lalalademaxiya1
6a5c81252f Merge branch 'temp' into keychron_q6_pro 2023-06-30 11:45:57 +08:00
lalalademaxiya1
064f3702f7
Update keyboards/keychron/q6_pro/rules.mk
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:40:31 +08:00
lalalademaxiya1
ee4d74928d
Update keyboards/keychron/q6_pro/q6_pro.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:40:17 +08:00
lalalademaxiya1
e4804ec20e
Update keyboards/keychron/q6_pro/mcuconf.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:40:09 +08:00
lalalademaxiya1
d187df2f53
Update keyboards/keychron/q6_pro/q6_pro.c
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:40:00 +08:00
lalalademaxiya1
9eeb728480
Update keyboards/keychron/q6_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:39:49 +08:00
lalalademaxiya1
45ecc290bc
Update keyboards/keychron/q6_pro/halconf.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:39:39 +08:00
lalalademaxiya1
91853633a4
Update keyboards/keychron/q6_pro/ansi_encoder/config.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:39:32 +08:00
lalalademaxiya1
4baf65ddac
Update keyboards/keychron/bluetooth/transport.c
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 11:39:23 +08:00
lalalademaxiya1
9ecf6b4735 Merge branch 'temp' into keychron_q8_pro 2023-06-30 10:22:29 +08:00
lalalademaxiya1
0441cc8638 Updated q8 pro 2023-06-30 10:14:54 +08:00
lalalademaxiya1
f8db366b45 Merge branch 'keychron_q8_pro' of https://github.com/lalalademaxiya1/qmk_firmware into keychron_q8_pro 2023-06-30 10:05:25 +08:00
lalalademaxiya1
e6f3a908fd Updated config.h 2023-06-30 10:04:25 +08:00
lalalademaxiya1
faf3081791
Update keyboards/keychron/q8_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:03:34 +08:00
lalalademaxiya1
4d0f972204
Update keyboards/keychron/q8_pro/q8_pro.c
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:03:05 +08:00
lalalademaxiya1
6b40599567
Update keyboards/keychron/q8_pro/ansi_encoder/config.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:02:52 +08:00
lalalademaxiya1
e421bd391b
Update keyboards/keychron/q8_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:02:44 +08:00
lalalademaxiya1
2ac5fbb6c2
Update keyboards/keychron/q8_pro/readme.md
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:02:35 +08:00
lalalademaxiya1
813987ec1e
Update keyboards/keychron/q8_pro/rules.mk
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:02:27 +08:00
lalalademaxiya1
93f7b1c399
Update keyboards/keychron/q8_pro/mcuconf.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:02:18 +08:00
lalalademaxiya1
559571d7d6
Update keyboards/keychron/q8_pro/halconf.h
Co-authored-by: lokher <lokher@gmail.com>
2023-06-30 10:02:08 +08:00
lalalademaxiya1
f877082a65 Updated q8 pro 2023-06-30 09:50:52 +08:00
lalalademaxiya1
d90608debf Added q8 pro iso version 2023-06-30 09:47:34 +08:00
lokher
9902d781e6 fix K2 Pro caplock LED issue on startup 2023-06-27 14:14:49 +08:00
lalalademaxiya1
21c86782af Add q6 pro iso 2023-06-19 10:11:51 +08:00
lalalademaxiya1
28c8de999b Increase brightness 2023-06-15 18:12:56 +08:00
lalalademaxiya1
c63da449ce Increase brightness and version num add one. 2023-06-15 17:05:11 +08:00
lokher
98b5af8936 add compiled firmware 2023-06-15 15:39:00 +08:00
lalalademaxiya1
83b06b907a Update matrix.c 2023-06-15 14:56:33 +08:00
lalalademaxiya1
313409ebe8 Update matrix.c 2023-06-15 14:54:49 +08:00
lalalademaxiya1
96467bc2da Update matrix.c 2023-06-15 14:51:55 +08:00
lalalademaxiya1
8660a5c597 Move layout definition into k12_pro/info.json 2023-06-15 14:10:10 +08:00
lalalademaxiya1
156dffa0fe Add q5 pro 2023-06-15 12:05:10 +08:00
lalalademaxiya1
1a31d90e43 Update info.json 2023-06-15 11:49:05 +08:00
lalalademaxiya1
9024a98df2 Add via json 2023-06-15 11:42:15 +08:00
lalalademaxiya1
f47b3e451d Add q4 pro 2023-06-15 11:30:15 +08:00
lalalademaxiya1
034f672420 Add k12 pro 2023-06-15 11:01:52 +08:00
lokher
5856c95340 move OPT_DEFS += -DKC_BLUETOOTH_ENABLE to bluetooth.mk 2023-06-13 10:58:50 +08:00
lokher
e81cf81167 fix confliction 2023-06-12 10:52:54 +08:00
lalalademaxiya1
b487b5be0a Update k12 pro 2023-06-10 11:15:42 +08:00
lalalademaxiya1
b1a59b2e92 Add k12 pro 2023-06-10 09:00:19 +08:00
lalalademaxiya1
17671f67c8 Fix key keep down after keyboard waked up 2023-06-08 10:12:57 +08:00
lalalademaxiya1
921a6749fd Update k6_pro.c 2023-06-06 10:29:00 +08:00
lalalademaxiya1
3707b542c4 Update q6_pro.c fixed the wrong pid and device name after factory reset 2023-06-05 17:23:24 +08:00
lalalademaxiya1
ef737f8529 Update q6_pro.c 2023-06-05 15:48:12 +08:00
Adophoxia
b169ae5120 Merge branch 'dd-config-bt-playground' of https://github.com/adophoxia/qmk_firmware into dd-config-bt-playground 2023-05-26 11:43:02 -07:00
Adophoxia
00bc22e95a Remove effects from k8_pro/iso/white/config,h 2023-05-26 11:42:35 -07:00
Adophoxia
4587ada89c Merge branch 'dd-config-bt-playground' of https://github.com/adophoxia/qmk_firmware into dd-config-bt-playground 2023-05-26 01:17:45 -07:00
Adophoxia
71515b6190 Removed duplicate vid in seperate variant folders & use correct rgb_matrix for K10 Pro iso/rgb 2023-05-26 01:17:30 -07:00
adophoxia
358fb61811
Update keyboards/keychron/k6_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-26 01:04:34 -07:00
adophoxia
3e9696761f
Update keyboards/keychron/k3_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-26 01:04:22 -07:00
Adophoxia
9e23aa99d5 Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmware into dd-config-bt-playground 2023-05-25 21:27:05 -07:00
Adophoxia
163d87c5f8 Move LAYOUT options for Q Pro back into seperate variants 2023-05-25 21:23:31 -07:00
adophoxia
61d0369259
Update keyboards/keychron/q3_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:11:08 -07:00
adophoxia
16d8a78311
Update keyboards/keychron/q2_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:11:02 -07:00
adophoxia
963a89e32c
Update keyboards/keychron/q1_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:10:15 -07:00
adophoxia
de27709d90
Update keyboards/keychron/k9_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:10:08 -07:00
adophoxia
6c68145056
Update keyboards/keychron/k8_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:09:59 -07:00
adophoxia
2d54f53904
Update keyboards/keychron/k7_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:09:49 -07:00
adophoxia
29e430208e
Update keyboards/keychron/k6_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:09:41 -07:00
adophoxia
2f9de6a4d7
Update keyboards/keychron/k5_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:09:31 -07:00
adophoxia
d925c0e4f1
Update keyboards/keychron/k4_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:09:12 -07:00
adophoxia
7cb1530555
Update keyboards/keychron/k3_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:09:03 -07:00
adophoxia
22d58d4f1c
Update keyboards/keychron/k2_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:08:56 -07:00
adophoxia
63b73df16d
Update keyboards/keychron/k1_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:08:41 -07:00
adophoxia
7272b4b26b
Update keyboards/keychron/k13_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:08:35 -07:00
adophoxia
95000cc303
Update keyboards/keychron/k10_pro/info.json
Co-authored-by: lokher <lokher@gmail.com>
2023-05-25 21:08:26 -07:00
lalalademaxiya1
8c36e34642 Correct encoder map definition spelling 2023-05-24 11:03:51 +08:00
lalalademaxiya1
c7b9295b75 Correct encoder map definition spelling 2023-05-24 09:30:10 +08:00
lalalademaxiya1
41490853b4 Update q8 pro 2023-05-22 12:09:56 +08:00
lalalademaxiya1
b4a1428ecc Update q6 pro 2023-05-22 12:07:58 +08:00
lalalademaxiya1
b402a99537 Update rules.mk 2023-05-22 10:09:18 +08:00
lalalademaxiya1
0e2dbffc06 Update rules.mk 2023-05-22 09:37:48 +08:00
lalalademaxiya1
bf41f65a5e Add keychron q6 pro 2023-05-22 09:35:18 +08:00
lalalademaxiya1
0358e541d5 Add q8_pro 2023-05-19 18:39:23 +08:00
lalalademaxiya1
3d895c8b25 Update led index of k3_pro iso version 2023-05-18 17:09:09 +08:00
Adophoxia
88e4d60566 Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmware into dd-config-bt-playground 2023-05-14 16:22:46 -07:00
Adophoxia
06d108b2bb Move custom_lite options from rules.mk to info.json 2023-05-14 16:22:33 -07:00
lokher
d4619d470a fix fn2+J+Z not working on Q2 Pro 2023-05-08 14:46:22 +08:00
Adophoxia
6e114ceebd Move vid into main info.json for K and Q Pro 2023-04-29 13:18:38 -07:00
Adophoxia
5122a5d5ea DD-conversion for odd K-Pro series 2023-04-28 22:21:34 -07:00
Adophoxia
4c118095d2 Add DD-conversion for K2 Pro ANSI white 2023-04-28 21:45:08 -07:00
Adophoxia
3c9944d9ea DD-conversion for even K-Pro series 2023-04-28 20:40:16 -07:00
Adophoxia
3a7e8d6979 Rework DD-conversion for Q1 Pro - Q3 Pro 2023-04-28 20:38:57 -07:00
Adophoxia
fa0edb0b50 DD-configuration for Q Pro series 2023-04-27 21:17:56 -07:00
lokher
e4f4ceaf3f merge upstream 713427c 2023-04-26 16:32:15 +08:00
lokher
103badc87c fix led issue 2023-04-20 15:51:23 +08:00
lokher
4555003019
Merge pull request #115 from maximeBKT/bugfix_k6pro_ansi_white
fix: K6 Pro ANSI White LEDS
2023-04-18 11:35:18 +08:00
Jordan Kohl
c37a022656 Allow override of led_update_* at user level 2023-04-10 13:50:10 -06:00
maximeBKT
c06e7f669f fix: K6Pro ANSI White
- Wrong CAPS_LOCK_INDEX in config.h
- Missing right-CMD LED adress in white.c
2023-04-06 17:45:31 +02:00
lokher
b2f55d3142 fix setting REPORT_BUFFER_QUEUE_SIZE doesn't work correctly when it's greater than 256 2023-03-29 17:18:27 +08:00
lalalademaxiya1
957ceda5b5 Deleted VIA_QMK_RGBLIGHT_ENABLE 2023-03-17 09:59:12 +08:00
lalalademaxiya1
8ab6b59cca
Merge pull request #108 from lalalademaxiya1/bt_playground
Update Keychron K Pro series keyboards
2023-03-16 16:48:17 +08:00
lalalademaxiya1
0170134118 Update k6_pro_jis_rgb.json 2023-03-16 14:23:24 +08:00
lalalademaxiya1
0b639a4dee Update readme.md 2023-03-16 12:26:58 +08:00
lokher
77cbe1469a add q1_pro;add 'encoder_inerrupt_read' to encoder.c;change factory test key definition to config.h 2023-03-16 12:07:35 +08:00
lalalademaxiya1
1ff70d666a Added pal callback function for Q2Pro and Q3Pro 2023-03-16 11:49:53 +08:00
lalalademaxiya1
75e4424287 Update readme.md 2023-03-15 17:06:21 +08:00
lalalademaxiya1
c6243da12f Update Keychron K Pro series keyboards 2023-03-15 16:51:53 +08:00
Rodolfo González
dab3e7a789 rollback k3 pro pid 2023-03-13 20:31:51 -06:00
lalalademaxiya1
24fb09896c Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmware into bluetooth_playground 2023-03-02 17:32:36 +08:00
lalalademaxiya1
09c270ab0d Add some new boards
Added k1_pro, k5_pro, k9_pro, k13_pro, q2_pro and q3_pro.
2023-03-02 17:31:35 +08:00
lokher
dd3a745176 Add k7_pro and k10_pro; Update VIA json to match backlit effect list and fix k6_pro iso layout; Fix rtc issue 2023-03-02 12:12:18 +08:00
lokher
77f3d1738b add NEW_SAFE_RANGE to k3pro/k4_pro 2023-02-05 14:16:48 +08:00
lokher
7ed0fb55e3 Merge branch 'bluetooth_playground' of https://github.com/Keychron/qmk_firmware into bluetooth_playground 2023-02-05 14:14:22 +08:00
lokher
49580267aa fix via json error on VIA 2.10 2023-02-05 14:08:18 +08:00
lokher
c636c58088
Merge pull request #85 from campbellhennessy/saferange
Included NEW_SAFE_RANGE in Keychron K series enums
2023-02-03 09:33:40 +08:00
lokher
ff0bd3ffc5 remove keyboard_post_init_user in transport.c 2023-02-01 16:16:11 +08:00
lokher
03a173aced merge remote 2023-02-01 16:12:10 +08:00
lokher
cb53316c05 add k4_pro;add via json files 2023-02-01 16:00:45 +08:00
lokher
390f5b600b
Merge pull request #97 from stuartsoft/k6p
Update readme for K6 Pro
2023-01-19 21:39:50 +08:00
lalalademaxiya1
777cd7a3d5 Update K2 Pro 2023-01-16 17:37:06 +08:00
Stuart Bowman
6a13aeee3d edit readme.md 2023-01-13 00:56:37 -05:00
lokher
a0d162e03a change battery voltage meause and battery low indication; update from latest chibios hal 2023-01-12 15:50:37 +08:00
lokher
bbe437487d fix incorrect LED_CAPS_LOCK_PIN and use SPI to drive HC595 in k3_pro 2023-01-07 13:32:41 +08:00
lokher
f5d737cbbd Add k3_pro 2023-01-05 11:14:10 +08:00
lokher
eb2a2996e6 fix USB doesn't work after waking up from low power mode 2022-12-30 14:49:22 +08:00
Campbell
6937402920 Included NEW_SAFE_RANGE in Keychron K series enums 2022-12-26 00:35:51 -05:00
lokher
e7d97ceb04 fix via not working issue due to incorrect return type of via_command_kb() in k2/6/8_pro.c 2022-12-23 15:25:45 +08:00
lokher
093ea22832 Add k2_pro; Change LED_MATRIX_VAL_STEP to 16; Fix incorrect payload len in ckbt51.c 2022-12-14 15:46:29 +08:00
lokher
a336c2c500 Merge upstream master to 2022 Q4 breaking change 2022-12-07 15:50:49 +08:00
lokher
27fc28fd2f Merge upstream master 2022-12-06 17:04:10 +08:00
lokher
e736133392 resovle ocnfict 2022-12-06 14:45:54 +08:00
mechlovin
92354b2ca8
[Keyboard] Add Olly_Octagon PCB to QMK (#19128)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-04 21:03:41 +00:00
Charly Delay
af14b212b9
Re-structure splinky support to handle versioning in the same fashion as for the teensy (#19123) 2022-12-04 20:58:12 +00:00