summaryrefslogtreecommitdiffstats
path: root/keyboard
AgeCommit message (Collapse)AuthorFilesLines
2016-03-30Merge pull request #227 from NoahAndrews/patch-4Jack Humbert1-2/+2
Fixed minor issues with Preonic readme
2016-03-30Tiny fix of Planck diagramsMiha Rekar1-2/+2
2016-03-30Fixed minor issues with Preonic readmeNoah Andrews1-2/+2
2016-03-30preonic readmeJack Humbert1-9/+3
2016-03-30Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert155-41700/+38531
2016-03-30.hex filesJack Humbert3-2/+2893
2016-03-30preonic updateJack Humbert19-1844/+64
2016-03-30Updated several keyboard folders to use new keymap naming schemeNoah Andrews39-40/+40
2016-03-29Fix error in Planck makefile commentNoah Andrews1-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.
2016-03-28Merge pull request #216 from msc654/masterErez Zukerman6-0/+1334
Added msc keymap for ergodox_ez
2016-03-28Merge pull request #214 from cdlm/action-hookJack Humbert2-15/+18
Add per-event user hook function
2016-03-28Add action-preprocessing kb/user hooks in planckDamien Pollet2-15/+18
2016-03-28Corrected duplicate image issueMatthew Carroll1-0/+0
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2-13/+57
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
2016-03-28Added msc keymap for ergodox_ezMatthew Carroll6-0/+1334
2016-03-27Merge pull request #211 from nrrkeene/masterErez Zukerman10-1147/+1232
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27Merge pull request #196 from naps62/naps62Erez Zukerman3-0/+1690
Adds naps62's Ergodox EZ layout
2016-03-26Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene1-1/+5
2016-03-26The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene10-1109/+1192
2016-03-25Merge pull request #207 from romanzolotarev/masterErez Zukerman1-1/+5
Add important note about brightness on OS X
2016-03-25The Ordinary Layout is familiar to users of common keyboardsNicholas Keene1-58/+60
2016-03-23Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2-16/+12
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
2016-03-23Merge pull request #209 from n0bs/masterJack Humbert6-0/+332
Added project folder for Bantam-44
2016-03-23Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert1-5/+65
Added layout diagrams to the default planck keymap
2016-03-23Added files for Bantam-44Norberto Monarrez6-0/+332
2016-03-23Fixed LED Function CallsIBNobody2-24/+12
Fixed LED indicator function calls to match how the matrix init function calls are formatted.
2016-03-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody84-41564/+34408
# Conflicts: # quantum/template/template.c # quantum/template/template.h
2016-03-22Add important note about brightness on OS XRoman Zolotarev1-1/+5
2016-03-21Pull request 190 resolution with 'qmk/master' for mergeyoyoerx13-2577/+4004
2016-03-21Merge pull request #205 from romanzolotarev/masterErez Zukerman4-0/+1309
Add Roman's Layout
2016-03-20Merge pull request #203 from XenoBits/masterErez Zukerman5-1227/+1174
Improved c# dev layout, only 2 layers now
2016-03-20Fixed png imageMaxime Millet1-0/+0
2016-03-20CSharp dev layout V2Maxime Millet5-1227/+1174
2016-03-19Update readmeRoman Zolotarev1-1/+1
2016-03-19Update layoutRoman Zolotarev12-192/+67
2016-03-18Swap volup and voldownRoman Zolotarev1-2/+2
2016-03-18Add Roman's LayoutRoman Zolotarev11-0/+1434
Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
2016-03-17Add waits to prevent KVM from hangingMaciej Piechotka2-1490/+1492
2016-03-17Put frequently used keys in shell (-=) under thumbMaciej Piechotka2-9/+9
2016-03-17Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2-1233/+1237
2016-03-17Added layout diagrams to the default planck keymapAlex Ives1-5/+65
Signed-off-by: Alex Ives <alex@ives.mn>
2016-03-16Adding Retro_Refit KeyboardIBNobody6-0/+400
Retro_Refit is an example of using a Teensy to replace a keyboard controller on an older keyboard. The original 6x15 keyboard had a non-standard 11x8 matrix.
2016-03-15Adds naps62's layoutMiguel Palhas3-0/+1690
2016-03-14Cygwin Based Users Guide v0.6 -fixes to dfu-programmer buildyoyoerx1-6/+8
2016-03-11PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx33-41292/+32894
2016-03-11First keyboard layoutMitch Lloyd1-0/+49
2016-03-10Addressed void* return warning in all keymapsyoyoerx44-149/+128
2016-03-10Merge remote-tracking branch 'qmk/master' into windocsyoyoerx1-27/+24
2016-03-09Cygwin Based Users Guide v0.5 -further correctionsyoyoerx1-347/+353
2016-03-09Cygwin Based Users Guide v0.4 -corrections/dfu buildyoyoerx1-18/+128