summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-206-4/+157
|\|
| * [Keyboard] CU65 layout update (#13589)Daegara2021-07-195-1/+154
| |
| * [Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem (#13579)bomb2021-07-191-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-203-0/+109
|\|
| * [Keymap] Orthon keymap for idobo (#13584)Giorgi Chavchanidze2021-07-193-0/+109
| | | | | | Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2039-19/+335
|\|
| * Six Pack and ortho_ layout updates (#13587)Suschman2021-07-1939-19/+335
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Suschman <suschman@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-202-0/+0
|\|
| * Knobgoblin: rename ortho keymap to default (#13592)James Young2021-07-192-0/+0
| | | | | | Keyboard did not previously have a `default` keymap.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-0/+118
|\|
| * converter/periboard_512: add Configurator layout data (#13600)James Young2021-07-191-0/+118
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-205-26/+187
|\|
| * fluxlab zplit: keymap restructuring (#13599)James Young2021-07-195-26/+187
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-1/+1
|\|
| * [Keyboard][Bug] Constellation Rev2 (#13595)Xelus222021-07-191-1/+1
| |
* | [Bug] Develop - Change uint32_t to layer_state_t (#13596)Xelus222021-07-19122-469/+469
| | | | | | | | | | * fix sat75 * update uint32_t to layer_state
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-182-0/+0
|\|
| * LazyDesigners Bolt: move via keymap to keymaps directory (#13581)James Young2021-07-172-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-172-18/+608
|\|
| * Discipline layout macro/Configurator fixes (#13574)James Young2021-07-172-18/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * use human-friendly formatting in info.json * move layout macro aliases to info.json * correct and complete layout data Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros. - rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl - rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl - rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl - rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-176-208/+620
|\|
| * ACR60 Refactor (#13575)James Young2021-07-176-208/+620
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * modernize acr60.h - use #pragma once include guard - add license header - use four-space indent - use QMK three-character notation for layout macro arguments * human-friendly format info.json * remove `key_count` keys from info.json * rename LAYOUT_2_shifts to LAYOUT_all * move LAYOUT_all to top * use QMK three-character notation in info.json * refactor default keymap - add license header - remove third layer (does nothing) - replace Shift-Escape keycode with KC_GESC - use LAYOUT_all macro instead of LAYOUT * modernize readme.md - update header - convert metadata section to list - add flashing and bootloader jump instructions - update Docs links * use #pragma once include guard in config.h * update LED Indicator API * add license headers