summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-51/+488
|\|
| * [Keymap] Updates to personal Drop ALT keymap (#13058)Paul Ewers2021-07-202-51/+97
| |
| * [Keyboard] Add Momoka ergo (#13127)StefanGrindelwald2021-07-208-0/+391
| | | | | | | | | | Co-authored-by: precondition <57645186+precondition@users.noreply.github.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-07-201-4/+4
|\|
| * [Keyboard] Update lm60n.h (#13249)gkeyboard2021-07-201-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+716
|\|
| * [Keyboard] Add keyboard GRS-70EC (#11296)sekigon-gonnoc2021-07-2010-0/+716
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-0/+2
|\|
| * [Docs] Added note about no split support (#12512)aydenvis2021-07-201-0/+2
| | | | | | Currently, this feature isn't supported on splits, spent about an hour troubleshooting my board and firmware before asking, and turns out it's not in place. Note added to save others from this in the future.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-208-0/+346
|\|
| * [Keyboard] Hard Light - Add keyboard, basic keymap (#12654)FateEverywhere2021-07-208-0/+346
| | | | | | | | | | Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Add Durgod Hades, Galaxy and Venus Keyboards (#12893)Jsully2021-07-2046-0/+1896
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Don Kjer <don.kjer@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-206-0/+528
|\|
| * [Keymap] Adding user code & keymaps for dumbpad & hotdox (#12924)imchipwood2021-07-206-0/+528
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-207-0/+190
|\|
| * [Keyboard] luggage rack (#12959)AlisGraveNil2021-07-207-0/+190
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2013-0/+549
|\|
| * [Keyboard] add anomalykb a65i (#12967)lfgberg2021-07-2013-0/+549
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2012-0/+371
|\|
| * [Keyboard] Add Vicious40 to QMK (#12981)Andrew Kannan2021-07-2012-0/+371
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-204-0/+958
|\|
| * Adds Swedish Mac ISO and ANSI keymaps (#13055)Carl-Fredrik Arvidson2021-07-204-0/+958
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds Swedish Mac ISO and ANSI keymaps * Replaces NBSP with space * Adds missing keys * Remove duplicates * Remove duplicates * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Change case and remove whitespace * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Fix uppercase * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Add specific files for Swedish Pro * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Remove whitespace Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-07-201-64/+64
|\|
| * Fix CRLF in xbows/knight:via config.h (#13614)Ryan2021-07-201-64/+64
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+416
|\|
| * [Keyboard] Add vault45 (#13119)projectcain2021-07-1910-0/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding my keymap * Update keyboards/projectcain/vault45/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/vault45.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md * Update keyboards/projectcain/vault45/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keyboards/projectcain/vault45/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update info.json * Update keyboards/projectcain/vault45/vault45.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/projectcain/vault45/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2014-0/+461
|\|
| * [Keyboard] Add q4z keyboard (#13198)Ryan Boone2021-07-1914-0/+461
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2014-0/+623
|\|
| * [Keyboard] Add we27 numpad (#13137)Uy Bui2021-07-1914-0/+623
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-1/+1
|\|
| * [Keyboard] fix LED issue BOCC keyboard (#13175)Michael2021-07-191-1/+1
| | | | | | Co-authored-by: Michael Wamsley <wamsl@Michaels-MacBook-Pro.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2011-0/+284
|\|
| * [Keyboard] mnk1800s initial commit (#13444)yiancar2021-07-1911-0/+284
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2011-0/+404
|\|
| * [Keyboard] Boardsource technik (#13111)cole smith2021-07-1911-0/+404
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-207-9/+237
|\|
| * [Keyboard] PORTICO: add support for wt_rgb (#13241)TerryMathews2021-07-197-9/+237
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2016-0/+596
|\|
| * [Keyboard] Add tone (#13337)ぺらねこ2021-07-1916-0/+596
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+284
|\|
| * [Keyboard] Aella Keyboard PCB (#13372)Andrew Kannan2021-07-1910-0/+284
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Switch Ergodox Infinity over to split_common (#13481)Joakim Tufvegren2021-07-197-323/+36
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2013-1/+382
|\|
| * [Keyboard] Add CannonKeys Balance PCB to QMK (#13489)Andrew Kannan2021-07-1912-0/+381
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] enable RGB underglow on heckerboards/axon40 (#13490)npspears2021-07-191-1/+1
| | | | | | This PCB uses RGB underglow LEDs. If the user doesn't want them, they can turn them off with a keycode.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2017-163/+543
|\|
| * [Keymap] Update bface p3lim keymap (#13582)Adrian L Lange2021-07-193-30/+70
| |
| * [Keyboard] Update the XBows/Knight keyboard (#13541)X-Bows Tech2021-07-1914-133/+473
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Split GMMK Pro PCBs into separate revisions (#13570)Gigahawk2021-07-1932-402/+904
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>