summaryrefslogtreecommitdiff
path: root/keyboard
AgeCommit message (Collapse)Author
2016-03-29Updated several keyboard folders to use new keymap naming schemeNoah Andrews
2016-03-29Update compile_keymap.pymbarkhau
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-29added CTL_Shift / Hash macroStephan Bösebeck
2016-03-28add hex fileManuel Barkhau
2016-03-28Merge remote-tracking branch 'origin/master'Manuel Barkhau
2016-03-28Refactor compiler codeManuel Barkhau
2016-03-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck
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-28Updated hexAlex Johnstone
2016-03-28££££Alex Johnstone
2016-03-28Forgot to change ent/spcAlex Johnstone
2016-03-28Add action-preprocessing kb/user hooks in planckDamien Pollet
2016-03-28Didn'tAlex Johnstone
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-27Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone
2016-03-27Merge pull request #4 from jackhumbert/masterAlex Johnstone
upstream
2016-03-27Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone
2016-03-27The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene
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-27Add manuneo layoutManuel Barkhau
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 #3 from jackhumbert/masterAlex Johnstone
Pull upstream
2016-03-25Merge pull request #207 from romanzolotarev/masterErez Zukerman
Add important note about brightness on OS X
2016-03-24The Ordinary Layout is familiar to users of common keyboardsNicholas Keene
2016-03-24minor changesStephan Bösebeck
2016-03-24Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck
2016-03-23New :pound: methodAlex Johnstone
2016-03-23New :pound: methodAlex Johnstone
2016-03-23New :pound: methodAlex Johnstone
2016-03-23New :pound: methodAlex Johnstone
2016-03-23New :pound: methodAlex Johnstone
2016-03-23Wrong dateAlex Johnstone
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-22Removed whitespaceAlex Johnstone
2016-03-22Revised to version 0.1.0Alex Johnstone
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 #2 from jackhumbert/masterAlex Johnstone
Update my repo to upstream
2016-03-22Meh -> HyperAlex Johnstone
2016-03-22Update readme.mdAlex Johnstone
2016-03-22Added photoAlex Johnstone