summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron
Commit message (Collapse)AuthorAgeFilesLines
* RGB Matrix: driver naming cleanups (#21594)Ryan2023-08-2385-85/+85
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-08-011-2/+2
|\
| * Keychron Q11 ISO: Fix left Shift breakage due to a wrong matrix mask (#21655)Sergey Vlasov2023-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keychron Q11 uses `matrix_mask` to mask away the matrix location used for `SPLIT_HAND_MATRIX_GRID` (otherwise the keyboard will constantly generate a wakeup request whenever the host enters suspend). However, the value of `matrix_mask` is actually chosen to mask away all unused locations, but it was apparently generated for the ANSI board and therefore masks away the left Shift key on the ISO board, breaking the functionality of that key. Fix `matrix_mask` to make the masking work as intended: - Set the `[4, 1]` bit to 1; this is the matrix location for the ISO left Shift. - Set the `[2, 5]` bit to 0; this is actually the matrix location which corresponds to `#define SPLIT_HAND_MATRIX_GRID A2, A15` on the left side, which was intended to be masked; apparently the wakeup problem does not happen due to `SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT`, so the left half actually has that matrix location open. On the right side `A2, A15` is `[9, 6]`, which was masked off correctly.
* | LED Matrix: driver naming cleanups (#21580)Ryan2023-07-293-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-281-0/+1
|\|
| * Updated info.json of c2 pro (#21581)lalalademaxiya12023-07-281-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-252-3/+50
|\|
| * Add Caps Lock indicator for Kyechron S1 white backlight version (#21559)Kumiko as a Service2023-07-242-3/+50
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-188-33/+41
|\|
| * Keychron V4 Touch-Up (#21545)James Young2023-07-178-33/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | * Keychron V4 ANSI: rename LAYOUT_ansi_61 to LAYOUT_60_ansi * Keychron V4 ANSI: enable Community Layout support * Keychron V4 ISO: correct layout data Move position [3, 1] up by 0.25u. * Keychron V4 ISO: rename LAYOUT_iso_62 to LAYOUT_60_iso * Keychron V4 ISO: enable Community Layout support
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2023-07-0721-344/+956
|\|
| * [Keyboard] Keychron Q11 ISO Version (#21438)lalalademaxiya12023-07-0621-350/+958
| |
* | Remove CORTEX_ENABLE_WFI_IDLE from keyboards. (#21353)Nick Brassel2023-06-2384-237/+0
| | | | | | | | | | * Remove CORTEX_ENABLE_WFI_IDLE from the codebase. * Turn on CORTEX_ENABLE_WFI_IDLE by default.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-2125-0/+1781
|\|
| * Add Keychron C2 Pro (#20701)lalalademaxiya12023-06-2025-0/+1781
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-2024-0/+1478
|\|
| * [Keyboard] Add Keychron C1 Pro (#20700)lalalademaxiya12023-06-2024-0/+1478
| | | | | | | | | | | | Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Unicodemap keycodes rename (#21092)Ryan2023-06-011-2/+2
|/
* Tidy up encoder_map directions (#20847)Joel Challis2023-05-101-1/+1
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-05-068-0/+212
|\
| * Add vnmm keymaps and userspace (#20446)eatmyvenom2023-05-068-0/+212
| | | | | | | | Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | More `info.json` whitespace cleanups (#20665)Ryan2023-05-0384-6760/+6761
| |
* | `info.json` whitespace cleanups (#20651)Ryan2023-05-0282-2869/+2868
| |
* | Move `FORCE_NKRO` to data driven (#20604)Ryan2023-05-015-7/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-274-4/+4
|\|
| * Fix up positioning of keys for Keychron Q10/V10 and Q6/V6 (#20582)adophoxia2023-04-274-4/+4
| |
* | Encodermap direction define. (#20454)Nick Brassel2023-04-15120-120/+120
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-121-2/+2
|\|
| * fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (#20420)Mike Killewald2023-04-121-2/+2
| |
* | Move `RGB_MATRIX_DRIVER` to data driven (#20350)Ryan2023-04-08162-81/+243
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-0615-0/+958
|\|
| * [Keyboard] Add Keychron Q11 (#20125)lalalademaxiya12023-04-0615-0/+958
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Move Keychron Q0 and Q0 Plus data-driven configuration; `keychron` keymap ↵adophoxia2023-04-049-156/+145
| | | | | | | | | | | | `rules.mk` cleanup (#20168) Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Add core/fallback encoder behaviour (#20320)jack2023-04-032-28/+0
| |
* | Clean up usage of `QMK_KEYBOARD_H` (#20167)Ryan2023-03-202-2/+6
| |
* | Remove useless "ifdef KEYBOARD_*" (#20078)Ryan2023-03-1681-961/+37
| | | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2023-03-161-0/+14
|\|
| * Update keychron_common.c (#20055)lalalademaxiya12023-03-161-0/+14
| |
* | Move matrix config to info.json, part 8 (#20030)Ryan2023-03-1161-121/+210
|/
* Add Keychron Q12 (#19844)lalalademaxiya12023-03-0426-0/+1647
| | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* Move encoder config to data driven (#19923)Ryan2023-02-2674-116/+185
| | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* Remove VIA specific use of `MACRO0*` (#19918)jack2023-02-236-60/+60
|
* VIA Protocol 12 + fixes (#19916)Nick Brassel2023-02-2312-91/+74
| | | | | Co-authored-by: Wilba <wilba@wilba.tech> Co-authored-by: zvecr <git@zvecr.com>
* Add some missing `#pragma once`s (#19902)Ryan2023-02-216-0/+12
|
* Move `KC_MISSION_CONTROL`/`KC_LAUNCHPAD` keycodes to core (#19884)Joel Challis2023-02-198-151/+7
|
* Remove matrix size defines (#19581)Ryan2023-02-175-20/+0
|
* Move Bootmagic config to data driven (#19860)Ryan2023-02-1710-16/+18
|
* Refactor Leader key feature (#19632)Ryan2023-02-131-58/+52
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* Merge remote-tracking branch 'upstream/master' into developfauxpark2023-02-1026-8/+1068
|\
| * Update info.json for Keychron V10 (#19791)lalalademaxiya12023-02-091-1/+1
| |