Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-27 | 2 | -3/+20 | |
|\| | ||||||
| * | GMMK Pro: add RESET binding, fix layout macro bug (#12684) | Ryan Mitchell | 2021-04-27 | 2 | -3/+20 | |
| | | | | | | | | | | * add RESET binding, fix layout mod key bug (fixes #12683) * remove underscore #define and use core's instead | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-27 | 9 | -424/+198 | |
|\| | ||||||
| * | Update noroadsleft userspace and keymaps (2021-04-26) (#12711) | James Young | 2021-04-26 | 9 | -424/+198 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update noroadsleft userspace and keymaps (2021-04-26) - add Discipline keymap - move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace - re-add some custom keycode handling I accidentally deleted - update VRSN keycode - update KC60 and userspace readmes * remove Git readme from kc60 keymap * update kc60:noroadsleft readme Concatenates this readme into one file, and updates the image links. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-26 | 1 | -0/+3 | |
|\| | ||||||
| * | [Keyboard] fix planck light via endpoints (#12701) | Xelus22 | 2021-04-26 | 1 | -0/+3 | |
| | | ||||||
* | | Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) | JTM | 2021-04-26 | 24 | -27/+393 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-26 | 4 | -0/+58 | |
|\| | ||||||
| * | fix configs (#12631) | Xelus22 | 2021-04-26 | 4 | -0/+58 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 10 | -0/+288 | |
|\| | ||||||
| * | [Keyboard] Ninjin (#12496) | Xelus22 | 2021-04-25 | 10 | -0/+288 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ninjin init * put in gpl thing * underglow * update to latest chibios * fix gpl headers * remove other files * fix header * Update keyboards/xelus/ninjin/readme.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/xelus/ninjin/mcuconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/xelus/ninjin/halconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 3 | -0/+266 | |
|\| | ||||||
| * | peepeetee's *very janky* hub16 keymap (#12506) | peepeetee | 2021-04-25 | 3 | -0/+266 | |
| | | | | | | | | | | | | | | | | | | * peepeetee's bodged hub16 keymap * add layer 3 lighting * actually adds layer 3 lighting * fixes layer 0; behavior is that layor 0 is unaltered from base pattern, while other states have distinct solid colors | |||||
* | | Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) ↵ | Nick Brassel | 2021-04-25 | 6 | -0/+117 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 2 | -0/+14 | |
|\| | ||||||
| * | Add RGB matrix suspend wake function for Planck/rev6 (#12290) | Albert Y | 2021-04-25 | 2 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | * Add RGB matrix suspend wake function for Planck/rev6 * Update suggested definition to allow user override. Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: filterpaper <filterpaper@localhost> Co-authored-by: Nick Brassel <nick@tzarc.org> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 2 | -0/+167 | |
|\| | ||||||
| * | [Keymap] Add Git keymap for ANAVI Macro Pad 8 (#12436) | Leon Anavi | 2021-04-25 | 2 | -0/+167 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git keymap for ANAVI Macro Pad 8 with the following shortcuts. On the first row from left to right: - git status - git log - git pull - git push On the second row from left to right: - git diff - git add - git commit - FN key to switch to the 2nd layout and control lights Reduce the number of supported RGB animations and effects in config.h to shrink the firmware size and fit it on the device. Signed-off-by: Leon Anavi <leon@anavi.org> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 11 | -0/+1045 | |
|\| | ||||||
| * | Add lm60n keyboard (#12408) | gkeyboard | 2021-04-25 | 11 | -0/+1045 | |
| | | | | | | Add lm60n keyboard | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 10 | -0/+367 | |
|\| | ||||||
| * | Add m3n3van rev2 (#12405) | Matthew Dias | 2021-04-25 | 10 | -0/+367 | |
| | | | | | | | | | | * Add m3n3van rev2 * Add via support | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 4 | -2/+74 | |
|\| | ||||||
| * | Add VIA support for Filco Majestouch 2 /w The Tiger Lily (#12401) | Christian Fehmer | 2021-04-25 | 4 | -2/+74 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 1 | -10/+0 | |
|\| | ||||||
| * | not accessible and not needed anyway for a test keymap (#12366) | Pavlos Vinieratos | 2021-04-25 | 1 | -10/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-22 | 11 | -0/+393 | |
|\| | ||||||
| * | adding keyboard (#12414) | SonOfAres | 2021-04-22 | 11 | -0/+393 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding keyboard * Update keyboards/iriskeyboards/readme.md - picture size Co-authored-by: Ryan <fauxpark@gmail.com> * Delete iriskeyboards.json, it belongs in VIA repo * Update info.json * Update readme.md * Update keyboards/iriskeyboards/keymaps/default/keymap.c Removing unnecessary layers Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-22 | 11 | -4/+115 | |
|\| | ||||||
| * | VIA support for Planck Rev6 (#9144) | George Wietor | 2021-04-22 | 11 | -4/+115 | |
| | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: George Wietor <george@LIGHT-GRAY.local> Co-authored-by: Jack Humbert <jack.humb@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-22 | 9 | -0/+240 | |
|\| | ||||||
| * | Delilah keyboard added (#12638) | rainkeebs | 2021-04-22 | 9 | -0/+240 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Delilah keyboard added * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * removed unnecessary lines as per review * removed unnecessary lines as per review Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-21 | 2 | -0/+94 | |
|\| | ||||||
| * | Personal keymap for dztech DZ60RGB plus README.md (#12485) | MechMaster48 | 2021-04-21 | 2 | -0/+94 | |
| | | | | | | | | | | | | | | * Personal keymap and README to go along with it. * Noticed typo in README and removed name from comment in keymap * Added GPL copyright notice | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 3 | -168/+74 | |
|\| | ||||||
| * | Update for the dodger keymap for the Planck (#12456) | Joshua Coffey | 2021-04-20 | 3 | -168/+74 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 9 | -0/+554 | |
|\| | ||||||
| * | [Keyboard] Siris (#12415) | Brandon Claveria | 2021-04-20 | 9 | -0/+554 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 18 | -0/+543 | |
|\| | ||||||
| * | [Keyboard] add adelais rev4 (#12443) | mechlovin | 2021-04-20 | 9 | -0/+155 | |
| | | ||||||
| * | [Keyboard] Added BKS65 Solder PCB (#12451) | Felix Jen | 2021-04-20 | 9 | -0/+388 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 7 | -0/+336 | |
|\| | ||||||
| * | [Keyboard] Add amigopunk, a handwired 75% ALPS (#12489) | Christiano Haesbaert | 2021-04-20 | 7 | -0/+336 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 4 | -18/+92 | |
|\| | ||||||
| * | [Keyboard] Matrix 1.2og AVR PCB - VIA support (#12534) | kb-elmo | 2021-04-20 | 4 | -18/+92 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 8 | -17/+57 | |
|\| | ||||||
| * | [Keyboard] Added support for the older no_led revision (#12563) | Mikkel Jeppesen | 2021-04-20 | 8 | -17/+57 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 1 | -1/+1 | |
|\| | ||||||
| * | [Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564) | duoshock | 2021-04-20 | 1 | -1/+1 | |
| | | | | | | Co-authored-by: online <33636898+online@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-20 | 18 | -2/+444 | |
|\| |