summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| | | | | | | | | | |
* | | | | | | | | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See README.md
* | | | | | | | | | | Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed minor issues with Preonic readme
| * | | | | | | | | | | Fixed minor issues with Preonic readmeNoah Andrews2016-03-301-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Tiny fix of Planck diagramsMiha Rekar2016-03-301-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | preonic readmeJack Humbert2016-03-301-9/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-03-30155-41700/+38531
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-2939-40/+40
| | | | | | | | | | | |
| * | | | | | | | | | | Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | [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.
| * | | | | | | | | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added msc keymap for ergodox_ez
| | * | | | | | | | | | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-282-15/+18
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add per-event user hook function
| | * | | | | | | | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | |/ / / / / / / / /
| * / / / / / / / / / Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-282-13/+57
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
| * | | | | | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful
| | * \ \ \ \ \ \ \ \ Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | | | | | | | | | |
| | * | | | | | | | | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Adds naps62's Ergodox EZ layout
| | * | | | | | | | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Add important note about brightness on OS X
| | * | | | | | | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
| | | | | | | | |
| * | | | | | | | Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-232-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
| * | | | | | | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added project folder for Bantam-44
| | * | | | | | | | Added files for Bantam-44Norberto Monarrez2016-03-236-0/+332
| | | | | | | | | |
| * | | | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-231-5/+65
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Added layout diagrams to the default planck keymap
| | * | | | | | | | Added layout diagrams to the default planck keymapAlex Ives2016-03-161-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn>
| * | | | | | | | | Fixed LED Function CallsIBNobody2016-03-222-24/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed LED indicator function calls to match how the matrix init function calls are formatted.
| * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2284-41564/+34408
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h
| | * \ \ \ \ \ \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2113-2577/+4004
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-214-0/+1309
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | | Add Roman's Layout
| | | | * | | | | | Update readmeRoman Zolotarev2016-03-191-1/+1
| | | | | | | | | |
| | | | * | | | | | Update layoutRoman Zolotarev2016-03-1912-192/+67
| | | | | | | | | |
| | | | * | | | | | Swap volup and voldownRoman Zolotarev2016-03-181-2/+2
| | | | | | | | | |
| | | | * | | | | | Add Roman's LayoutRoman Zolotarev2016-03-1811-0/+1434
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
| | | * | | | | | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-205-1227/+1174
| | | |\ \ \ \ \ \ |