summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Fixed minor issues with Preonic readmeNoah Andrews2016-03-301-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #228 from mrfoto/fix-planck-diagramJack Humbert2016-03-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Tiny fix of Planck diagrams
| * | | | | | | | | | | 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-30179-41877/+39434
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert2016-03-2941-42/+45
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Make keymap names more consistent
| | * | | | | | | | | | | Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-2941-42/+45
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'jackhumbert/master' into ↵Noah Andrews2016-03-29147-40692/+40208
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | make-keymap-names-consistent
| * | | | | | | | | | | | Merge pull request #223 from NoahAndrews/patch-3Jack Humbert2016-03-291-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #198
| | * | | | | | | | | | | | Fix #198Noah Andrews2016-03-291-4/+9
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #222 from NoahAndrews/patch-2Jack Humbert2016-03-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | Fix error in Planck makefile comment
| | * | | | | | | | | | | 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 #219 from IBNobody/masterJack Humbert2016-03-284-13/+48
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Master
| | * | | | | | | | | | | Minor Tweaks and DocumentationIBNobody2016-03-283-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | Added command to turn LED indicators off while sleepingIBNobody2016-03-281-1/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-281-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | Added clarifying steps to Windows section of build guide
| | * | | | | | | | | | | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-281-5/+7
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews2016-03-28144-40683/+40157
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | / / / / / / / / / | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | 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-286-21/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per-event user hook function
| | * | | | | | | | | | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add action-preprocessing hook to keyboard templateDamien Pollet2016-03-282-6/+19
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Rename function to be keyboard-specificDamien Pollet2016-03-282-4/+4
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add per-event user hook function to QMKDamien Pollet2016-03-282-0/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #217 from IBNobody/masterJack Humbert2016-03-287-132/+488
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | Master
| | * | | | | | | | | | | | Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-287-132/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
| | * | | | | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2718-1150/+2950
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-257-5/+393
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #218 from awpr/patch-1Jack Humbert2016-03-281-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | Add avr-libc to the Debian build dependencies.
| | * | | | | | | | | | | | Add avr-libc to the Debian build dependencies.Andrew Pritchard2016-03-281-3/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
| * | | | | | | | | | | |