summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-277-12/+30
|\
| * [Keyboard] Adjustments to Gust Rev1.2 (#12716)Eithan Shavit2021-05-267-12/+30
| | | | | | Co-authored-by: Eithan Shavit <eithan@afternoonlabs.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-279-0/+315
|\|
| * [Keyboard] SKErgo (#12923)C1intMason2021-05-269-0/+315
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-275-213/+354
|\|
| * [Keymap] update gunp layout for Planck (#12926)Gun Pinyo2021-05-265-213/+354
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Add Full-duplex serial driver for ARM boards (#9842)Stefan Kerkmann2021-05-264-56/+506
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2611-4/+600
|\|
| * Keyboard: Planck THK (#12597)Erovia2021-05-2611-4/+600
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jack Humbert <jack.humb@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)Drashna Jaelre2021-05-2534-321/+475
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2510-0/+307
|\|
| * Added RAMA WORKS M50-AX (#12458)Wilba2021-05-2510-0/+307
| |
* | Merge remote-tracking branch 'origin/master' into developZach White2021-05-240-0/+0
|\|
| * Use milc.subcommand.config instead of qmk.cli.config (#13002)Zach White2021-05-243-123/+1
| | | | | | | | | | | | | | * Use milc.subcommand.config instead * pyformat * remove the config test
* | [Keyboard] Corne - Remove legacy revision support (#12226)Drashna Jaelre2021-05-2471-2269/+215
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-252-7/+20
|\|
| * search for the readme in higher directories as well (#12997)Zach White2021-05-242-7/+20
| |
* | Do not hard set config in CPTC files (#11864)Drashna Jaelre2021-05-222-6/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-229-0/+321
|\|
| * [Keyboard] AkiS (#12910)Xelus222021-05-229-0/+321
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-11/+83
|\|
| * westfoxtrot Cyclops: Configurator key sequence fix (#12979)James Young2021-05-221-11/+83
| |
* | [Keyboard] Fix Terrazzo build failure (#12977)Ryan2021-05-215-24/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-10/+84
|\|
| * Caffeinated Serpent65: Configurator layout data fix (#12972)James Young2021-05-211-10/+84
| |
* | Convert Encoder callbacks to be boolean functions (#12805)Drashna Jaelre2021-05-21437-2132/+2539
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-222-2/+2
|\|
| * [Keymap] Fix wrong BASE layer for default and OLED keymaps (#12932)Jay Greco2021-05-212-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-224-139/+12
|\|
| * [Keymap] simplify layout in motform keymap (#12927)Love Lagerkvist2021-05-214-139/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-2/+2
|\|
| * [Docs] Fix typos in audio config in main config page (#12928)shela2021-05-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-1/+1
|\|
| * [Keyboard] Fix typo in summer breeze hardware layout (#12938)David Fryer2021-05-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2212-1/+352
|\|
| * [Keyboard] Add Prototypist J01 rev 1 support (#12825)Flexerm2021-05-2111-0/+351
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Updated NK87 GPIO (#12865)yiancar2021-05-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-220-0/+0
|\|
| * [Keyboard] Add WTF60 (#12883)Danny2021-05-210-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2220-0/+1038
|\|
| * [Keyboard] Add WTF60 (#12883)Danny2021-05-2110-0/+292
| |
| * [Keyboard] New Keyboard - Murphpad (#12885)Kyle McCreery2021-05-2110-0/+746
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2229-0/+1049
|\|
| * [Keyboard] Add support for alfredslab 65 (#12334)spooknik2021-05-2129-0/+1049
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Add support for up to 4 IS31FL3733 drivers (#12342)Donald Kjer2021-05-215-29/+167
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-224-0/+357
|\|
| * [Keymap] Add kanbara's planck/rev4 keymap (#12486)Jay2021-05-214-0/+357
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jay Morrow <jay.morrow@apple.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-229-0/+343
|\|
| * [Keyboard] Add 75 Pixels Ortholinear Keyboard (#12220)Sendy Aditya Suryana2021-05-219-0/+343
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
* | ensure we do not conflict with existing keymap aliases (#12976)Zach White2021-05-211-1/+3
| |