Commit Graph

21854 Commits

Author SHA1 Message Date
Joel Challis
1a400d8644
Allow encoder config from info.json (#17295) 2022-06-20 20:15:06 -07:00
QMK Bot
d15db17acb Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:12:46 +00:00
QMK Bot
4c39bad2e6 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:12:14 +00:00
Albert Y
c114996034
[Keyboard] Add more bootloader options for id75 (#17441) 2022-06-20 20:11:37 -07:00
QMK Bot
21fc1b27c6 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 02:25:36 +00:00
QMK Bot
a6eeb930ae Merge remote-tracking branch 'origin/master' into develop 2022-06-21 02:24:10 +00:00
QMK Bot
84deeb7e44 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 02:24:04 +00:00
Wolf Van Herreweghe
3077123bf0
[Keyboard] Add base FAve65H firmware (#17147)
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
2022-06-20 19:23:50 -07:00
Wolf Van Herreweghe
1c26c0bc9b
[Keyboard] Update firmware for the FAve 87H (#16920)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
2022-06-20 19:23:34 -07:00
QMK Bot
3370e2b74d Merge remote-tracking branch 'origin/master' into develop 2022-06-21 02:23:27 +00:00
Wolf Van Herreweghe
e8e45bca98
[Keyboard] Update FAve 84H RGB firmware (#16919)
* Add base FAve 84H firmware

* Update keyboards/linworks/fave84h/readme.md

Thank you, apologies for the oversight

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

* Update keyboards/linworks/fave84h/keymaps/via/keymap.c

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

* Update keyboards/linworks/fave84h/keymaps/default/keymap.c

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

* Move LED config in ifdef

* update read me

* Update Product Name

* Update keyboards/linworks/fave84h/rules.mk

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

* Add Via RGB Matrix Control

* Add base FAve 84H firmware

* Add Via RGB Matrix Control

* fix merge conflict

* reduce max brightness

* remove action macro and action function

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

* Remove / update code to work with the build in QMK via hack

* Update Read me

* Add newline at end of rules

Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-20 19:22:53 -07:00
QMK Bot
92e7cacb4c Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 00:57:17 +00:00
Nick Brassel
589e756e98
Fixup SPI mode 3 => 0 on tzarc/djinn. (#17440) 2022-06-21 10:56:47 +10:00
QMK Bot
ac3fea3e0f Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 00:53:34 +00:00
QMK Bot
2fb24c0298 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 00:53:03 +00:00
evils
0a45a19801
[Docs] clarify inner array of direct pin matrix (#17437) 2022-06-21 01:52:11 +01:00
QMK Bot
ce9b36cbbf Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 00:27:20 +00:00
QMK Bot
93ee789387 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 00:26:40 +00:00
bomb
5ab90cc72a
[Keyboard] Add tegic for melgeek! (#17400)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-20 17:26:08 -07:00
QMK Bot
df7d58a12a Merge remote-tracking branch 'origin/develop' into xap 2022-06-20 23:31:58 +00:00
Stefan Kerkmann
6a81cb44f2
[Fix] Fix compilation warning for non-split keebs after #17423 (#17439) 2022-06-21 09:31:20 +10:00
QMK Bot
6287939f23 Merge remote-tracking branch 'origin/develop' into xap 2022-06-20 22:25:24 +00:00
Stefan Kerkmann
2703ecc9e9
[BUG] Fix deadlocks on disconnected secondary half (#17423) 2022-06-21 08:24:53 +10:00
QMK Bot
103df1106b Merge remote-tracking branch 'origin/develop' into xap 2022-06-20 14:32:09 +00:00
Dasky
62eaec52e0
Init eeconfig before reading handedness (#17256) 2022-06-20 15:31:27 +01:00
QMK Bot
bdc2387a7d Merge remote-tracking branch 'origin/develop' into xap 2022-06-20 04:22:04 +00:00
QMK Bot
36d60769f8 Merge remote-tracking branch 'origin/master' into develop 2022-06-20 04:21:32 +00:00
Nick Brassel
aa06893b58
Add Djinn. (#17382)
* Add Djinn.

* Review comments.

* Further cleanup.
2022-06-20 14:20:56 +10:00
zvecr
dab3a4fde0 Refactor based on recent discussion - Add back 'Layer Count' 2022-06-19 23:26:37 +01:00
QMK Bot
d467ac8427 Merge remote-tracking branch 'origin/develop' into xap 2022-06-19 21:33:24 +00:00
Jamal Bouajjaj
2bddffeaec
IS31FL3737 Global Current Setting (#17420) 2022-06-19 14:32:37 -07:00
zvecr
956bd3b7ca Refactor based on recent discussion 2022-06-19 22:04:36 +01:00
QMK Bot
6b0bdc30de Merge remote-tracking branch 'origin/develop' into xap 2022-06-19 18:17:37 +00:00
QMK Bot
4e3db51e92 Merge remote-tracking branch 'origin/master' into develop 2022-06-19 18:17:00 +00:00
QMK Bot
0b627d5e12 Merge remote-tracking branch 'origin/develop' into xap 2022-06-19 18:16:39 +00:00
anubhav dhiman
ad2e853611
[Keyboard] add at6 keyboard (#17346)
Co-authored-by: zvecr <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-19 11:16:24 -07:00
Albert Y
c725b6bf89
[Core] Mouse key kinetic mode fix (#17176)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-19 11:15:55 -07:00
QMK Bot
7d2f0172c4 Merge remote-tracking branch 'origin/develop' into xap 2022-06-19 18:00:05 +00:00
QMK Bot
d6eff188e9 Merge remote-tracking branch 'origin/master' into develop 2022-06-19 17:59:31 +00:00
Markus Weimar
7982957f75
[Keymap] Update XD75 keymap by markus (#17417) 2022-06-19 10:59:00 -07:00
QMK Bot
45ff6e8256 Merge remote-tracking branch 'origin/develop' into xap 2022-06-18 22:33:30 +00:00
QMK Bot
7f8886a1b7 Merge remote-tracking branch 'origin/master' into develop 2022-06-18 22:32:54 +00:00
coliss86
fd01feae4b
Add a note about using differents MCU family (#17416) 2022-06-19 08:32:22 +10:00
QMK Bot
36d87291dd Merge remote-tracking branch 'origin/develop' into xap 2022-06-18 21:38:41 +00:00
Drashna Jaelre
0da6562c4d
Make default layer size 16-bit (#15286)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-06-19 07:37:51 +10:00
QMK Bot
e40a0615ca Merge remote-tracking branch 'origin/develop' into xap 2022-06-18 07:35:09 +00:00
QMK Bot
cfcd647b2e Merge remote-tracking branch 'origin/master' into develop 2022-06-18 07:34:32 +00:00
Nick Brassel
b5104c3a93
Fixup stale labels lists. (#17415) 2022-06-18 17:33:55 +10:00
QMK Bot
f9f7add22c Merge remote-tracking branch 'origin/develop' into xap 2022-06-18 05:31:27 +00:00
Joel Challis
17ec1650fd
Additional schema fixes (#17414) 2022-06-18 15:30:46 +10:00