Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update compile_keymap.py | mbarkhau | 2016-03-29 | 1 | -13/+11 |
| | |||||
* | add hex file | Manuel Barkhau | 2016-03-28 | 1 | -0/+1624 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Manuel Barkhau | 2016-03-28 | 36 | -1305/+4815 |
|\ | |||||
| * | Merge pull request #216 from msc654/master | Erez Zukerman | 2016-03-28 | 6 | -0/+1334 |
| |\ | | | | | | | Added msc keymap for ergodox_ez | ||||
| | * | Corrected duplicate image issue | Matthew Carroll | 2016-03-28 | 1 | -0/+0 |
| | | | |||||
| | * | Added msc keymap for ergodox_ez | Matthew Carroll | 2016-03-27 | 6 | -0/+1334 |
| | | | |||||
| * | | Merge pull request #214 from cdlm/action-hook | Jack Humbert | 2016-03-28 | 6 | -21/+45 |
| |\ \ | | | | | | | | | Add per-event user hook function | ||||
| | * | | Add action-preprocessing kb/user hooks in planck | Damien Pollet | 2016-03-28 | 2 | -15/+18 |
| | | | | |||||
| | * | | Add action-preprocessing hook to keyboard template | Damien Pollet | 2016-03-28 | 2 | -6/+19 |
| | | | | |||||
| | * | | Rename function to be keyboard-specific | Damien Pollet | 2016-03-28 | 2 | -4/+4 |
| | | | | |||||
| | * | | Add per-event user hook function to QMK | Damien Pollet | 2016-03-28 | 2 | -0/+8 |
| | | | | |||||
| * | | | Merge pull request #217 from IBNobody/master | Jack Humbert | 2016-03-28 | 7 | -132/+488 |
| |\ \ \ | | | | | | | | | | | Master | ||||
| | * | | | Magic Key Overrides / Keyboard Lock / Forced NKRO | IBNobody | 2016-03-28 | 7 | -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' | IBNobody | 2016-03-27 | 18 | -1150/+2950 |
| | |\| | | |||||
| | * | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-03-25 | 7 | -5/+393 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge pull request #218 from awpr/patch-1 | Jack Humbert | 2016-03-28 | 1 | -3/+3 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Add avr-libc to the Debian build dependencies. | ||||
| | * | | | | Add avr-libc to the Debian build dependencies. | Andrew Pritchard | 2016-03-28 | 1 | -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-156 | Erez Zukerman | 2016-03-27 | 4 | -2/+23 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Fix #156: clear weak mods on every key press | ||||
| | * | | | Fix #156: clear weak mods on every key press | Didier Loiseau | 2016-03-08 | 4 | -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/master | Erez Zukerman | 2016-03-27 | 10 | -1147/+1232 |
| |\ \ \ \ | | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful | ||||
| | * \ \ \ | Merge https://github.com/jackhumbert/qmk_firmware | Nicholas Keene | 2016-03-26 | 1 | -1/+5 |
| | |\ \ \ \ | |||||
| | * | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful | Nicholas Keene | 2016-03-26 | 10 | -1109/+1192 |
| | | | | | | | |||||
| | * | | | | | The Ordinary Layout is familiar to users of common keyboards | Nicholas Keene | 2016-03-24 | 1 | -58/+60 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #196 from naps62/naps62 | Erez Zukerman | 2016-03-27 | 3 | -0/+1690 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Adds naps62's Ergodox EZ layout | ||||
| | * | | | | Adds naps62's layout | Miguel Palhas | 2016-03-15 | 3 | -0/+1690 |
| | | | | | | |||||
* | | | | | | Refactor compiler code | Manuel Barkhau | 2016-03-28 | 3 | -1661/+1900 |
| | | | | | | |||||
* | | | | | | Add manuneo layout | Manuel Barkhau | 2016-03-27 | 3 | -0/+1918 |
|/ / / / / | |||||
* | | | | | Merge pull request #207 from romanzolotarev/master | Erez Zukerman | 2016-03-25 | 1 | -1/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add important note about brightness on OS X | ||||
| * | | | | Add important note about brightness on OS X | Roman Zolotarev | 2016-03-22 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Merge pull request #210 from n0bs/master | Jack Humbert | 2016-03-23 | 2 | -16/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190 | ||||
| * | | | | | Edited to work with jackhumbert/qmk_firmware pull #190 | Norberto Monarrez | 2016-03-23 | 2 | -16/+12 |
|/ / / / / | | | | | | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)" | ||||
* | | | | | Merge pull request #209 from n0bs/master | Jack Humbert | 2016-03-23 | 6 | -0/+332 |
|\ \ \ \ \ | | | | | | | | | | | | | Added project folder for Bantam-44 | ||||
| * | | | | | Added files for Bantam-44 | Norberto Monarrez | 2016-03-23 | 6 | -0/+332 |
| | | | | | | |||||
* | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layout | Jack Humbert | 2016-03-23 | 1 | -5/+65 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Added layout diagrams to the default planck keymap | ||||
| * | | | | | Added layout diagrams to the default planck keymap | Alex Ives | 2016-03-16 | 1 | -5/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn> | ||||
* | | | | | | Merge pull request #199 from IBNobody/master | Jack Humbert | 2016-03-22 | 11 | -6/+420 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | Added LED Indicator Support to QMK Template | ||||
| * | | | | | Fixed extra semicolons. | IBNobody | 2016-03-22 | 2 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed extra semicolons. | ||||
| * | | | | | Fixed LED Function Calls | IBNobody | 2016-03-22 | 4 | -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' | IBNobody | 2016-03-22 | 88 | -41597/+34428 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h | ||||
* | | | | | | Merge pull request #190 from yoyoerx/function_pointers | Erez Zukerman | 2016-03-22 | 82 | -41462/+33034 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Addressing void* return warning & coding style | ||||
| * \ \ \ \ \ | Pull request 190 resolution with 'qmk/master' for merge | yoyoerx | 2016-03-21 | 15 | -2579/+4317 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #205 from romanzolotarev/master | Erez Zukerman | 2016-03-21 | 4 | -0/+1309 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Add Roman's Layout | ||||
| * | | | | | | Update readme | Roman Zolotarev | 2016-03-19 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update layout | Roman Zolotarev | 2016-03-19 | 12 | -192/+67 |
| | | | | | | | |||||
| * | | | | | | Swap volup and voldown | Roman Zolotarev | 2016-03-18 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Add Roman's Layout | Roman Zolotarev | 2016-03-18 | 11 | -0/+1434 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW. | ||||
* | | | | | | Merge pull request #203 from XenoBits/master | Erez Zukerman | 2016-03-20 | 5 | -1227/+1174 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improved c# dev layout, only 2 layers now | ||||
| * | | | | | | Fixed png image | Maxime Millet | 2016-03-20 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | CSharp dev layout V2 | Maxime Millet | 2016-03-20 | 5 | -1227/+1174 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #201 from uzytkownik/master | Erez Zukerman | 2016-03-20 | 2 | -1497/+1503 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Further improvements to mpiechotka keyboard |