Commit graph

21558 commits

Author SHA1 Message Date
QMK Bot
017829daec Merge remote-tracking branch 'origin/develop' into xap 2022-06-12 18:31:26 +00:00
QMK Bot
d288121f21 Merge remote-tracking branch 'origin/master' into develop 2022-06-12 18:30:50 +00:00
HorrorTroll
c2045558d9
[Keyboard] Add Lemon40 keyboard (#17357) 2022-06-12 11:30:08 -07:00
QMK Bot
51bca87dd4 Merge remote-tracking branch 'origin/develop' into xap 2022-06-12 14:35:37 +00:00
QMK Bot
191c180644 Merge remote-tracking branch 'origin/master' into develop 2022-06-12 14:35:07 +00:00
Albert Y
b5a53a9946
Add encoder map (#17361) 2022-06-12 15:34:29 +01:00
QMK Bot
2f566af886 Merge remote-tracking branch 'origin/develop' into xap 2022-06-12 10:48:23 +00:00
QMK Bot
90765aaefd Merge remote-tracking branch 'origin/master' into develop 2022-06-12 10:47:53 +00:00
Drashna Jaelre
3f841a24f0
[Keyboard] Remove terminal commands from m48 (#17363) 2022-06-12 20:47:24 +10:00
QMK Bot
8a529cac45 Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 18:26:03 +00:00
QMK Bot
0d991b8873 Merge remote-tracking branch 'origin/master' into develop 2022-06-11 18:25:28 +00:00
durken1
a50b09cba5
[Keyboard] add pierce (#17000)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dan Abrahamsson <dan.abrahamsson@imsystech.com>
2022-06-11 11:24:58 -07:00
QMK Bot
4e9a2ca5f7 Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 18:19:51 +00:00
QMK Bot
1a7a6f313e Merge remote-tracking branch 'origin/master' into develop 2022-06-11 18:19:21 +00:00
Alin Marin Elena
51cfb1b457
[Keyboard] mlego fix product id and sync oled code (#16237)
* sync oled code over the keymaps

* put different product ids

* put different product ids for the rest

* put different product ids for the rest

* try to reduce code duplication

* make ifdefs nice and correct

* move the leds code out of keymap

* try to reduce code duplication

* move the rgb code outside the keymaps for reuse

* Update keyboards/mlego/m65/m65.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/mlego/m65/m65.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* move more code outside keymaps for reuse

* add few more xps

* add mic mute

* update to new name of macros for reset

* style for matrix

* clean split

* use tinyuf2 as bootloader

* Update keyboards/mlego/m65/rev4/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* radionalise product id and device version

* add tinyuf2 as default bootloader for stm32f4

* update tinyuf2

* update tinyuf2 and via. f411 remove tinyuf2 since is not really working. make the config more conditional

* sync the keymap with default

* revert via non building with gcc 11

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-11 11:18:45 -07:00
QMK Bot
43ce7ab31f Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 18:10:53 +00:00
Ryan
af6435d44d
qmk doctor: show arch for macOS (#17356) 2022-06-11 19:10:09 +01:00
QMK Bot
32d86cee7f Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 17:53:45 +00:00
QMK Bot
5887bf7158 Merge remote-tracking branch 'origin/master' into develop 2022-06-11 17:53:14 +00:00
jack
dbd4ac5a3f
[Keyboard] Fix checkboards/quark_lp (another) (#17296) 2022-06-11 10:52:45 -07:00
QMK Bot
d428f579e0 Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 05:02:19 +00:00
Drashna Jaelre
80034a847f
Ensure that rgb+via compiles in all cases (#17355) 2022-06-10 22:01:46 -07:00
QMK Bot
ebc9cb4ed1 Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 02:08:35 +00:00
Dasky
568924c76c
Add missing bracket for VIA brightness scaling (#17354) 2022-06-10 19:07:58 -07:00
QMK Bot
14e3248a24 Merge remote-tracking branch 'origin/develop' into xap 2022-06-11 00:20:38 +00:00
yiancar
0fd08da806
Scale brigthness for VIA (#17352)
Co-authored-by: yiancar <yiancar@gmail.com>
2022-06-10 17:20:01 -07:00
QMK Bot
6f8e461cd1 Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 22:25:35 +00:00
QMK Bot
d05a1deb7c Merge remote-tracking branch 'origin/master' into develop 2022-06-10 22:24:58 +00:00
Ryan
b4b34cd2cd
Wasdat: move some stuff to info.json (#17327) 2022-06-11 08:24:29 +10:00
QMK Bot
452c0ba4fb Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 10:45:56 +00:00
QMK Bot
6b838785b7 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 10:45:24 +00:00
Joel Challis
92665aef33
Promote 'layouts require matrix data' to api error (#17349) 2022-06-10 11:44:48 +01:00
Joel Challis
7baf9b3f35
Promote label with newlines to lint error (#17347) 2022-06-10 11:44:23 +01:00
QMK Bot
55b4fa3a5a Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 07:47:01 +00:00
QMK Bot
97fc4f1b6a Merge remote-tracking branch 'origin/master' into develop 2022-06-10 07:46:24 +00:00
jack
d8ace624c8
initial (#17345) 2022-06-10 08:45:31 +01:00
QMK Bot
61c534947a Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 03:43:59 +00:00
QMK Bot
738cec9bd5 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:43:25 +00:00
Derek
7c097ee6b4
[Keyboard] Add Sodium keyboards (#17078)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: nacly <nacly@pop-os.localdomain>
2022-06-09 20:42:53 -07:00
QMK Bot
762496d0b1 Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 03:41:43 +00:00
QMK Bot
ef8a30250b Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:41:14 +00:00
Zac Scott
93c3a959a7
[Keymap] Add planck/scottzach1 keymap (#17083) 2022-06-09 20:40:43 -07:00
QMK Bot
5afc776cec Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 03:26:51 +00:00
QMK Bot
ed15a579a7 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:26:21 +00:00
zv0n
9da1b86d71
[keyboard] annepro2 Add and use functions to directly control led colors (#17196) 2022-06-10 13:25:48 +10:00
QMK Bot
b6446026b5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 01:16:59 +00:00
QMK Bot
c84d058c8b Merge remote-tracking branch 'origin/master' into develop 2022-06-10 01:16:19 +00:00
Gabriel Oliveira
9316023290
[Keyboard] Improve the durgot k3x0 readme.md (#17214) 2022-06-09 18:15:44 -07:00
QMK Bot
066d7c10f1 Merge remote-tracking branch 'origin/develop' into xap 2022-06-10 01:13:50 +00:00
QMK Bot
e5e2cd94be Merge remote-tracking branch 'origin/master' into develop 2022-06-10 01:13:18 +00:00