QMK Bot
963a14b869
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 13:21:14 +00:00
fauxpark
b44e64a6bf
Merge remote-tracking branch 'upstream/master' into develop
2023-02-13 00:20:19 +11:00
QMK Bot
1db19d19ca
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 06:15:09 +00:00
Sergey Vlasov
584b7cf801
Fix build failures with OPT = 0 due to inline functions ( #19767 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-12 17:14:34 +11:00
QMK Bot
c5fc65df83
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 06:07:41 +00:00
Drashna Jaelre
b1f4d49c43
[Bug] Fix tri layer compiler issue if NO_ACTION_LAYER is defined ( #19821 )
2023-02-12 17:07:01 +11:00
QMK Bot
57d932bbfa
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 02:40:58 +00:00
jack
9c6942ea40
Remove config.h include from quantum files ( #19817 )
2023-02-12 02:40:16 +00:00
Ryan
0afe0e2441
Fix layout aliases for two boards ( #19818 )
2023-02-12 02:38:47 +00:00
QMK Bot
bd589b735b
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 02:02:29 +00:00
jack
ab1dd0faab
Fixup ek65 -- add processor & bootloader in info.json ( #19815 )
2023-02-12 02:01:48 +00:00
jack
78d366fca6
Reduce synthlabs/060 firmware size ( #19814 )
2023-02-12 01:58:30 +00:00
QMK Bot
7faa82869c
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 23:23:46 +00:00
Drashna Jaelre
fe02abc479
[Core] Tri Layer Keys ( #19795 )
...
Co-authored-by: wilba <wilba@wilba.tech>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-12 10:23:07 +11:00
QMK Bot
cdf8ecd2c7
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 20:38:46 +00:00
QMK Bot
4002843797
Merge remote-tracking branch 'origin/master' into develop
2023-02-11 20:38:10 +00:00
precondition
21f4375393
Update documentation for LM(layer, mod) ( #19284 )
...
* Update documentation for LM(layer, mod)
* Move LM table to caveats section
2023-02-11 20:37:30 +00:00
QMK Bot
98b0bcf545
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 20:36:45 +00:00
Joel Challis
90f3d6201a
Reduce false positives in layout name validation ( #19646 )
2023-02-11 20:36:11 +00:00
QMK Bot
7a067c6127
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 19:09:16 +00:00
QMK Bot
0a9d06a505
Merge remote-tracking branch 'origin/master' into develop
2023-02-11 19:08:39 +00:00
Luis Moreno
f667821ed3
[Docs] Resynchronizing Your Branch including submodules ( #19268 )
2023-02-11 12:07:51 -07:00
QMK Bot
6c01ab5b42
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 04:13:10 +00:00
Drashna Jaelre
34bc896cf9
[Keyboard] Fix merge error with fave84 board ( #19808 )
2023-02-11 15:12:35 +11:00
QMK Bot
151c24cfc6
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 03:48:25 +00:00
Joel Challis
11d49d00e7
Remove matrix_init_quantum/matrix_scan_quantum ( #19806 )
2023-02-11 03:47:17 +00:00
QMK Bot
dad5a9ac4b
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 02:46:27 +00:00
Nick Brassel
9991894514
Generate encodermap output from keymap.json. ( #18915 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-11 13:45:51 +11:00
QMK Bot
09f5469cec
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 22:42:33 +00:00
QMK Bot
01593501e3
Merge remote-tracking branch 'origin/master' into develop
2023-02-10 22:41:56 +00:00
Xelus22
1504e9ca4c
Fix bear65 ( #19805 )
2023-02-10 22:41:18 +00:00
QMK Bot
633ee50cd1
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 22:39:52 +00:00
Jouke Witteveen
3137883956
Typographic updates to source generation ( #19160 )
2023-02-10 22:39:13 +00:00
QMK Bot
327aaae1ba
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 21:10:50 +00:00
Joel Challis
1d0b4c8d38
Tidy up use of keycode range helpers ( #19756 )
2023-02-10 21:10:14 +00:00
QMK Bot
90ce570be6
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 21:09:37 +00:00
Joel Challis
2ffdec5dc2
Move more unicode ranges to DD ( #19755 )
2023-02-10 21:08:54 +00:00
QMK Bot
618442516d
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 18:07:33 +00:00
QMK Bot
79b364d289
Merge remote-tracking branch 'origin/master' into develop
2023-02-10 18:06:46 +00:00
Xelus22
d0702b519d
[Keyboard] Update Pachi RGB Rev2 VIA custom indicators ( #19788 )
2023-02-10 10:06:37 -08:00
Wolf Van Herreweghe
8c3e09b950
[Keyboard] Add the Twilight by MD ( #19787 )
...
Co-authored-by: Wolf <contact@vwolf.be>
2023-02-10 10:05:57 -08:00
QMK Bot
9d30b42073
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 17:30:11 +00:00
QMK Bot
61009c506b
Merge remote-tracking branch 'origin/master' into develop
2023-02-10 17:29:34 +00:00
kpagratis
b444e82985
[Keyboard] Add Dactyl 6x5 68 keys ( #18679 )
2023-02-10 10:28:39 -07:00
QMK Bot
0a1aff14b3
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 10:41:30 +00:00
QMK Bot
55e671a6f9
Merge remote-tracking branch 'origin/master' into develop
2023-02-10 10:40:54 +00:00
Arialdo Martini
98ed19045d
[Docs] Combos example consistently uses A B keys ( #19792 )
2023-02-10 02:40:15 -08:00
QMK Bot
15068d6470
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 10:40:12 +00:00
Pablo Martínez
95671148a4
[Docs] Change defines to enums in examples ( #19793 )
2023-02-10 02:39:35 -08:00
QMK Bot
73e41d6c91
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 09:20:01 +00:00
