Commit graph

21832 commits

Author SHA1 Message Date
QMK Bot
267864e42c Merge remote-tracking branch 'origin/master' into develop 2022-06-22 02:15:13 +00:00
Muhammad Rivaldi
46644b0a64
[Keyboard] Add n60a pcb (#17273)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-21 19:14:36 -07:00
QMK Bot
0c9bf637d5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-22 01:54:10 +00:00
QMK Bot
86bfd8195c Merge remote-tracking branch 'origin/master' into develop 2022-06-22 01:53:38 +00:00
paulgali
3e9f000a97
[Keyboard] Zeno 60% Ergo PCB (#17403)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-21 18:53:04 -07:00
QMK Bot
d1d317ff4c Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 22:01:01 +00:00
Daniel Kao
608404f874
Fix AVR I2C master 1ms timeout (#17174)
* avr i2c_master: Fix 1ms timeout

i2c_start() produces a minimum time_slice of 1ms for use as timeout
value.
The timer granularity is 1ms, it is entirely possible for timer_count
to tick up immediately after the last timer read and falsely trigger
timeout with a '>= 1' comparison.

* avr/drivers/i2c_master: Use timer_elapsed()
2022-06-22 00:00:04 +02:00
QMK Bot
39943571c4 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 17:54:14 +00:00
Dasky
be42c5fb98
Fix RGB heatmap to use XY positions and use correct led limits (#17184)
* Fix RGB heatmap to use XY positions

* lower effect area limit and make configurable

* tidy up macro

* Fix triggering in both directions.

* add docs

* fix bug when decreasing value

* performance tweak
2022-06-21 10:53:34 -07:00
QMK Bot
b7998829d5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 15:51:34 +00:00
QMK Bot
2d7a2dfad0 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 15:50:58 +00:00
Joel Challis
de4262f9aa
Add missing snop60 default keymap (#17443) 2022-06-21 16:49:58 +01:00
QMK Bot
43adf84d65 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 12:24:16 +00:00
QMK Bot
65fcf951d3 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 12:23:46 +00:00
James Young
03d0182541
alt34 rev1: Configurator Compilation Fix (#17442)
* move USE_I2C and EE_HANDS definitions to keyboard level

Allow this keyboard to be compiled by QMK Configurator.

* remove redundant DEFAULT_FOLDER rule
2022-06-21 13:22:53 +01:00
QMK Bot
313e7f64a3 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:42:46 +00:00
QMK Bot
d116cf5e9a Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:42:15 +00:00
bbrfkr
c2e5953bc1
[Keyboard] add dynamis keyboard (#15994)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-20 20:41:46 -07:00
QMK Bot
890e25bbe2 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:34:31 +00:00
QMK Bot
2b23ca876d Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:34:03 +00:00
alabbe9545
84718c0ab7
[Keyboard] Add labbeminiv1 (#16401)
* [Keyboard] Add labbeminiv1

* Adjust vendor id

The used vendor id was in use

* Remove comment in the rgb keymap

* Update keyboards/labbe/labbeminiv1/rules.mk

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

* Rename rgb matrix keymap folder

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-20 20:33:29 -07:00
QMK Bot
fcb13dd0b5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:26:13 +00:00
QMK Bot
503b40e748 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:25:43 +00:00
Ryan Baker
712f6cf450
[Keyboard] Add rb18 keyboard (#17306) 2022-06-20 20:24:58 -07:00
QMK Bot
d71026ccc3 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:17:13 +00:00
QMK Bot
52c1517766 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:16:43 +00:00
Ramon Imbao
7b7fb63f4b
[Keyboard] Add Nayeon by Abats Keyboard Club (#16659)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-06-20 20:16:13 -07:00
QMK Bot
cda2901457 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:15:37 +00:00
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