Commit graph

21784 commits

Author SHA1 Message Date
QMK Bot
044486500c Merge remote-tracking branch 'origin/master' into develop 2022-05-31 04:09:14 +00:00
Sergey Vlasov
650be92cf9
Nix shell updates (#17243) 2022-05-31 14:08:23 +10:00
QMK Bot
9aadf14b31 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 02:10:05 +00:00
QMK Bot
a099579aa0 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 02:09:37 +00:00
Joel Challis
0e11b511e4
Convert ergodone to use core mcp23018 driver (#17005) 2022-05-31 03:08:56 +01:00
QMK Bot
03ca0cc8c9 Merge remote-tracking branch 'origin/develop' into xap 2022-05-30 22:44:39 +00:00
QMK Bot
67e80780bb Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:44:05 +00:00
Joel Challis
2879573688
Fix various lint errors (#17255)
* Fix various lint errors

* reduce complexity
2022-05-30 23:43:36 +01:00
Nick Brassel
33d779cc16 Merge remote-tracking branch 'upstream/develop' into xap 2022-05-31 08:08:22 +10:00
QMK Bot
6e4e50d5aa Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:06:28 +00:00
Dasky
25ec68c408
Fix docs typo (#17254) 2022-05-30 23:05:57 +01:00
Dasky
2de70e6f2d
Add uf2-split-* make targets. (#17257) 2022-05-31 08:04:50 +10:00
QMK Bot
31fb141528 Merge remote-tracking branch 'origin/master' into develop 2022-05-30 21:46:00 +00:00
chalex
3826fca637
[Keyboard] Add str.merro60 pcb (#17097)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local>
Co-authored-by: chalex <chlxbsmt@gmail.com>
2022-05-30 14:45:27 -07:00
QMK Bot
6b640db4bb Merge remote-tracking branch 'origin/master' into develop 2022-05-30 18:29:09 +00:00
Juno Nguyen
15a86d5c53
[Keymap] Updates to layouts/community/ortho_4x12/junonum (#17249) 2022-05-30 11:28:35 -07:00
QMK Bot
e4be4d282c Merge remote-tracking branch 'origin/master' into develop 2022-05-30 18:07:56 +00:00
Seth Barberee
cc7a3f8dc7
[Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK (#17230) 2022-05-30 11:07:16 -07:00
QMK Bot
9a2943d221 Merge remote-tracking branch 'origin/master' into develop 2022-05-30 14:34:54 +00:00
Joel Challis
a06b5cae41
Fix API errors (#17239) 2022-05-30 15:34:20 +01:00
QMK Bot
f03fe5b917 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 19:16:27 +00:00
Joel Challis
e22a183329
Use correct container for unit test workflow (#17242) 2022-05-29 20:15:54 +01:00
QMK Bot
6123698270 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 05:18:24 +00:00
Joel Challis
6a0ed63eb1
Fix quark_lp via firmware size (#17233) 2022-05-29 06:17:49 +01:00
QMK Bot
a765f730b1 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 05:10:23 +00:00
jack
07f5147621
Fixup iron165r2 (#17119)
* initial

* revert some defines

* formatting

* apply changes

* update readme

* suggestion
2022-05-29 06:09:42 +01:00
QMK Bot
3ce029c7fd Merge remote-tracking branch 'origin/master' into develop 2022-05-28 23:07:45 +00:00
Nick Brassel
89a5d5aea0
Fixup command sequencing for master/develop. (#17227) 2022-05-29 09:07:11 +10:00
QMK Bot
9a23ca668c Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 22:16:33 +00:00
Nick Brassel
87c3a53716 Branch point after 2022-05-28 Breaking Change. 2022-05-29 08:16:00 +10:00
QMK Bot
08e93f5ea7 Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 22:15:51 +00:00
Nick Brassel
73dbb042bf Branch point after 2022-05-28 Breaking Change. 2022-05-29 08:15:16 +10:00
QMK Bot
b11c5702fa Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 22:14:34 +00:00
Nick Brassel
103c08cc75 Merge branch 'master' into develop 2022-05-29 08:13:56 +10:00
QMK Bot
23f72ad16c Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 22:01:59 +00:00
QMK Bot
0b53879fc6 Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 22:01:12 +00:00
Nick Brassel
d0ed9071a2 Branch point after 2022-05-28 Breaking Change. 2022-05-29 08:00:55 +10:00
Nick Brassel
b835171008 Merge branch 'develop' -- breaking changes 2022-05-28. 2022-05-29 07:57:11 +10:00
QMK Bot
5cfb7ef396 Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 21:54:25 +00:00
Nick Brassel
0c8f78020d Merge point for 2022-05-28 Breaking Change 2022-05-29 07:53:50 +10:00
QMK Bot
ffdba839b0 Merge remote-tracking branch 'origin/develop' into xap 2022-05-28 21:50:59 +00:00
Nick Brassel
d0af56da33
Breaking changes for 2022q2. (#17221) 2022-05-29 07:50:21 +10:00
QMK Bot
12b2993fc2 Merge remote-tracking branch 'origin/develop' into xap 2022-05-26 20:08:52 +00:00
Joel Challis
ebd4027883
Refactor legacy quantum keycodes in default-ish keymaps (#17150) 2022-05-27 06:07:42 +10:00
zvecr
f727692fd1 Render request/response in XAP docs 2022-05-26 18:22:54 +01:00
zvecr
32404cbb77 tidy xap.mk 2022-05-26 17:24:17 +01:00
QMK Bot
61fa26a45d Merge remote-tracking branch 'origin/develop' into xap 2022-05-25 12:12:35 +00:00
QMK Bot
d83fda01cf Merge remote-tracking branch 'origin/master' into develop 2022-05-25 12:11:52 +00:00
Takeshi ISHII
f5d091a9d5
Small update to Symmetric70 keyboard readme (#17188)
Added a little description to reademe.md under `handwired/symmetric70_proto/{matrix_debug|matrix_fast}`.
2022-05-25 21:11:13 +09:00
QMK Bot
202be7f3b5 Merge remote-tracking branch 'origin/develop' into xap 2022-05-24 17:10:34 +00:00