summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-30Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert179-41877/+39434
2016-03-30.hex filesJack Humbert3-2/+2893
2016-03-30preonic updateJack Humbert20-1846/+66
2016-03-30Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert41-42/+45
Make keymap names more consistent
2016-03-30Updated several keyboard folders to use new keymap naming schemeNoah Andrews41-42/+45
2016-03-30Merge remote-tracking branch 'jackhumbert/master' into ↵Noah Andrews147-40692/+40208
make-keymap-names-consistent
2016-03-29Merge pull request #223 from NoahAndrews/patch-3Jack Humbert1-4/+9
Fix #198
2016-03-29Fix #198Noah Andrews1-4/+9
2016-03-29Merge pull request #222 from NoahAndrews/patch-2Jack Humbert1-1/+1
Fix error in Planck makefile comment
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-29Merge pull request #219 from IBNobody/masterJack Humbert4-13/+48
Master
2016-03-29Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert1-5/+7
Added clarifying steps to Windows section of build guide
2016-03-29Added clarifying steps to Windows section of build guideNoah Andrews1-5/+7
2016-03-29Minor Tweaks and DocumentationIBNobody3-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
2016-03-29Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews144-40683/+40157
2016-03-28Added command to turn LED indicators off while sleepingIBNobody1-1/+4
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 Humbert6-21/+45
Add per-event user hook function
2016-03-28Merge pull request #217 from IBNobody/masterJack Humbert7-132/+488
Master
2016-03-28Merge pull request #218 from awpr/patch-1Jack Humbert1-3/+3
Add avr-libc to the Debian build dependencies.
2016-03-28Add avr-libc to the Debian build dependencies.Andrew Pritchard1-3/+3
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 Pollet2-15/+18
2016-03-28Add action-preprocessing hook to keyboard templateDamien Pollet2-6/+19
2016-03-28Rename function to be keyboard-specificDamien Pollet2-4/+4
2016-03-28Add per-event user hook function to QMKDamien Pollet2-0/+8
2016-03-28Corrected duplicate image issueMatthew Carroll1-0/+0
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody7-132/+488
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 remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody18-1150/+2950
2016-03-27Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman4-2/+23
Fix #156: clear weak mods on every key press
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-25Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody7-5/+393
2016-03-25The Ordinary Layout is familiar to users of common keyboardsNicholas Keene1-58/+60
2016-03-23Merge pull request #210 from n0bs/masterJack Humbert2-16/+12
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
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-23Merge pull request #199 from IBNobody/masterJack Humbert11-6/+420
Added LED Indicator Support to QMK Template
2016-03-23Fixed extra semicolons.IBNobody2-9/+6
Fixed extra semicolons.
2016-03-23Fixed LED Function CallsIBNobody4-34/+22
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'IBNobody88-41597/+34428
# Conflicts: # quantum/template/template.c # quantum/template/template.h
2016-03-22Merge pull request #190 from yoyoerx/function_pointersErez Zukerman82-41462/+33034
Addressing void* return warning & coding style
2016-03-22Add important note about brightness on OS XRoman Zolotarev1-1/+5
2016-03-21Pull request 190 resolution with 'qmk/master' for mergeyoyoerx15-2579/+4317
2016-03-21Merge pull request #205 from romanzolotarev/masterErez Zukerman4-0/+1309
Add Roman's Layout
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-07-15 16:06:27 +0200