summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2712-0/+609
|\|
| * [Keyboard] Add support for bm65rgb, a revival of #13361 (#14800)peepeetee2021-10-279-0/+394
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: bytesapart <osama@bytesapart.com>
| * [Keymap] Add personal lily58 keymap (#14834)pttbx2021-10-273-0/+215
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: polplop <paultan@handshakes.com.sg> Co-authored-by: paultan <47445257+polplop@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2710-0/+258
|\|
| * [Keyboard] binepad bn009 (#14881)binepad2021-10-2710-0/+258
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2710-0/+452
|\|
| * [Keyboard] Add MW65 Series PCB (#14939)TW594202021-10-2710-0/+452
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-271-1/+1
|\|
| * [Docs] Add instructions to create keymap before proceeding (#14945)Albert Y2021-10-271-1/+1
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-278-1/+313
|\|
| * [Keyboard] Cradio keyboard (#14946)Albert Y2021-10-277-0/+312
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: filterpaper <filterpaper@localhost>
| * [Keyboard] update(readme): with PCB reset instructions (#14961)Jeremy Levy2021-10-271-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2711-36/+174
|\|
| * [Keymap] Add VLC keymap (#14956)Marc Nause2021-10-271-0/+138
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Docs/folder organization and info json fixed (#14239)jfescobar182021-10-2710-36/+36
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-270-0/+0
|\|
| * Fix white spacing issues in kb files (#14963)Drashna Jaelre2021-10-274-133/+133
| |
* | Optimize matrix scanning by removing variable shifts (#14947)Chad Austin2021-10-262-11/+14
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-2621-76/+1066
|\|
| * [Keymap] Add planck/pjanx and keebio/nyquist/pjanx keymaps (#13115)Přemysl Eric Janouch2021-10-267-0/+553
| |
| * [Keyboard] add ProjectCain Vault35; update Vault45 (#13652)projectcain2021-10-2613-62/+498
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> 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 Bot2021-10-271-0/+1
|\|
| * Add MAGIC_TOGGLE_GUI line to main keycode documentation (#14959)Albert Y2021-10-271-0/+1
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-261-0/+2
|\|
| * Document `MAGIC` feature (#14301)JayceFayne2021-10-261-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2612-0/+304
|\|
| * [Keyboard] Add minimon/Index tab 13x6 ortho (#14765)Kyrre Havik2021-10-2612-0/+304
| | | | | | | | | | 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 Bot2021-10-2615-0/+465
|\|
| * [Keyboard] add support for Phoenix45_Ortho PCB (#14798)npspears2021-10-2615-0/+465
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-262-0/+34
|\|
| * [Keymap] Add via keymap for meishi2 (#14892)MakotoKurauchi2021-10-262-0/+34
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-261-13/+12
|\|
| * Update mcu_selection.mk with current ChibiOS path (#14909)MasterSpoon2021-10-261-13/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-261-0/+58
|\|
| * [Keymap] Adding a new keymap for bm60poker and some led configs (#14918)David Martinz2021-10-261-0/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2621-0/+1242
|\|
| * [Keyboard] Add Mammoth75x (#14925)GG2021-10-2621-0/+1242
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2621-0/+1082
|\|
| * [Keyboard] Add zoom65 (#14926)GG2021-10-2621-0/+1082
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2631-35/+4
|\|
| * Remove unused KEYBOARD_LOCK_ENABLE from rules (#14920)Drashna Jaelre2021-10-2531-35/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-251-0/+2
|\|
| * [Keyboard] temporary fix for SpiderIsland 78 (#14935) (#14941)Lucas Rodrigues2021-10-251-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-241-1/+1
|\|
| * Fix Typo in documentation (#14942)coliss862021-10-241-1/+1
| |
* | Begin to carve out platform/protocol API - Migrate keyboard_* calls (#14888)Joel Challis2021-10-245-35/+27
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-244-3355/+461
|\|
| * Tidy up ADNS9800 and PMW3360 firmware blobs (#14936)Ryan2021-10-244-3355/+461
| |
* | Align usbasp flashing behaviour (#14928)Joel Challis2021-10-241-0/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-1/+35
|\|