summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-2297-1141/+1879
|\
| * fix layout macro (#16414)jack2022-02-212-9/+6
| | | | | | Co-authored-by: jack <{ID}+{username}@users.noreply.github.com>
| * Add encoder defaults for Keebio boards (#16398)Danny2022-02-2133-175/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add BDN9 encoder defaults * Add DSP40 encoder default * Add FoldKB encoder defaults * Add Iris encoder defaults * Update Iris Rev. 6 encoder orientation * Add KBO-5000 encoder defaults * Add Quefrency encoder defaults * Add Sinc encoder defaults * Add Stick encoder defaults * Remove encoder settings from VIA keymaps
| * Fix kikoslab/ellora65 (#16415)jack2022-02-222-19/+24
| |
| * Format code according to conventions (#16419)QMK Bot2022-02-216-338/+329
| |
| * [Keyboard] infinity81 (#16387)peepeetee2022-02-218-0/+321
| |
| * [keyboard] DC01 i2c timeout fix (#16392)yiancar2022-02-212-2/+2
| |
| * [Keyboard] add evancookaudio sleepingdinosaur (#16320)evanmcook2022-02-217-0/+221
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
| * [Keyboard] Update Heavy Left (#16354)takashicompany2022-02-214-1/+73
| |
| * [Keyboard] ID75 v2 (#16351)peepeetee2022-02-216-0/+303
| |
| * [Keyboard] Add sabre (#15964)Wolf Van Herreweghe2022-02-219-0/+272
| | | | | | Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
| * [Keyboard] [redox_w] add dvorak layout and white led support (#16259)66f9e4eae2022-02-214-18/+188
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Docs] Update feature_leader_key.md (#16344)Michal Petrik2022-02-211-5/+5
| | | | | | Co-authored-by: zvecr <git@zvecr.com>
| * [Docs] Update newbs_building_firmware.md (#16333)Michal Petrik2022-02-211-1/+1
| |
| * Helix/pico move to split_common (#16418)Takeshi ISHII2022-02-2118-913/+165
| |
* | [Keymap] BDN9 keymap (#15924)Adam Lickel2022-02-213-0/+179
| |
* | Format code according to conventions (#16421)QMK Bot2022-02-216-346/+329
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-224-11/+20
|\|
| * Internal docs generation updates (#16411)Ryan2022-02-213-10/+13
| |
| * Fix a potential bug in encoder_init(). (#16372)Takeshi ISHII2022-02-211-1/+5
| | | | | | After executing `setPinInputHigh(pin)`, it is necessary to wait for the charging time to read from the corresponding pin. This is the same as requiring `matrix_output_unselect_delay()` after doing `unselect_row()` in matrix.c.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2131-31/+1026
|\|
| * Update the support for lazydesigners/dimple (#14797)jackytrabbit2022-02-2131-31/+1026
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2111-1/+657
|\|
| * Format code according to conventions (#16412)QMK Bot2022-02-211-1/+1
| |
| * [Keyboard] Add Ellora65 (#14754)Brandon Claveria2022-02-2110-0/+656
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: swiftrax <swiftrax@github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-218-0/+334
|\|
| * [Keyboard] Add Snatchpad keyboard (#16330)xiao2022-02-218-0/+334
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: xia0 <xiao@morgan.net.au>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2111-0/+1008
|\|
| * [Keyboard] add Gizmo Engineering GK6 keyboard (#13907)federicoweber2022-02-2111-0/+1008
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-219-0/+346
|\|
| * [Keyboard] Add foundation (#16289)hunter2022-02-219-0/+346
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-217-0/+296
|\|
| * [Keyboard] Add glacier in creatkeebs folder (#16079)Tim Liu2022-02-207-0/+296
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-219-0/+262
|\|
| * [Keyboard] Add Obro (#15884)holtenc2022-02-209-0/+262
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2117-113/+508
|\|
| * [Keyboard] Add Kyria rev. 2 (#16178)L. K. Post2022-02-2017-113/+508
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2113-0/+579
|\|
| * [Keyboard] Add Monoflex 60 keyboard (#16234)Ivan Gromov2022-02-2013-0/+579
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2110-120/+90
|\|
| * [Keyboard] Fix Hineybush/h08_ocelot and Hineybush/h65(_hotswap) (#16405)jack2022-02-2010-120/+90
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-219-0/+494
|\|
| * [Keyboard] Add MW75R2 PCB (#15042)TW594202022-02-209-0/+494
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-212-24/+8
|\|
| * [Keyboard] Fix mwstudio/mw65_rgb errors (#16410)jack2022-02-202-24/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2123-47/+1145
|\|
| * Update fix for MW65_rgb and added personal keymap (#15279)HorrorTroll2022-02-2023-47/+1145
| | | | | | | | | | | | | | | | | | | | | | * Update fix for MW65 and added personal keymap * Resolve fix * Resolved fix, again * Added missing GPLv2 license headers * Resolved issue
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-203-152/+121
|\|
| * rart67m: move OLED and WPM code to default keymap (#16403)Ryan2022-02-203-152/+121
| | | | | | | | | | | | | | | | | | * rart67m: move OLED and WPM code to default keymap * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-203-17/+7
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:16:54 +0000