Commit Graph

285 Commits

Author SHA1 Message Date
adophoxia
5f33a251b3
Update Keychron Q0 (#22068)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-04 21:59:06 -07:00
QMK Bot
d30fe46b51 Merge remote-tracking branch 'origin/master' into develop 2023-10-05 04:51:51 +00: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
Ryan
d99dbe4d56
Update ISSI LED types (#22099) 2023-10-04 20:12:50 +11:00
Ryan
c0f16be50f
Rename CKLED2001 driver to SNLED27351 (#22071) 2023-10-04 20:10:05 +11:00
adophoxia
38f89dfc2f
Update Keychron Q1v1 (#21993)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-10-03 20:53:39 -07:00
adophoxia
6f59236b1f
Update Keychron Q3 (#21995)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-10-03 20:53:19 -07:00
adophoxia
75ba2db2c1
Update Keychron Q2 (#21994)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-10-03 20:52:09 -07:00
QMK Bot
6e3f770d0d Merge remote-tracking branch 'origin/master' into develop 2023-10-02 10:50:26 +00:00
Joel Challis
997a6747ee
Miscellaneous fixes for recently merged keyboards (#22179) 2023-10-02 11:49:53 +01:00
QMK Bot
3062c98093 Merge remote-tracking branch 'origin/master' into develop 2023-09-21 05:46:11 +00: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
Ryan
8f22105289
Add and use I2C address defines for ISSI LED drivers (#22008) 2023-09-19 19:31:54 +10:00
Ryan
1cbb5ae99e
is31fl3733: driver naming cleanups (#21905) 2023-09-13 22:52:16 +10:00
Ryan
35aceab1a4
ckled2001: driver naming cleanups (#21890) 2023-09-13 22:47:01 +10:00
Joel Challis
8975dc6c3b
Remove duplication of STM32L432 EEPROM defaults (#21981) 2023-09-12 10:09:31 +01:00
Ilya Zhuravlev
e390a34128 Merge remote-tracking branch 'qmk/master' into merge-2023-09-08 2023-09-08 20:53:27 -06: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
Kumiko as a Service
2645e9d241
Add Vial support for Keychron S1 ANSI RGB (#504) 2023-07-22 11:03:20 -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
Adophoxia
e0a94581cb Add in new Vial UID for ansi_encoder 2023-07-16 02:58:56 -07:00
Adophoxia
4828aecf93 Fix-up Q11 and add iso_encoder variant 2023-07-16 02:56:36 -07:00
Ilya Zhuravlev
1d91042f7e fix some failing keyboards 2023-07-15 23:54:55 -06:00
Ilya Zhuravlev
c05356439e Merge branch 'vial' into merge-2023-06-03 2023-07-15 22:23:48 -06: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
adophoxia
8af2f452f1
Added back original code for keychron/q7/ansi/keymaps/vial/config.h (#489) 2023-06-26 19:58:20 -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
Ilya Zhuravlev
d6e95213e3 Merge remote-tracking branch 'qmk/master' into merge-2023-06-03 2023-06-03 12:35:25 -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
adophoxia
6bea951a12
Add missing layer dip switch code for Keychron V2 (#447)
* Add missing layer `dip switch` for Keychron V2

* Add missing `#if defined` block in `v2.c`
2023-04-30 21:32:35 -06: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
adophoxia
4b9687098d
Update Q0; Port Keychron Q0 Plus to VIAL (#416)
* Update Q0; Port Keychron Q0 Plus to VIAL

* Update VIAL UIDs for Q0 and Q0 Plus

* Remove `via` keymaps and mentions of `VIA_ENABLE = yes` for `keychron` keymaps for Q0 and Q0 Plus

* Update readme.md

* Add VIAL-specific flags for `vial` keymap
2023-04-09 19:02:39 -06:00
adophoxia
ba1ebf348e
Port Keychron Q11 to VIAL (#413)
* Port Keychron Q11 to VIAL

* Add back removed `KC_TASK` and `KC_FLXP` keycodes in `default` and `via` keymaps

* Sync #20125 from `qmk/master`
2023-04-09 19:01:59 -06: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
Less/Rikki
45fd373661
March merge additions (#417)
* fixup: update Vial keymaps per upstream reqs

more keycodes renamed

`rgb_matrix_indicators_user` return type switched to bool

keymaps/encoder maps that exceeded DYNAMIC_KEYMAP_LAYER_COUNT had excess
layers removed

EOL spaces and backslashes removed from keymaps

* fixup: DRIVER_LED_TOTAL --> RGB_MATRIX_LED_COUNT

* fixup: Vial-exclusive keyboard configs

* fixup: 42keebs rules

* fixup: relocated Vial keymaps

* fixup: cleanup post-keymap move

Remove wavtype/p01_ultra keymaps that went into QMK under different names

Fix handwired/misterdeck and 4pplet/waffling60/rev_c keymaps

* fixup: Vial-exclusive default keymaps

* fixup: remove broken via-only keymaps

compiling VIA keymaps is not supported anyway

* fixup: non-compiling Vial keymaps

* refactor: changes from QMK PR, fix Vial keymap
2023-03-20 10:33:07 -06:00
Ryan
3c144fac5e
Clean up usage of QMK_KEYBOARD_H (#20167) 2023-03-20 08:12:05 +11:00
Ilya Zhuravlev
2ec3ba62cd fix renamed keycodes 2023-03-19 12:05:44 -06:00
Ilya Zhuravlev
06a2fdcc9c Merge remote-tracking branch 'qmk/master' into merge-2023-03-12 2023-03-18 17:51:58 -06: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
adophoxia
1a0527b66e
Port Keychron Q2 to VIAL; Reattempt (#407) 2023-03-12 15:00:55 -06:00
Ryan
1022afa6c2
Move matrix config to info.json, part 8 (#20030) 2023-03-11 04:59:07 +11:00
adophoxia
dd5c7ec956
Port Keychron Q12 to VIAL (#401)
* Port Keychron Q12 to VIAL

* Update VIAL UIDs for Keychron Q12
2023-03-08 22:37:00 -06:00
adophoxia
715f0d4fd5
Port Keychron Q60 to VIAL (#400) 2023-03-08 22:36:46 -06:00
adophoxia
04607ebb2a
Port Keychron Q65 to VIAL (#399) 2023-03-08 22:36:35 -06:00
adophoxia
d28de196a5
Port Keychron V10 to VIAL (#398)
* Port Keychron V10 to VIAL

* Fixup `vial.json` for ISO Encoder V10
2023-03-08 22:36:24 -06:00
adophoxia
5533a587e8
Port Keychron V6 to VIAL (#397) 2023-03-08 22:36:09 -06:00
adophoxia
f7120f436d
Fix spelling for VIALRGB_ENABLE, causing VIAL [GUI] to not open right. (#396) 2023-03-07 02:40:40 -06: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
Joel Challis
0152dd811d
Move KC_MISSION_CONTROL/KC_LAUNCHPAD keycodes to core (#19884) 2023-02-19 18:59:50 +11:00
adophoxia
db572f8998
Port Keychron V8 to VIAL (#373)
* Port Keychron V8 to VIAL

* Add missing `VIAL_ENABLE` and `VIALRGB_ENABLE` flags in keymap `rules.mk` for ANSI variant of V8

* Change 2nd key for unlock combo to correct index for the ISO variants of the V7
2023-02-17 01:23:21 -06:00
adophoxia
52c1278d6d
Port Keychron V7 to VIAL (#372)
* Port Keychron V7 to VIAL

* Correctly use `vial.json` for ISO V7

* Change 2nd key for unlock combo to correct index for the ISO variant of the V7
2023-02-17 01:23:15 -06:00
adophoxia
239fc0adad
Port Keychron V5 to VIAL (#371)
* Port Keychron V5 to VIAL

* Change 2nd for unlock combo to correct index for the ANSI and ISO variants of the V5
2023-02-17 01:23:10 -06:00
adophoxia
cc9320cc17
Port Keychron V4 to VIAL (#370)
* Port Keychron V4 to VIAL

* Change 2nd for unlock combo to correct index for the ISO variant of the V4
2023-02-17 01:23:04 -06:00
adophoxia
6c002a618b
Port Keychron V3 to VIAL (#369)
* Port Keychron V3 to VIAL

* Update vial.json for Keychron V3 `jis_encoder` variant

* Change 2nd for unlock combo to correct index for the ANSI variants of the V3

* Change `rgb_matrix_indicators_advanced_kb` function to void

* Revert references of `RGB_MATRIX_LED_COUNT` to `DRIVER_LED_TOTAL`
2023-02-17 01:22:58 -06:00
adophoxia
3d64a1f1c7
Port Keychron V2 to VIAL (#368)
* Port Keychron V2 to VIAL

* Change 2nd for unlock combo to correct index for ISO and JIS variants of the V2
2023-02-17 01:22:49 -06:00
adophoxia
4190085d2d
Port Keychron V1 to VIAL (#367)
* Port Keychron V1 to VIAL

* Update VIAL UIDs for ISO variants of Keychron V1

* Move index to top right for (5,6) right modifier key

* Change 2nd key for unlock combo to correct index for ANSI variants of V1
2023-02-17 01:22:37 -06:00
Ryan
2da0827d4f
Remove matrix size defines (#19581) 2023-02-17 16:08:25 +11:00
Ryan
d784f78bd0
Move Bootmagic config to data driven (#19860) 2023-02-17 08:49:49 +11:00
Ryan
bbf7a20b33
Refactor Leader key feature (#19632)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-13 03:19:02 +11:00
fauxpark
50cd320616 Merge remote-tracking branch 'upstream/master' into develop 2023-02-10 20:19:08 +11:00
lalalademaxiya1
5208361dcb
Update info.json for Keychron V10 (#19791) 2023-02-09 20:54:40 -07:00
lalalademaxiya1
f07841cce3
[Keyboard] Added JIS version for Keychron Q2 (#19491)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-09 12:40:17 -08:00
Ryan
f9aeea64c1
Migrate MCU and BOOTLOADER to data-driven (#19529) 2023-02-08 18:41:46 +11:00
Ryan
ebb512db82
Debounce defines cleanup (#19742)
* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
2023-02-03 19:19:58 +00:00
QMK Bot
8c0267c0eb Merge remote-tracking branch 'origin/master' into develop 2023-02-02 21:34:50 +00:00