summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-29Fix error in Planck makefile commentNoah Andrews
[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
2016-03-28Merge pull request #219 from IBNobody/masterJack Humbert
Master
2016-03-28Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert
Added clarifying steps to Windows section of build guide
2016-03-28Added clarifying steps to Windows section of build guideNoah Andrews
2016-03-28Minor Tweaks and DocumentationIBNobody
Fixed compiler warning by including bootloader.h in keymap_common.c. Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined. Added extra documentation to the template config.h
2016-03-28Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews
2016-03-28Added command to turn LED indicators off while sleepingIBNobody
2016-03-28Merge pull request #216 from msc654/masterErez Zukerman
Added msc keymap for ergodox_ez
2016-03-28Merge pull request #214 from cdlm/action-hookJack Humbert
Add per-event user hook function
2016-03-28Merge pull request #217 from IBNobody/masterJack Humbert
Master
2016-03-28Merge pull request #218 from awpr/patch-1Jack Humbert
Add avr-libc to the Debian build dependencies.
2016-03-28Add avr-libc to the Debian build dependencies.Andrew Pritchard
Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
2016-03-28Add action-preprocessing kb/user hooks in planckDamien Pollet
2016-03-28Add action-preprocessing hook to keyboard templateDamien Pollet
2016-03-28Rename function to be keyboard-specificDamien Pollet
2016-03-28Add per-event user hook function to QMKDamien Pollet
2016-03-28Corrected duplicate image issueMatthew Carroll
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
2016-03-27Added msc keymap for ergodox_ezMatthew Carroll
2016-03-27Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-03-27Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman
Fix #156: clear weak mods on every key press
2016-03-27Merge pull request #211 from nrrkeene/masterErez Zukerman
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27Merge pull request #196 from naps62/naps62Erez Zukerman
Adds naps62's Ergodox EZ layout
2016-03-26Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene
2016-03-26The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene
2016-03-25Merge pull request #207 from romanzolotarev/masterErez Zukerman
Add important note about brightness on OS X
2016-03-25Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-03-24The Ordinary Layout is familiar to users of common keyboardsNicholas Keene
2016-03-23Merge pull request #210 from n0bs/masterJack Humbert
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
2016-03-23Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
2016-03-23Merge pull request #209 from n0bs/masterJack Humbert
Added project folder for Bantam-44
2016-03-23Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert
Added layout diagrams to the default planck keymap
2016-03-23Added files for Bantam-44Norberto Monarrez
2016-03-22Merge pull request #199 from IBNobody/masterJack Humbert
Added LED Indicator Support to QMK Template
2016-03-22Fixed extra semicolons.IBNobody
Fixed extra semicolons.
2016-03-22Fixed LED Function CallsIBNobody
Fixed LED indicator function calls to match how the matrix init function calls are formatted.
2016-03-22Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
# Conflicts: # quantum/template/template.c # quantum/template/template.h
2016-03-22Merge pull request #190 from yoyoerx/function_pointersErez Zukerman
Addressing void* return warning & coding style
2016-03-22Add important note about brightness on OS XRoman Zolotarev
2016-03-21Pull request 190 resolution with 'qmk/master' for mergeyoyoerx
2016-03-21Merge pull request #205 from romanzolotarev/masterErez Zukerman
Add Roman's Layout
2016-03-20Merge pull request #203 from XenoBits/masterErez Zukerman
Improved c# dev layout, only 2 layers now
2016-03-20Merge pull request #201 from uzytkownik/masterErez Zukerman
Further improvements to mpiechotka keyboard
2016-03-20Fixed png imageMaxime Millet
2016-03-20CSharp dev layout V2Maxime Millet
2016-03-19Update readmeRoman Zolotarev
2016-03-19Update layoutRoman Zolotarev
2016-03-18Swap volup and voldownRoman Zolotarev
2016-03-18Add Roman's LayoutRoman Zolotarev
Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
2016-03-17Add waits to prevent KVM from hangingMaciej Piechotka
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 09:09:51 +0000