QMK Bot
b6bc3a0b5d
Merge remote-tracking branch 'origin/develop' into xap
2023-02-14 20:44:53 +00:00
Albert Y
9908ed7ecd
Add swap hands status function ( #19831 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-14 12:44:18 -08:00
QMK Bot
6bc0e0e9d4
Merge remote-tracking branch 'origin/develop' into xap
2023-02-14 03:24:12 +00:00
しぐれ
12f02dd8be
[Doc]Remove depracted extension links in vscode guide ( #19842 )
2023-02-14 03:23:36 +00:00
QMK Bot
68e301586a
Merge remote-tracking branch 'origin/develop' into xap
2023-02-14 03:21:02 +00:00
Dasky
74770ac79b
Merge branch 'master' into develop
2023-02-14 03:05:44 +00:00
precondition
7a099b7ea5
Update KC_NLCK and KC_SLCK in international docs ( #19521 )
2023-02-14 02:49:17 +00:00
QMK Bot
fbe581fe82
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 23:02:42 +00:00
Joel Challis
896d9aa98c
Add rp2040_ce and add elite-pi and helios as alias ( #19830 )
...
* add rp2040_ce and add elite-pi and helios as alias (#19628 )
* fix git mishap
* Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
* Tidy docs
---------
Co-authored-by: Conor Burns <mail@conor-burns.com>
2023-02-12 23:02:05 +00:00
QMK Bot
eff1fa4536
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 17:48:51 +00:00
Drashna Jaelre
b47f179a4a
Make Magic handling more consistent in Action Keycode handling ( #9126 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-13 04:48:14 +11:00
QMK Bot
cf4ae58cf3
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 17:06:59 +00:00
QMK Bot
13af265268
Merge remote-tracking branch 'origin/master' into develop
2023-02-12 17:06:22 +00:00
souvlakeeb
3f45fd4924
Fix serial_driver.md list item numbering ( #19819 )
2023-02-12 17:05:46 +00:00
QMK Bot
ad6011226a
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 16:31:40 +00:00
Eric.a Gebhart
db1eeea478
Add combo hook to allow per layer combo reference layers. ( #16699 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-02-13 03:31:04 +11:00
QMK Bot
9c9a55199d
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 16:19:43 +00:00
Ryan
bbf7a20b33
Refactor Leader key feature ( #19632 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-13 03:19:02 +11: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
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
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
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
a37182dac8
Merge remote-tracking branch 'origin/develop' into xap
2023-02-09 19:28:13 +00:00
miguelelinventor
e24f9b2c0a
Add Michi MCU Converter support ( #19163 )
2023-02-09 11:27:37 -08:00
QMK Bot
0a5ef00655
Merge remote-tracking branch 'origin/develop' into xap
2023-02-08 02:22:03 +00:00
QMK Bot
650864c27d
Merge remote-tracking branch 'origin/master' into develop
2023-02-08 02:21:22 +00:00
soggywhale
a7febfbb62
changed the undefined ON and OFF parameters to thedefined constant ( #19772 )
2023-02-08 02:20:42 +00:00
QMK Bot
48a3025a27
Merge remote-tracking branch 'origin/develop' into xap
2023-02-03 00:18:42 +00:00
QMK Bot
a1ecbaa45d
Merge remote-tracking branch 'origin/master' into develop
2023-02-03 00:18:03 +00:00
Albert Y
87c4152738
Update handedness by define examples ( #19687 )
2023-02-03 00:17:05 +00:00
QMK Bot
1d1b1e621b
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 19:04:14 +00:00
Nick Brassel
f6dd8dea2e
Remove usages of config_common.h from config.h files. ( #19714 )
2023-01-31 06:03:30 +11:00
QMK Bot
c694bb7ec6
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 18:37:56 +00:00
Ryan
2d843088a2
Normalise Swap Hands keycodes ( #19720 )
2023-01-30 18:37:19 +00:00
QMK Bot
5c9b49c9ff
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 07:56:55 +00:00
fauxpark
ef6505ad75
Merge remote-tracking branch 'upstream/master' into develop
2023-01-30 18:55:36 +11:00
QMK Bot
f015282a05
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 07:48:24 +00:00
Ryan
242b80c63f
Move MIDI code out of tmk_core ( #19704 )
2023-01-30 18:47:50 +11:00
Ryan
2c878b1b16
Clean up qmk generate-autocorrect-data
( #19710 )
2023-01-30 03:37:02 +00:00