Commit graph

12338 commits

Author SHA1 Message Date
QMK Bot
06f5a54fd5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-02 16:19:34 +00:00
QMK Bot
8bb2c66c88 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 16:18:53 +00:00
Václav Kučera
7ff666340c
[Keyboard] Acheron Shark alpha Encoder support (#17266) 2022-06-02 09:17:47 -07:00
QMK Bot
6d53a07674 Merge remote-tracking branch 'origin/develop' into xap 2022-06-02 13:03:55 +00:00
QMK Bot
73bd3dff8c Merge remote-tracking branch 'origin/master' into develop 2022-06-02 13:03:13 +00:00
wavtype
f330ef12b6
Add wavtype/p01_ultra (#16513)
* new fork (manta and foundation)

added foundation and manta firmware

* removed manta

* VIA compliant changes

added readme, info.json edits

* Update keyboards/wavtype/foundation/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/foundation/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

* removed via.json and updated readme

* Update keyboards/wavtype/foundation/rules.mk

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

* Update keyboards/wavtype/foundation/config.h

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

* Update keyboards/wavtype/foundation/config.h

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

* Update keymap.c

* added p01 ultra

* updated diode direction

proto used opposite diode direction

* removed foundation

* Update keyboards/wavtype/p01_ultra/rules.mk

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

* Update keyboards/wavtype/p01_ultra/config.h

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

* Update keyboards/wavtype/p01_ultra/config.h

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

* Update keyboards/wavtype/p01_ultra/config.h

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

* Update keyboards/wavtype/p01_ultra/config.h

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

* Update keyboards/wavtype/p01_ultra/readme.md

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

* Update keyboards/wavtype/p01_ultra/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/rules.mk

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

* Update keyboards/wavtype/p01_ultra/readme.md

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

* Update keyboards/wavtype/p01_ultra/config.h

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-02 14:02:36 +01:00
QMK Bot
4d48300ade Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 21:39:08 +00:00
QMK Bot
f9e97fd3c3 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 21:38:36 +00:00
Carlo Sala
5b16671d7a
move RESET to QK_BOOT (#17278)
* move RESET to QK_BOOT

* fix tapping_term
2022-05-31 22:37:28 +01:00
QMK Bot
72458dcd76 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 08:23:30 +00:00
QMK Bot
6fdce80822 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 08:22:54 +00:00
moyi4681
d5ed3ae967
[Keyboard] fix dz64rgb rgb sleep (#17209) 2022-05-31 01:22:07 -07:00
QMK Bot
6579526ace Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 05:38:38 +00:00
Nick Brassel
8545473307
Removes terminal from QMK. (#17258) 2022-05-30 22:38:08 -07:00
QMK Bot
d5d72135e4 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 05:04:02 +00:00
Drashna Jaelre
cda343acbe
[Keymap] Drashna update for post Q2 merge (#17241) 2022-05-30 22:02:55 -07:00
QMK Bot
9aadf14b31 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 02:10:05 +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
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
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
Seth Barberee
cc7a3f8dc7
[Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK (#17230) 2022-05-30 11:07:16 -07:00
Joel Challis
a06b5cae41
Fix API errors (#17239) 2022-05-30 15:34:20 +01:00
Joel Challis
6a0ed63eb1
Fix quark_lp via firmware size (#17233) 2022-05-29 06:17:49 +01: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
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
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
QMK Bot
23732068a4 Merge remote-tracking branch 'origin/master' into develop 2022-05-24 17:09:41 +00:00
James Young
c3ff06c534
SkeletonNumPad Configurator Key Sequence Fix (#17204)
* info.json: apply friendly formatting

* info.json: fix key sequence
2022-05-24 18:08:37 +01:00
QMK Bot
a3f4d8064f Merge remote-tracking branch 'origin/develop' into xap 2022-05-24 01:37:05 +00:00
zvecr
6342354cf6 Disable python formatting for some files 2022-05-24 02:35:59 +01:00
QMK Bot
429c592289 Merge remote-tracking branch 'origin/develop' into xap 2022-05-23 06:22:42 +00:00
QMK Bot
f5e1d2f76a Merge remote-tracking branch 'origin/master' into develop 2022-05-23 06:22:01 +00:00
Xelus22
00fcfd9181
[Keyboard][Fix] Change default keymap tilde to grv (#17185) 2022-05-22 23:21:23 -07:00
QMK Bot
d1140dd23a Merge remote-tracking branch 'origin/develop' into xap 2022-05-23 06:12:34 +00:00
QMK Bot
64e2dbedc3 Merge remote-tracking branch 'origin/master' into develop 2022-05-23 06:11:55 +00:00
Ramon Imbao
5aef750379
[Keyboard] Add plywrks Ahgase (#17191) 2022-05-22 23:11:17 -07:00
QMK Bot
9a9c5df2a7 Merge remote-tracking branch 'origin/develop' into xap 2022-05-23 06:04:47 +00:00
QMK Bot
0bef2bfeb6 Merge remote-tracking branch 'origin/master' into develop 2022-05-23 06:04:11 +00:00
Albert Y
c9abb03662
[Keyboard] mj64 Increase LED count (#17194) 2022-05-22 23:03:38 -07:00
QMK Bot
b620124024 Merge remote-tracking branch 'origin/develop' into xap 2022-05-23 05:07:12 +00:00
QMK Bot
1182f5b4be Merge remote-tracking branch 'origin/master' into develop 2022-05-23 05:06:35 +00:00
Xyverz
416c59fc52
[Keyboard] Atreus62update (#17179)
Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld>
Co-authored-by: Ian Sterling <80361942+iansterlingaaa@users.noreply.github.com>
Co-authored-by: Ian Sterling <xyverz@paeroa-arch.localdomain>
2022-05-22 22:05:55 -07:00
zvecr
f2d56f5ca1 Align filenames 2022-05-23 02:14:42 +01:00
QMK Bot
d9b045a6fe Merge remote-tracking branch 'origin/develop' into xap 2022-05-21 22:55:10 +00:00