Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5301 commits
Select commit Hold shift + click to select a range
65c7b96
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
daba313
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
58eb695
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
0da4746
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
488b772
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
004bb9e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
21813fb
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
2be07cd
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
d335326
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
a7404ef
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
df15c35
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
0346577
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
28fdf92
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
c47f26e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
dc0b865
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 9, 2025
459cef6
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
f7d9f26
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
3a30e0f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
012b459
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
54ac3b0
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
f5b5f47
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
c392219
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
3f40de3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
a4a570a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 10, 2025
c2999db
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
fa39a10
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
fd990b1
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
d445ae1
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
e86637c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
7db2240
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
2fc0bb8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
dc0ef1b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 11, 2025
8a23c76
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 12, 2025
ab2bed9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 12, 2025
f23b268
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 12, 2025
e7157ca
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 12, 2025
b54acf2
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 12, 2025
1c4b813
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 19, 2025
90bd25c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 20, 2025
3a1e8dc
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 21, 2025
62d3c1e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 21, 2025
f7fabf5
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 29, 2025
1030897
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 29, 2025
2215a1f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 29, 2025
6967c19
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 30, 2025
c6ee849
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Sep 30, 2025
1af7076
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 5, 2025
97e67c3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 5, 2025
2411630
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 5, 2025
18ed374
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 5, 2025
ecba7f9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
be13a90
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
c851f2d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
b481a3a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
49309b3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
99fafda
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
371ea93
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
1e99a3e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 6, 2025
5a7d91e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 7, 2025
9823e6a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 8, 2025
28b7455
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 8, 2025
9509f47
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 8, 2025
58dafac
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 8, 2025
f3d4ec2
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 8, 2025
4772f71
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 10, 2025
803b51c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 11, 2025
f617ca3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 13, 2025
87e5772
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 14, 2025
aa90cd0
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 18, 2025
ac027c9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 18, 2025
2c49fd1
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 19, 2025
b3ed308
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 20, 2025
10463b9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 21, 2025
34ae13f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 22, 2025
d4e44a1
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 23, 2025
1c826a5
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 23, 2025
c40af3b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 26, 2025
3789fd0
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 27, 2025
69d90c3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 27, 2025
8ffece9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 28, 2025
dd5e348
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 30, 2025
a8bd5b5
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Oct 30, 2025
13defe1
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 1, 2025
c98c72b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 2, 2025
aa48e93
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 2, 2025
e1d5875
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 2, 2025
e507f07
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 4, 2025
6412598
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 4, 2025
50d3ff4
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 4, 2025
107299b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 4, 2025
fdc48d7
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 6, 2025
67b80da
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 6, 2025
e446361
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 6, 2025
c8db411
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 6, 2025
32f19de
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 8, 2025
e2871a8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 8, 2025
19ae2a3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 8, 2025
9535245
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 8, 2025
612110f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
55959db
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
beaedd9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
be5e4ec
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
775c510
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
19bcb53
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
373b13b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
096f3c0
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
39d54bc
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
8876580
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 11, 2025
130cbac
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 17, 2025
1e76cec
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 17, 2025
dc372d8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 17, 2025
f6ff90f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 17, 2025
06abad9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 19, 2025
a9e3565
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 19, 2025
e367d4c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 21, 2025
8c42243
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 22, 2025
61d83ee
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 22, 2025
b4c5043
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
cb6b77e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
8ac1d80
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
7421f8a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
4a5c256
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
93416a4
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
2cc4b4f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 23, 2025
dc07a52
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 25, 2025
3dbe6ed
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 25, 2025
6e20a3c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 27, 2025
17dd166
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 27, 2025
fdf0c53
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 27, 2025
a95ec7a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 30, 2025
be72ad4
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Nov 30, 2025
1474b84
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 1, 2025
885ed08
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 1, 2025
0fb91c4
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 1, 2025
6065d61
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 1, 2025
f7dc671
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 1, 2025
40d432d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 1, 2025
e46aaf8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 4, 2025
dcdcd36
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 4, 2025
aadc670
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 4, 2025
15952e9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 4, 2025
192cf4c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 5, 2025
0150b7b
clang-format-19 formatting fixes
zvecr Dec 7, 2025
5d35125
Merge remote-tracking branch 'upstream/develop' into xap
zvecr Dec 12, 2025
22c3e42
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 12, 2025
81a855d
Merge remote-tracking branch 'origin/develop' into xap
zvecr Dec 15, 2025
2d0ab8a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 19, 2025
078aff5
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 19, 2025
49a73d8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 19, 2025
9c33bbf
Fix zvecr/zv48:xap keymap
zvecr Dec 19, 2025
5a72eed
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 20, 2025
60d5be8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 21, 2025
3d1afd6
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 21, 2025
518a7d3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 22, 2025
8566c74
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 23, 2025
b014822
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Dec 25, 2025
1e0ca11
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 1, 2026
f105a37
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 1, 2026
4b60090
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 3, 2026
6b43b89
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 3, 2026
2e04c31
Regenerate Files
zvecr Jan 3, 2026
804b92a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 3, 2026
ab38b26
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 3, 2026
f833206
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 3, 2026
9875e51
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 7, 2026
1abc001
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 7, 2026
5471518
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 7, 2026
9df0433
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 8, 2026
07a1fc1
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 8, 2026
6899daf
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 9, 2026
22996d0
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 9, 2026
cefb7e2
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 10, 2026
18cde84
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 10, 2026
36a2535
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 11, 2026
264e6e8
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 11, 2026
61ab332
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 11, 2026
91fdd9c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 11, 2026
27eb488
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 11, 2026
bc7fb3b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 13, 2026
9657e83
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 14, 2026
4be7a00
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 15, 2026
e05848d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 20, 2026
14e1fd3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Jan 25, 2026
e702976
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 6, 2026
1f456c3
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 9, 2026
edf7adb
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 10, 2026
de437c7
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 10, 2026
878391d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 10, 2026
4771c14
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 10, 2026
75537cc
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 10, 2026
fbe4687
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 10, 2026
f688c88
Merge remote-tracking branch 'origin/develop' into xap
zvecr Feb 11, 2026
4523af0
lint
zvecr Feb 11, 2026
58422d6
lint
zvecr Feb 11, 2026
6da89f9
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 11, 2026
38188a2
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 11, 2026
70be711
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 12, 2026
67efc04
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 12, 2026
b0bf640
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 13, 2026
38492d2
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 13, 2026
263d23f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 13, 2026
b79ee13
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 13, 2026
38f3855
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 13, 2026
ac3c74e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 16, 2026
c5addcb
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 17, 2026
679749f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 17, 2026
0d98902
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 18, 2026
8a0e9fa
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 19, 2026
d815b9d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 20, 2026
ec9e954
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 20, 2026
aba76c4
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 20, 2026
f66d5cd
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Feb 24, 2026
a29b169
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 7, 2026
1746e69
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 7, 2026
ea94690
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 8, 2026
0ea8f61
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 8, 2026
b1b3f4b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 9, 2026
5799d5f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 9, 2026
a8a82ee
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 10, 2026
1f74879
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 10, 2026
8c46482
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 10, 2026
87df03c
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 11, 2026
b68bf76
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 12, 2026
fff5b19
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 13, 2026
54a6553
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 13, 2026
c9506cd
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 13, 2026
fc9420a
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 13, 2026
afb6ed0
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 14, 2026
32fc471
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 14, 2026
ab0e3a5
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
a66735f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
f381d1d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
fb297ec
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
e152ef4
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
b7d8140
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
58e5a85
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 15, 2026
f410dce
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 16, 2026
a5f8e0e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 16, 2026
ce68744
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 16, 2026
63b1ad5
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 16, 2026
bf9ab21
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 16, 2026
8452e51
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 19, 2026
007283e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 19, 2026
a9602d2
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 19, 2026
203387f
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 19, 2026
3c04435
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 27, 2026
c14d93d
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 27, 2026
1299040
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 28, 2026
c6ec76b
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 28, 2026
56f975e
Merge remote-tracking branch 'origin/develop' into xap
qmk-bot Mar 28, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ secrets.tar
# Python things
__pycache__
.python-version
*.egg-info
.venv

# Prerequisites for updating ChibiOS
Expand Down
20 changes: 20 additions & 0 deletions builddefs/common_features.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ else ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), api)
OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
endif

ifeq ($(strip $(XAP_ENABLE)), yes)
include $(BUILDDEFS_PATH)/xap.mk
endif

AUDIO_ENABLE ?= no
ifeq ($(strip $(AUDIO_ENABLE)), yes)
ifeq ($(PLATFORM),CHIBIOS)
Expand Down Expand Up @@ -644,6 +648,22 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
endif
endif

ifeq ($(strip $(XAP_ENABLE)), yes)
ifeq ($(strip $(VIA_ENABLE)), yes)
$(error 'XAP_ENABLE = $(XAP_ENABLE)' deprecates 'VIA_ENABLE = $(VIA_ENABLE)'. Please set 'VIA_ENABLE = no')
endif

DYNAMIC_KEYMAP_ENABLE := yes
FNV_ENABLE := yes
SECURE_ENABLE := yes
BOOTMAGIC_ENABLE := yes

OPT_DEFS += -DXAP_ENABLE
OPT_DEFS += -DBOOTLOADER_JUMP_SUPPORTED
VPATH += $(QUANTUM_DIR)/xap
SRC += $(QUANTUM_DIR)/xap/xap.c $(QUANTUM_DIR)/xap/xap_handlers.c
endif

ifeq ($(strip $(RAW_ENABLE)), yes)
OPT_DEFS += -DRAW_ENABLE
SRC += raw_hid.c
Expand Down
44 changes: 44 additions & 0 deletions builddefs/xap.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright 2022 Nick Brassel (@tzarc)
# SPDX-License-Identifier: GPL-2.0-or-later

XAP_FILES := $(shell ls -1 data/xap/* | sort | xargs echo)
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/xap.hjson)","")
XAP_FILES += $(KEYBOARD_PATH_1)/xap.hjson
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/xap.hjson)","")
XAP_FILES += $(KEYBOARD_PATH_2)/xap.hjson
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/xap.hjson)","")
XAP_FILES += $(KEYBOARD_PATH_3)/xap.hjson
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/xap.hjson)","")
XAP_FILES += $(KEYBOARD_PATH_4)/xap.hjson
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/xap.hjson)","")
XAP_FILES += $(KEYBOARD_PATH_5)/xap.hjson
endif
ifneq ("$(wildcard $(KEYMAP_PATH)/xap.hjson)","")
XAP_FILES += $(KEYMAP_PATH)/xap.hjson
endif
ifneq ("$(wildcard $(USER_NAME)/xap.hjson)","")
XAP_FILES += $(USER_NAME)/xap.hjson
endif

$(INTERMEDIATE_OUTPUT)/src/config_blob_gz.h: $(INFO_JSON_FILES)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) xap-generate-qmk-blob-h -o "$(INTERMEDIATE_OUTPUT)/src/config_blob_gz.h" -kb $(KEYBOARD) -km $(KEYMAP))
@$(BUILD_CMD)

$(INTERMEDIATE_OUTPUT)/src/xap_generated.inl: $(XAP_FILES)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) xap-generate-qmk-inc -o "$(INTERMEDIATE_OUTPUT)/src/xap_generated.inl" -kb $(KEYBOARD) -km $(KEYMAP))
@$(BUILD_CMD)

$(INTERMEDIATE_OUTPUT)/src/xap_generated.h: $(XAP_FILES)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) xap-generate-qmk-h -o "$(INTERMEDIATE_OUTPUT)/src/xap_generated.h" -kb $(KEYBOARD) -km $(KEYMAP))
@$(BUILD_CMD)

generated-files: $(INTERMEDIATE_OUTPUT)/src/config_blob_gz.h $(INTERMEDIATE_OUTPUT)/src/xap_generated.inl $(INTERMEDIATE_OUTPUT)/src/xap_generated.h

VPATH += $(INTERMEDIATE_OUTPUT)/src
82 changes: 82 additions & 0 deletions data/constants/lighting/led_matrix_0.0.1.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"groups": {
"reactive": {
"define": "LED_MATRIX_KEYREACTIVE_ENABLED"
}
},
"effects": {
"0x00": {
"key": "SOLID"
},
"0x01": {
"key": "ALPHAS_MODS"
},
"0x02": {
"key": "BREATHING"
},
"0x03": {
"key": "BAND"
},
"0x04": {
"key": "BAND_PINWHEEL"
},
"0x05": {
"key": "BAND_SPIRAL"
},
"0x06": {
"key": "CYCLE_LEFT_RIGHT"
},
"0x07": {
"key": "CYCLE_UP_DOWN"
},
"0x08": {
"key": "CYCLE_OUT_IN"
},
"0x09": {
"key": "DUAL_BEACON"
},
"0x0A": {
"key": "WAVE_LEFT_RIGHT"
},
"0x0B": {
"key": "WAVE_UP_DOWN"
},

"0x0C": {
"key": "SOLID_REACTIVE_SIMPLE",
"group": "reactive"
},
"0x0D": {
"key": "SOLID_REACTIVE_WIDE",
"group": "reactive"
},
"0x0E": {
"key": "SOLID_REACTIVE_MULTIWIDE",
"group": "reactive"
},
"0x0F": {
"key": "SOLID_REACTIVE_CROSS",
"group": "reactive"
},
"0x10": {
"key": "SOLID_REACTIVE_MULTICROSS",
"group": "reactive"
},
"0x11": {
"key": "SOLID_REACTIVE_NEXUS",
"group": "reactive"
},
"0x12": {
"key": "SOLID_REACTIVE_MULTINEXUS",
"group": "reactive"
},
"0x13": {
"key": "SOLID_SPLASH",
"group": "reactive"
},
"0x14": {
"key": "SOLID_MULTISPLASH",
"group": "reactive"
}
}
}
175 changes: 175 additions & 0 deletions data/constants/lighting/rgb_matrix_0.0.1.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
{
"groups": {
"framebuffer": {
"define": "RGB_MATRIX_FRAMEBUFFER_EFFECTS"
},
"reactive": {
"define": "RGB_MATRIX_KEYREACTIVE_ENABLED"
}
},
"effects": {
"0x00": {
"key": "SOLID_COLOR"
},
"0x01": {
"key": "ALPHAS_MODS"
},
"0x02": {
"key": "GRADIENT_UP_DOWN"
},
"0x03": {
"key": "GRADIENT_LEFT_RIGHT"
},
"0x04": {
"key": "BREATHING"
},
"0x05": {
"key": "BAND_SAT"
},
"0x06": {
"key": "BAND_VAL"
},
"0x07": {
"key": "BAND_PINWHEEL_SAT"
},
"0x08": {
"key": "BAND_PINWHEEL_VAL"
},
"0x09": {
"key": "BAND_SPIRAL_SAT"
},
"0x0A": {
"key": "BAND_SPIRAL_VAL"
},
"0x0B": {
"key": "CYCLE_ALL"
},
"0x0C": {
"key": "CYCLE_LEFT_RIGHT"
},
"0x0D": {
"key": "CYCLE_UP_DOWN"
},
"0x0E": {
"key": "CYCLE_OUT_IN"
},
"0x0F": {
"key": "CYCLE_OUT_IN_DUAL"
},
"0x10": {
"key": "RAINBOW_MOVING_CHEVRON"
},
"0x11": {
"key": "CYCLE_PINWHEEL"
},
"0x12": {
"key": "CYCLE_SPIRAL"
},
"0x13": {
"key": "DUAL_BEACON"
},
"0x14": {
"key": "RAINBOW_BEACON"
},
"0x15": {
"key": "RAINBOW_PINWHEELS"
},
"0x16": {
"key": "RAINDROPS"
},
"0x17": {
"key": "JELLYBEAN_RAINDROPS"
},
"0x18": {
"key": "HUE_BREATHING"
},
"0x19": {
"key": "HUE_PENDULUM"
},
"0x1A": {
"key": "HUE_WAVE"
},
"0x1B": {
"key": "PIXEL_FRACTAL"
},
"0x1C": {
"key": "PIXEL_FLOW"
},
"0x1D": {
"key": "PIXEL_RAIN"
},

"0x1E": {
"key": "TYPING_HEATMAP",
"group": "framebuffer"
},
"0x1F": {
"key": "DIGITAL_RAIN",
"group": "framebuffer"
},

"0x20": {
"key": "SOLID_REACTIVE_SIMPLE",
"group": "reactive"
},
"0x21": {
"key": "SOLID_REACTIVE",
"group": "reactive"
},
"0x22": {
"key": "SOLID_REACTIVE_WIDE",
"group": "reactive"
},
"0x23": {
"key": "SOLID_REACTIVE_MULTIWIDE",
"group": "reactive"
},
"0x24": {
"key": "SOLID_REACTIVE_CROSS",
"group": "reactive"
},
"0x25": {
"key": "SOLID_REACTIVE_MULTICROSS",
"group": "reactive"
},
"0x26": {
"key": "SOLID_REACTIVE_NEXUS",
"group": "reactive"
},
"0x27": {
"key": "SOLID_REACTIVE_MULTINEXUS",
"group": "reactive"
},
"0x28": {
"key": "SPLASH",
"group": "reactive"
},
"0x29": {
"key": "MULTISPLASH",
"group": "reactive"
},
"0x2A": {
"key": "SOLID_SPLASH",
"group": "reactive"
},
"0x2B": {
"key": "SOLID_MULTISPLASH",
"group": "reactive"
},
"0x2C": {
"key": "FLOWER_BLOOMING"
},
"0x2D": {
"key": "STARLIGHT"
},
"0x2E": {
"key": "STARLIGHT_DUAL_SAT"
},
"0x2F": {
"key": "STARLIGHT_DUAL_HUE"
},
"0x30": {
"key": "RIVERFLOW"
}
}
}
Loading