QMK Bot
2b991b2b10
Merge remote-tracking branch 'origin/develop' into xap
2023-08-14 06:13:38 +00:00
HorrorTroll
3da773dbdb
[Keyboard] Refactor Caticorn PCB ( #21644 )
2023-08-13 23:12:59 -07:00
QMK Bot
6f9adf1ef4
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 18:14:27 +00:00
QMK Bot
82764b7586
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 18:13:48 +00:00
jonylee@hfd
8d0e9e00c1
[Keyboard] Add mk47 keyboard ( #19797 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Joy Lee <joylee.lc@foxmail.com>
2023-08-12 11:13:08 -07:00
QMK Bot
7c848af31b
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 09:02:07 +00:00
QMK Bot
1eb70be457
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 08:58:09 +00:00
QMK Bot
18dcce7643
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 08:57:38 +00:00
Duncan Sutherland
6f638572d8
[Keyboard] Update USB settings for dactyl_maximus ( #21666 )
2023-08-12 01:54:20 -07:00
QMK Bot
43f1f9bd44
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 08:54:17 +00:00
spbgzh
e4e90fa113
[Keyboard] fix json for nemui65 ( #21629 )
2023-08-12 01:53:28 -07:00
QMK Bot
cabab1ba42
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 08:53:19 +00:00
QMK Bot
634989d300
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 08:52:45 +00:00
Brian McKenna
3831407da9
[Keymap] Add Via keymap for CXT Studio ( #21675 )
2023-08-12 01:52:11 -07:00
QMK Bot
4a90bfb582
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 08:50:59 +00:00
QMK Bot
6a2c53e91d
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 08:50:25 +00:00
gskygithub
a0c99e3431
[Keyboard] Add Projectd/65/Projectd_65_ansi ( #21520 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>
2023-08-12 01:49:47 -07:00
QMK Bot
91952d219e
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 08:43:19 +00:00
QMK Bot
0294881832
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 08:42:38 +00:00
Duncan Sutherland
75d84e5f64
[Keyboard] add laneware raindrop
keyboard ( #21277 )
...
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-08-12 01:42:04 -07:00
QMK Bot
2347502af8
Merge remote-tracking branch 'origin/develop' into xap
2023-08-12 08:21:58 +00:00
QMK Bot
dfec8f74fb
Merge remote-tracking branch 'origin/master' into develop
2023-08-12 08:21:24 +00:00
Duncan Sutherland
e4716d2445
[Keyboard] Update usb.* of dactyl_lightcycle
( #21462 )
2023-08-12 01:20:48 -07:00
QMK Bot
f98fe4c00a
Merge remote-tracking branch 'origin/develop' into xap
2023-08-09 03:44:19 +00:00
Joel Challis
c9e6669179
Tidy up encoder in matrix references ( #21718 )
2023-08-09 04:43:47 +01:00
QMK Bot
7be0e718e9
Merge remote-tracking branch 'origin/develop' into xap
2023-08-08 08:07:12 +00:00
Joel Challis
805324c456
Remove more legacy config.h options ( #21709 )
2023-08-08 09:06:38 +01:00
QMK Bot
3c03799d5a
Merge remote-tracking branch 'origin/develop' into xap
2023-08-07 23:28:12 +00:00
Ryan
b4fb445dbf
doio/kb38: fix layout ( #21704 )
2023-08-08 00:27:36 +01:00
QMK Bot
6cb6765d73
Merge remote-tracking branch 'origin/develop' into xap
2023-08-06 17:14:27 +00:00
QMK Bot
2e67945033
Merge remote-tracking branch 'origin/master' into develop
2023-08-06 17:13:52 +00:00
Ryan
d52bafade3
Fix binepad/bn009
and durgod/dgk6x/hades_ansi
keymaps ( #21701 )
2023-08-06 18:13:20 +01:00
QMK Bot
44bc2a8897
Merge remote-tracking branch 'origin/develop' into xap
2023-08-04 00:16:59 +00:00
Ryan
0b802defd4
haptic: further naming cleanups ( #21682 )
2023-08-04 01:16:16 +01:00
QMK Bot
20fa7d1fc7
Merge remote-tracking branch 'origin/develop' into xap
2023-08-03 08:04:55 +00:00
QMK Bot
c9fa2006d9
Merge remote-tracking branch 'origin/master' into develop
2023-08-03 08:04:04 +00:00
Hugh Rawlinson
37b62606ce
Add VIA layout for Dactyl Manuform 5x6 ( #21649 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-08-03 01:03:29 -07:00
QMK Bot
0458c9c934
Merge remote-tracking branch 'origin/develop' into xap
2023-08-03 04:21:22 +00:00
SmollChungus
f0542894da
[Keyboard] Add PW88 keyboard ( #21482 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-08-02 21:20:48 -07:00
QMK Bot
6bbe0e6d92
Merge remote-tracking branch 'origin/develop' into xap
2023-08-03 00:04:41 +00:00
QMK Bot
61416285f4
Merge remote-tracking branch 'origin/master' into develop
2023-08-03 00:04:04 +00:00
Ryan
19536b8190
moondrop/dash75: fix keymap ( #21680 )
2023-08-03 01:03:25 +01:00
QMK Bot
fadb4ef2d3
Merge remote-tracking branch 'origin/develop' into xap
2023-08-02 17:06:33 +00:00
QMK Bot
d232f60c01
Merge remote-tracking branch 'origin/master' into develop
2023-08-02 17:05:36 +00:00
Synth and Keys
34a2f14274
[Keyboard] Add Bento Box macropad ( #20521 )
2023-08-02 10:05:00 -07:00
QMK Bot
d83199427a
Merge remote-tracking branch 'origin/develop' into xap
2023-08-02 08:16:33 +00:00
James Young
7fbc4153e8
Automata02 Alisaie Develop Touch-Up ( #21630 )
2023-08-02 01:15:56 -07:00
QMK Bot
24be0cf27c
Merge remote-tracking branch 'origin/develop' into xap
2023-08-01 03:15:40 +00: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