1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

177 commits

Author SHA1 Message Date
Nick Brassel 81a3aa025c
Fix typo in keychron v6 encoder map enable (#22272) 2023-10-14 23:10:55 +11:00
lalalademaxiya1 8f757eece8
Add Keychron Q1 Version 2 (#20416)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Adophoxia <andyao1528@gmail.com>
2023-10-04 21:51:16 -07:00
Joel Challis 997a6747ee
Miscellaneous fixes for recently merged keyboards (#22179) 2023-10-02 11:49:53 +01:00
lalalademaxiya1 363dee82d8
Keychron q9 plus (#21399)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-09-20 22:45:36 -07:00
QMK Bot 2b7f1b0444 Merge remote-tracking branch 'origin/master' into develop 2023-08-23 09:13:38 +00:00
Sergey Vlasov b1fbfaaacc
keychron/c2_pro/ansi/white: Fix column 19 in the custom matrix (#21805)
Although `keychron/c2_pro/ansi/rgb` and `keychron/c2_pro/ansi/white` use
the same custom matrix code, the matrix layouts are slightly different;
in particular, only the `keychron/c2_pro/ansi/white` board actually uses
column 19.  However, the handling of column 19 in the custom matrix code
was broken, therefore that column did not work.

Looks like the custom matrix code assumes that `SHIFT_COL_END` refers to
the last column connected to the shift register, and not to the column
past that; so the value of `SHIFT_COL_END` needs to be changed from 19
to 18 (columns 11...18 are connected to the shift register, and column
19 is connected to the C14 pin).

Also the code which was determining `SIZE_T` and `UNSELECT_ALL_COL` had
an off-by-one bug when counting the required number of bits (again due
to the confusion on the `SHIFT_COL_END` meaning); this had been fixed
too (the actual behavior of that part of the code did not change,
because both the old and the new version select the 8 bit variant).
2023-08-23 10:13:03 +01:00
Ryan 37bc949945
RGB Matrix: driver naming cleanups (#21594) 2023-08-23 01:00:03 +01:00
QMK Bot 242b8c7f3d Merge remote-tracking branch 'origin/master' into develop 2023-08-01 03:14:59 +00:00
Sergey Vlasov d16d87c2f3
Keychron Q11 ISO: Fix left Shift breakage due to a wrong matrix mask (#21655)
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.
2023-08-01 04:14:20 +01:00
Ryan 571b8bac82
LED Matrix: driver naming cleanups (#21580) 2023-07-29 15:25:00 +10:00
QMK Bot 2db947fda6 Merge remote-tracking branch 'origin/master' into develop 2023-07-28 14:56:52 +00:00
lalalademaxiya1 03b3840942
Updated info.json of c2 pro (#21581) 2023-07-28 15:54:32 +01:00
QMK Bot f1ec22726b Merge remote-tracking branch 'origin/master' into develop 2023-07-25 03:05:51 +00:00
Kumiko as a Service 855c03d445
Add Caps Lock indicator for Kyechron S1 white backlight version (#21559) 2023-07-24 21:05:17 -06:00
QMK Bot d095fe4436 Merge remote-tracking branch 'origin/master' into develop 2023-07-18 02:48:51 +00:00
James Young 5252f7f697
Keychron V4 Touch-Up (#21545)
* 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
2023-07-17 19:48:11 -07:00
fauxpark 0f3a5a001c Merge remote-tracking branch 'upstream/master' into develop 2023-07-07 11:59:56 +10:00
lalalademaxiya1 bf3a80d86c
[Keyboard] Keychron Q11 ISO Version (#21438) 2023-07-06 00:50:43 -06:00
Nick Brassel 416af0171c
Remove CORTEX_ENABLE_WFI_IDLE from keyboards. (#21353)
* Remove CORTEX_ENABLE_WFI_IDLE from the codebase.

* Turn on CORTEX_ENABLE_WFI_IDLE by default.
2023-06-23 20:31:25 +01:00
QMK Bot 3274e0a4d5 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 03:05:47 +00:00
lalalademaxiya1 ecca9c5459
Add Keychron C2 Pro (#20701)
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>
2023-06-20 21:05:07 -06:00
QMK Bot 01cfc72b57 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:42:27 +00:00
lalalademaxiya1 45c52c742e
[Keyboard] Add Keychron C1 Pro (#20700)
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>
2023-06-20 09:41:45 -06:00
Ryan a4ed6ad0f5
Unicodemap keycodes rename (#21092) 2023-06-01 17:25:08 +01:00
Joel Challis 4ae45ca995
Tidy up encoder_map directions (#20847) 2023-05-10 22:55:49 +01:00
QMK Bot d8b57f0455 Merge remote-tracking branch 'origin/master' into develop 2023-05-06 20:33:54 +00:00
eatmyvenom db229d7341
Add vnmm keymaps and userspace (#20446)
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-05-06 14:32:51 -06:00
Ryan a5e46d8082
More info.json whitespace cleanups (#20665) 2023-05-03 12:19:34 +10:00
Ryan 79aa319946
info.json whitespace cleanups (#20651) 2023-05-02 08:25:15 +10:00
Ryan 12d42cedd2
Move FORCE_NKRO to data driven (#20604) 2023-05-01 13:33:10 +10:00
QMK Bot 33e926b856 Merge remote-tracking branch 'origin/master' into develop 2023-04-27 18:18:05 +00:00
adophoxia 64b84385cd
Fix up positioning of keys for Keychron Q10/V10 and Q6/V6 (#20582) 2023-04-27 19:17:21 +01:00
Nick Brassel c9f619124d
Encodermap direction define. (#20454) 2023-04-15 16:18:44 +01:00
QMK Bot e699724645 Merge remote-tracking branch 'origin/master' into develop 2023-04-12 10:11:37 +00:00
Mike Killewald 75edefe541
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (#20420) 2023-04-12 11:10:50 +01:00
Ryan 522048725f
Move RGB_MATRIX_DRIVER to data driven (#20350) 2023-04-08 18:08:08 +10:00
QMK Bot 6334805da3 Merge remote-tracking branch 'origin/master' into develop 2023-04-06 18:03:03 +00:00
lalalademaxiya1 655c24d29d
[Keyboard] Add Keychron Q11 (#20125)
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>
2023-04-06 11:02:24 -07:00
adophoxia 147d397e34
Move Keychron Q0 and Q0 Plus data-driven configuration; keychron keymap rules.mk cleanup (#20168)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-04-04 13:26:54 +10:00
jack 36ab0c0aaa
Add core/fallback encoder behaviour (#20320) 2023-04-03 10:18:17 -06:00
Ryan 3c144fac5e
Clean up usage of QMK_KEYBOARD_H (#20167) 2023-03-20 08:12:05 +11:00
Ryan 9dbee3e23d
Remove useless "ifdef KEYBOARD_*" (#20078)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-03-16 20:18:33 +11:00
Drashna Jael're 72da3ee63e
Merge remote-tracking branch 'origin/master' into develop 2023-03-16 00:50:29 -07:00
lalalademaxiya1 2f7a06cf73
Update keychron_common.c (#20055) 2023-03-16 12:30:09 +11:00
Ryan 1022afa6c2
Move matrix config to info.json, part 8 (#20030) 2023-03-11 04:59:07 +11:00
lalalademaxiya1 77f7351991
Add Keychron Q12 (#19844)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-04 11:53:09 +11:00
Ryan 7e0299117b
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-26 09:45:12 +11:00
jack 9b410a9214
Remove VIA specific use of MACRO0* (#19918) 2023-02-23 18:54:01 +00:00
Nick Brassel 7f805cc779
VIA Protocol 12 + fixes (#19916)
Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
2023-02-23 09:19:00 +11:00
Ryan 499fc3b85e
Add some missing #pragma onces (#19902) 2023-02-21 15:55:23 +00:00