Commit Graph

12465 Commits

Author SHA1 Message Date
QMK Bot
8e8f5e8371 Merge remote-tracking branch 'origin/develop' into xap 2022-06-15 20:32:21 +00:00
QMK Bot
6e10a80174 Merge remote-tracking branch 'origin/master' into develop 2022-06-15 20:31:47 +00:00
QMK Bot
6c6950ab7f Merge remote-tracking branch 'origin/develop' into xap 2022-06-15 20:31:41 +00:00
Felicia Kuan
7224d84167
edit typo in comment (#17394) 2022-06-15 21:31:13 +01:00
QMK Bot
c40af06871 Merge remote-tracking branch 'origin/master' into develop 2022-06-15 20:31:09 +00:00
ALTAiN
afbba27f42
BLASTER75 info.json position fixes (#17395) 2022-06-15 21:30:35 +01:00
QMK Bot
1a250df735 Merge remote-tracking branch 'origin/develop' into xap 2022-06-15 00:15:17 +00:00
QMK Bot
81d2218cee Merge remote-tracking branch 'origin/master' into develop 2022-06-15 00:14:34 +00:00
Arturo Avila
de207b97fa
[Keymap+] SnailMap port for the Kintsugi keyboard. (#17341) 2022-06-14 17:13:37 -07:00
QMK Bot
284fc9c3ab Merge remote-tracking branch 'origin/develop' into xap 2022-06-14 23:43:22 +00:00
QMK Bot
85d84938cf Merge remote-tracking branch 'origin/master' into develop 2022-06-14 23:42:47 +00:00
Forrest Cahoon
b7ce3b1967
[Keymap] New keymap for Keebio FoldKB (#17364) 2022-06-14 16:42:41 -07:00
kb-elmo
dc2ce36d63
[Keyboard] Add Chaos65 keyboard (#17369)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-14 16:42:15 -07:00
QMK Bot
333d215a24 Merge remote-tracking branch 'origin/develop' into xap 2022-06-14 23:33:07 +00:00
QMK Bot
adf4c27db2 Merge remote-tracking branch 'origin/master' into develop 2022-06-14 23:32:38 +00:00
Yutong Zhou
1c45845178
[Keyboard] Flip encoder pads on basketweave (#17375) 2022-06-14 16:32:07 -07:00
QMK Bot
71a9aef016 Merge remote-tracking branch 'origin/develop' into xap 2022-06-13 20:13:39 +00:00
Jouke Witteveen
1706da9054
tap-dance: Restructure code and document in more detail (#16394) 2022-06-13 22:12:55 +02:00
QMK Bot
9342369c67 Merge remote-tracking branch 'origin/develop' into xap 2022-06-13 18:31:59 +00:00
QMK Bot
b17324498e Merge remote-tracking branch 'origin/master' into develop 2022-06-13 18:31:17 +00:00
npspears
e49fa43a7f
[Keyboard] add SNOP60 (#17131)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-13 11:30:35 -07:00
QMK Bot
ae3ea0fe81 Merge remote-tracking branch 'origin/develop' into xap 2022-06-13 05:15:57 +00:00
QMK Bot
0c82aafb8a Merge remote-tracking branch 'origin/master' into develop 2022-06-13 05:15:12 +00:00
ALTAiN
5149728b23
[Keyboard] Add BLASTER75 keyboard (#16887)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-12 22:14:33 -07:00
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
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
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
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