summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman2016-03-274-2/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix #156: clear weak mods on every key press
| * | | | Fix #156: clear weak mods on every key pressDidier Loiseau2016-03-084-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new macro_mods bit field for mods applied by macros - weak_mods now only used for ACT_{L,R}MODS (i.e. LSFT, RSFT, LCTL etc.) - clear the _weak_ mods on every key *pressed* such that LSFT etc. can no more interfere with the next key
* | | | | 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
| | | | | |
* | | | | | Merge pull request #210 from n0bs/masterJack Humbert2016-03-232-16/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
| * | | | | | 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>
* | | | | | | Merge pull request #199 from IBNobody/masterJack Humbert2016-03-2211-6/+420
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | Added LED Indicator Support to QMK Template
| * | | | | | Fixed extra semicolons.IBNobody2016-03-222-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed extra semicolons.
| * | | | | | Fixed LED Function CallsIBNobody2016-03-224-34/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2288-41597/+34428
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h
* | | | | | | Merge pull request #190 from yoyoerx/function_pointersErez Zukerman2016-03-2282-41462/+33034
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Addressing void* return warning & coding style
| * \ \ \ \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2115-2579/+4317
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 17:55:03 +0000