summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Keyboard][Bug] Add timer_avr to includes for broken builds (#13641)Dasky2021-07-224-0/+4
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-221-12/+12
|\
| * [Keyboard] Fixing info.json for h0oni/hotduck (#13640)Md. Mashur Shalehin Sakib2021-07-221-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-223-1/+265
|\|
| * [Keyboard] Ymd40v2new layouts and fixed per-switch backlight (#13622)Trent Hoh2021-07-223-1/+265
| |
* | [Bug] Develop - DC01 left (#13597)Xelus222021-07-222-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-222-15/+20
|\|
| * [Keyboard] Fix clawsome/hatchback and reviung5 compile issues (#13607)Drashna Jaelre2021-07-222-15/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2219-0/+574
|\|
| * [Keyboard] add ogurec (#13242)drhigsby2021-07-2219-0/+574
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Add Durgod Taurus K310 keyboard (#12314)Donald Kjer2021-07-2252-642/+1945
| | | | | | | | Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca> Co-authored-by: Simon Arlott <sa.me.uk>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2212-95/+88
|\|
| * [Keyboard] Updated keyboard & keymaps (#12667)farfalleflickan2021-07-2112-95/+88
| | | | | | Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2213-28/+302
|\|
| * [Keyboard] add SPRH keyboard (#12999)joedinkle2021-07-2113-28/+302
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Retain brightness with lighting layers (#13025)Patrick Stadler2021-07-212-0/+11
| | | | | | | | Add guard `RGBLIGHT_LAYERS_RETAIN_VAL` to retain the currently used val when applying lighting layers.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2211-0/+399
|\|
| * [Keyboard] Add keypad Satxri6key (#13423)Sắn2021-07-2111-0/+399
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2214-0/+594
|\|
| * [Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438)jmaynard2021-07-2114-0/+594
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-227-0/+257
|\|
| * [Keyboard] Add Ristretto Keyboard (#13479)Brandon Lewis2021-07-217-0/+257
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Brandon Lewis <blewis308@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2215-0/+552
|\|
| * [Keyboard] New Keyboard - OBE (#13545)Kyle McCreery2021-07-2115-0/+552
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-224-0/+420
|\|
| * [Keyboard] Add personal planck keymap (#13635)Adam Abrams2021-07-214-0/+420
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-222-0/+37
|\|
| * [Keymap] narze/xd004 (#13634)Manassarn "Noom" Manoonchai2021-07-212-0/+37
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-229-0/+354
|\|
| * [Keyboard] Add h0oni hotduck keyboard (#13609)Md. Mashur Shalehin Sakib2021-07-219-0/+354
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-214-28/+7
|\|
| * Fix API generation failure caused by GRS-70EC (#13631)Ryan2021-07-212-12/+2
| |
| * Fix MATRIX_COLS for peranekofactory/tone (#13632)Ryan2021-07-212-16/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-212-4/+4
|\|
| * fixed number layer on keymap (#13627)Alabahuy2021-07-212-4/+4
| |
* | Fix MATRIX_COLS for aeboards/constellation/rev2 (#13633)Ryan2021-07-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-211-10/+10
|\|
| * [Keyboard] Fix iso layout compile error (#13628)gkeyboard2021-07-211-10/+10
| | | | | | Fix iso layout compile erreo on qmk web.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-212-12/+12
|\|
| * [Bug] VIA compile fixes (#13626)Xelus222021-07-212-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-219-0/+398
|\|
| * [Keyboard] add rartland with via support (#13585)Alabahuy2021-07-209-0/+398
| | | | | | | | | | | | | | * add rartland and via support * moved encoder adn oled to c file * update c file
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-211-1/+1
|\|
| * Fix vicious40 rules (#13623)Andrew Kannan2021-07-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+298
|\|
| * [Keyboard] Add Tiger910 (#12605)Weirdo2021-07-2010-0/+298
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] GameBuddy v1.M (#12637)AlisGraveNil2021-07-2014-5/+204
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-96/+334
|\|
| * [Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744)Conor Burns2021-07-2010-96/+334
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Move all our CLI file formatters to the format dir (#13296)Zach White2021-07-207-148/+240
| | | | | | | | | | | | | | | | | | * move all our file formatters to the format dir * Apply suggestions from code review Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>