summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-234-19/+20
|\
| * [Keyboard] Update SKErgo for hardware changes (#17449)Kevin Zhao2022-06-224-19/+20
| | | | | | Co-authored-by: kevinzhao-tech <kevin@keyz.io>
* | [Core] Mark GD32VF103 as ChibiOS-Contrib (#17444)Stefan Kerkmann2022-06-231-0/+1
| |
* | Cirque Attenuation Setting (#17342)Kyle McCreery2022-06-222-9/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-224-352/+391
|\|
| * Chaos 65 Community Layout Support (#17447)James Young2022-06-224-352/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * move ISO Enter position to home row This commit makes the ISO layout macros compatible with QMK's `65_iso_blocker` and `65_iso_blocker_tsangan` community layouts. * info.json: apply friendly formatting - add key labels - add line breaks between physical rows * enable Community Layout support * chaos65.h: add matrix diagram
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-228-226/+266
|\|
| * Checkerboards SNOP60 Refactor (#17446)James Young2022-06-228-226/+266
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-223-0/+239
|\|
| * [Keymap] farmergreg's kint41 Kinesis Advantage 2 Layout (#16784)Greg Dietsche2022-06-213-0/+239
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2211-0/+314
|\|
| * [Keyboard] Add n60a pcb (#17273)Muhammad Rivaldi2022-06-2111-0/+314
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-229-0/+245
|\|
| * [Keyboard] Zeno 60% Ergo PCB (#17403)paulgali2022-06-219-0/+245
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Fix AVR I2C master 1ms timeout (#17174)Daniel Kao2022-06-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | * 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()
* | Fix RGB heatmap to use XY positions and use correct led limits (#17184)Dasky2022-06-213-45/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-211-0/+62
|\|
| * Add missing snop60 default keymap (#17443)Joel Challis2022-06-211-0/+62
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-213-28/+9
|\|
| * alt34 rev1: Configurator Compilation Fix (#17442)James Young2022-06-213-28/+9
| | | | | | | | | | | | | | * move USE_I2C and EE_HANDS definitions to keyboard level Allow this keyboard to be compiled by QMK Configurator. * remove redundant DEFAULT_FOLDER rule
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2110-0/+1111
|\|
| * [Keyboard] add dynamis keyboard (#15994)bbrfkr2022-06-2010-0/+1111
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2114-0/+260
|\|
| * [Keyboard] Add labbeminiv1 (#16401)alabbe95452022-06-2014-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2110-0/+288
|\|
| * [Keyboard] Add rb18 keyboard (#17306)Ryan Baker2022-06-2010-0/+288
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2113-0/+838
|\|
| * [Keyboard] Add Nayeon by Abats Keyboard Club (#16659)Ramon Imbao2022-06-2013-0/+838
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Allow encoder config from info.json (#17295)Joel Challis2022-06-205-0/+159
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-213-32/+14
|\|
| * [Keyboard] Add more bootloader options for id75 (#17441)Albert Y2022-06-203-32/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2115-28/+424
|\|
| * [Keyboard] Add base FAve65H firmware (#17147)Wolf Van Herreweghe2022-06-209-0/+383
| | | | | | Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
| * [Keyboard] Update firmware for the FAve 87H (#16920)Wolf Van Herreweghe2022-06-206-28/+41
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-215-29/+40
|\|
| * [Keyboard] Update FAve 84H RGB firmware (#16919)Wolf Van Herreweghe2022-06-205-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Fixup SPI mode 3 => 0 on tzarc/djinn. (#17440)Nick Brassel2022-06-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-211-1/+1
|\|
| * [Docs] clarify inner array of direct pin matrix (#17437)evils2022-06-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2111-0/+575
|\|
| * [Keyboard] Add tegic for melgeek! (#17400)bomb2022-06-2011-0/+575
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Fix] Fix compilation warning for non-split keebs after #17423 (#17439)Stefan Kerkmann2022-06-211-1/+5
| |
* | [BUG] Fix deadlocks on disconnected secondary half (#17423)Stefan Kerkmann2022-06-213-11/+38
| |
* | Init eeconfig before reading handedness (#17256)Dasky2022-06-201-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-2043-1/+2145
|\|
| * Add Djinn. (#17382)Nick Brassel2022-06-2043-1/+2145
| | | | | | | | | | | | | | * Add Djinn. * Review comments. * Further cleanup.
* | IS31FL3737 Global Current Setting (#17420)Jamal Bouajjaj2022-06-192-1/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-06-198-0/+245
|\|
| * [Keyboard] add at6 keyboard (#17346)anubhav dhiman2022-06-198-0/+245
| | | | | | | | Co-authored-by: zvecr <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Core] Mouse key kinetic mode fix (#17176)Albert Y2022-06-193-16/+21
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>