summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18Add ferris 0.2 (#12133)Pierre Chevalier
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-17mcrown crkbd new keymap (#12092)MarioCorona
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-16Ergodone via support (#11618)Harshit Goel
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-16Bug in beautifier script, compound modifiers not correctly parsed (#12595)sendmmsg
2021-04-15Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes (#11935)Joshua Diamond
* Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes * Better comment Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-15Fix audio on WT60-XT (#12526)Wilba
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-15Optimize NIBBLE oled_bongocat keymap to reduce flash usage (#12330)Jay Greco
* Optimize with squeez-o frame compression Adds VIA support! * Clean up for PR + Add copyright header - Remove debug print statements
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-15update readme (#12322)MechMerlin
2021-04-15LED Matrix: Task system (#12580)Ryan
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14Add support for tab completion (#12411)Zach White
* Add support for tab completion * make flake8 happy * Add documentation
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14Dactyl manuform 5x6 2 5 keymap (#11353)Jan Christoph Ebersbach
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys * fix(keymap): add missing readme * chore: add gpl2 license header * chore: add gpl2 license header * docs[dactyl_manuform_5x6_2_5]: reformat readme Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14[Keyboard] CyberGear Macro25 (#12518)Marius Kavoliunas
* add cybergear macro25 keyboard * add readme and fix file namings * rename readme.md * separate default and via keymaps * add info.json * unify info.json and key coordinates * remove via json * add missing via layers * Update keyboards/cybergear/macro25/keymaps/via/rules.mk * Update keyboards/cybergear/macro25/macro25.c * Update keyboards/cybergear/macro25/macro25.h * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * remove unnecessary config.h parameters * Update keyboards/cybergear/macro25/config.h * remove MATRIX_ROWS and COLS from config.h * Apply suggestions from code review set to LAYOUT_ortho_2x5 and fix grammar
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13[Keyboard] Add Caffeinated Studios Serpent65 (#12578)J.Flanagan
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13Correct layout macro name in Cannonkeys Ortho75 info.json (#12581)James Young
2021-04-13[CI] Format code according to conventions (#12570)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13[Keymap] ANAVI Macro Pad 2 add Google Meet keymap (#12449)Leon Anavi
This keymap for ANAVI Macro Pad 2 contains a couple of shortcuts for Google Meet: - left key: turn on/off the microphone (mute button) - right key: turn on/off the camera Signed-off-by: Leon Anavi <leon@anavi.org>
2021-04-13Terrazzo: Fix wrong LED Matrix function names (#12561)Ryan
2021-04-13LED Matrix: suspend code (#12509)Ryan
2021-04-13[Keymap] Add kzar keymap for Kinesis Advantage (#12444)Dave Vandyke
2021-04-12Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite (#12172)James Young
2021-04-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-12Merc updates (#12289)Kyle McCreery
2021-04-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-12Update layout option for lazydesigners/THE40 (#12312)jackytrabbit
2021-04-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-11A few small typo fixes in docs (#12524)Arthur Tabatchnic
2021-04-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-11Documentation update (#12484)swampmonster
Update documentation to reflect what the actual target flags are Co-authored-by: swampmonster <>
2021-04-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-11Update readme.md (#12502)Joseph Whom
Noticed a letter missing in "compiling".
2021-04-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-11Update github instruction link in newbs_getting_started.md (#12510)Hawley Waldman
Clarify that the link to the github/forking instructions is a link to how to fork this project. Previous wording implied that the link was to a how-to-use github in general page.
2021-04-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-10Format code according to conventions (#12540)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-10ChibiOS USB driver: prevent deadlock with CONSOLE_ENABLE = yes (#12472)Michael Stapelberg
Before this commit, attaching an ARM-based (i.e. ChibiOS-based) keyboard that uses CONSOLE_ENABLE = yes and produces debug messages would deadlock the keyboard unless one was running hid_listen. With this commit, dead-locking writes to the queue are detected and prevented. fixes #5631
2021-04-10Merge remote-tracking branch 'origin/master' into developQMK Bot