summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron
Commit message (Collapse)AuthorAgeFilesLines
* rollback k3 pro pidRodolfo González2023-03-131-2/+2
|
* Merge branch 'bluetooth_playground' of ↵lalalademaxiya12023-03-0262-23/+5071
|\ | | | | | | https://github.com/Keychron/qmk_firmware into bluetooth_playground
| * Add k7_pro and k10_pro; Update VIA json to match backlit effect list and fix ↵lokher2023-03-0262-23/+5071
| | | | | | | | k6_pro iso layout; Fix rtc issue
* | Add some new boardslalalademaxiya12023-03-02121-41/+9787
|/ | | | Added k1_pro, k5_pro, k9_pro, k13_pro, q2_pro and q3_pro.
* add NEW_SAFE_RANGE to k3pro/k4_prolokher2023-02-052-0/+2
|
* Merge branch 'bluetooth_playground' of ↵lokher2023-02-053-0/+3
|\ | | | | | | https://github.com/Keychron/qmk_firmware into bluetooth_playground
| * Merge pull request #85 from campbellhennessy/saferangelokher2023-02-033-0/+3
| |\ | | | | | | Included NEW_SAFE_RANGE in Keychron K series enums
| | * Included NEW_SAFE_RANGE in Keychron K series enumsCampbell2022-12-263-0/+3
| | |
* | | fix via json error on VIA 2.10lokher2023-02-0512-38/+12
|/ /
* | remove keyboard_post_init_user in transport.clokher2023-02-012-7/+5
| |
* | merge remotelokher2023-02-016-26/+48
|\ \
| * \ Merge pull request #97 from stuartsoft/k6plokher2023-01-191-1/+1
| |\ \ | | | | | | | | Update readme for K6 Pro
| | * | edit readme.mdStuart Bowman2023-01-131-1/+1
| | | |
| * | | Update K2 Prolalalademaxiya12023-01-165-25/+47
| |/ /
* / / add k4_pro;add via json fileslokher2023-02-0145-3/+6146
|/ /
* | change battery voltage meause and battery low indication; update from ↵lokher2023-01-1235-177/+414
| | | | | | | | latest chibios hal
* | fix incorrect LED_CAPS_LOCK_PIN and use SPI to drive HC595 in k3_prolokher2023-01-074-3/+33
| |
* | Add k3_prolokher2023-01-0537-5/+2644
| |
* | fix USB doesn't work after waking up from low power modelokher2022-12-301-1/+5
|/
* fix via not working issue due to incorrect return type of via_command_kb() ↵lokher2022-12-233-4/+16
| | | | in k2/6/8_pro.c
* Add k2_pro; Change LED_MATRIX_VAL_STEP to 16; Fix incorrect payload len in ↵lokher2022-12-1440-5/+2650
| | | | ckbt51.c
* Merge upstream master to 2022 Q4 breaking changelokher2022-12-07431-20982/+661
|
* Merge upstream masterlokher2022-12-06323-274/+13599
|\
| * [Keyboard] Add Keychron Q8 (#19126)lalalademaxiya12022-12-0452-0/+2435
| |
| * Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (#19079)Ryan2022-11-272-3/+3
| |
| * Fixup keychron/q5 (#19119)jack2022-11-209-9/+11
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2022-11-2053-0/+2808
| |\
| | * [Keyboard] Keychron Q5 (#18283)lalalademaxiya12022-11-1953-0/+2808
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * | Fixup keychron/q6 (#19066)jack2022-11-149-9/+13
| | |
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-11-1353-0/+2939
| |\|
| | * [Keyboard] Keychron Q6 (#18288)lalalademaxiya12022-11-1253-0/+2939
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * | VIA V3 - The Custom UI Update (#18222)Wilba2022-11-102-15/+0
| | |
| * | Rollback unrelated changes from previous PR. (#19015)Nick Brassel2022-11-101-2/+12
| | |
| * | Fixup keychron/q1/iso_encoder (#19006)jack2022-11-092-3/+3
| | |
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-11-0814-12/+572
| |\|
| | * [Keyboard] Add ISO Encoder variant of Keychron Q1v1 (#18829)adophoxia2022-11-0814-12/+572
| | |
| * | Normalise Unicode keycodes (#18898)Ryan2022-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV` * `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*` * `UC_MAC` -> `UNICODE_MODE_MACOS` * `UC_LNX` -> `UNICODE_MODE_LINUX` * `UC_WIN` -> `UNICODE_MODE_WINDOWS` * `UC_BSD` -> `UNICODE_MODE_BSD` * `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE` * `UC_EMACS` -> `UNICODE_MODE_EMACS` * `UC__COUNT` -> `UNICODE_MODE_COUNT` * `UC_M_MA` -> `UC_MAC` * `UC_M_LN` -> `UC_LINX` * `UC_M_WI` -> `UC_WIN` * `UC_M_BS` -> `UC_BSD` * `UC_M_WC` -> `UC_WINC` * `UC_M_EM` -> `UC_EMAC` * Docs * Update quantum/unicode/unicode.h
| * | Deprecate `KC_LEAD` for `QK_LEAD` (#18792)Ryan2022-10-211-2/+2
| | |
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-211-0/+7
| |\|
| | * Keychron Q3 I2C & CKLED2001 transfer speedup (#18780)Stefan2022-10-201-0/+7
| | |
| * | Remove legacy keycodes, part 4 (#18683)Ryan2022-10-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `KC_PGDOWN` -> `KC_PGDN` * `KC_PSCREEN` -> `KC_PSCR` * `KC_SCOLON` -> `KC_SCLN` * `KC_BSLASH` -> `KC_BSLS` * `KC_BSPACE` -> `KC_BSPC`
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-131-1/+1
| |\|
| | * Update info.json of Q3 ISO with Encoder (#18697)lalalademaxiya12022-10-131-1/+1
| | | | | | | | | Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-1318-55/+55
| |\|
| | * Keychron Q3 Layout Touch-Up (#18696)James Young2022-10-1318-55/+55
| | |
| * | Fixup keychron/q3 (#18687)jack2022-10-1319-49/+51
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-1278-0/+4014
| |\|
| | * Keychron q3 (#16912)lalalademaxiya12022-10-1378-0/+4014
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com> Co-authored-by: bootstrapper <ido.samuelson@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
| * | Remove legacy keycodes, part 2 (#18660)Ryan2022-10-102-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `KC_SYSREQ` -> `KC_SYRQ` And one `KC_ALT_ERASE` -> `KC_ERAS` * `KC_NONUS_BSLASH` -> `KC_NUBS` * `KC_NUMLOCK` -> `KC_NUM` * `KC_CLCK` -> `KC_CAPS` * `KC_SCROLLLOCK` -> `KC_SCRL` * `KC_LBRACKET` -> `KC_LBRC` * `KC_RBRACKET` -> `KC_RBRC` * `KC_CAPSLOCK` -> `KC_CAPS`
| * | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0710-80/+46
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 08:28:02 +0000