Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Always initialze the Infinity Ergodox backlight | Fred Sundvik | 2016-11-20 | 2 | -26/+5 |
| | | | | | Otherwise it will stay lit. The set_led functionality is also disabled since it doesn't work properly for slaves. | ||||
* | Merge pull request #878 from sethbc/add_sethbc_gh60_keymap | Jack Humbert | 2016-11-19 | 5 | -68/+148 |
|\ | | | | | add sethbc keymap for gh60 and update macro expansion | ||||
| * | remove KC expansion from GH60 | Seth Chandler | 2016-11-19 | 4 | -99/+55 |
| | | |||||
| * | move KC expansion to separate macros | Seth Chandler | 2016-11-19 | 4 | -23/+66 |
| | | |||||
| * | merge upstream/master | Seth Chandler | 2016-11-19 | 49 | -378/+2213 |
| |\ | |/ |/| | |||||
* | | don't always detect a matrix change (fixes debounce) | Jack Humbert | 2016-11-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #883 from climbalima/master | Jack Humbert | 2016-11-16 | 25 | -129/+760 |
|\ \ | | | | | | | added rev2 lets split after merging with qmk | ||||
| * | | fixed readme conflicts | climbalima | 2016-11-16 | 1 | -20/+2 |
| | | | |||||
| * | | should have fixed conflixed | climbalima | 2016-11-16 | 13 | -268/+10 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-11-16 | 24 | -249/+1453 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #882 from seebs/master | Jack Humbert | 2016-11-16 | 2 | -0/+244 |
|\ \ \ | | | | | | | | | dvorak/plover keyboard layout | ||||
| * | | | dvorak/plover keyboard layout | Seebs | 2016-11-16 | 2 | -0/+244 |
|/ / / | | | | | | | | | | | | | | | | | | | Plover's steno support likes quasi-qwerty, and gaming likes qwerty, and I like dvorak, so... what if I could have it all? Signed-off-by: seebs <seebs@seebs.net> | ||||
* | | | Merge pull request #880 from psyill/master | Jack Humbert | 2016-11-16 | 6 | -0/+678 |
|\ \ \ | | | | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | ||||
| * | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | Hans EllegÄrd | 2016-11-13 | 6 | -0/+678 |
| | | | | |||||
* | | | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap | Jack Humbert | 2016-11-16 | 3 | -13/+3 |
|\ \ \ \ | | | | | | | | | | | update sethbc ergodox keymap | ||||
| * | | | | update sethbc ergodox keymap | Seth Chandler | 2016-11-13 | 3 | -13/+3 |
| |/ / / | |||||
* | | | | Merge pull request #877 from sethbc/update_sethbc_satan_keymap | Jack Humbert | 2016-11-16 | 1 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | update sethbc keymap | ||||
| * | | | | oops, fixed inverted if statement | Seth Chandler | 2016-11-13 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | update sethbc keymap | Seth Chandler | 2016-11-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #876 from Dbroqua/master | Jack Humbert | 2016-11-16 | 3 | -1/+120 |
|\ \ \ \ | | | | | | | | | | | Updated kc60/dbroqua layout and added satan/dbroqua_hhkb | ||||
| * | | | | Merge pull request #12 from jackhumbert/master | Damien | 2016-11-12 | 7 | -4/+237 |
| |\| | | | | | | | | | | | | | Merged from qmk | ||||
| * | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-11-12 | 18 | -548/+1257 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #11 from jackhumbert/master | Damien | 2016-11-03 | 18 | -548/+1257 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Merged from jackhumbert | ||||
| * | | | | | | - Added dbroqua_hhkb layout for Satan PCB | dbroqua | 2016-11-12 | 2 | -0/+119 |
| |/ / / / / | |||||
| * | | | | | - Fixed typo in gh60/dbroqua layout | dbroqua | 2016-10-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #10 from jackhumbert/master | Damien | 2016-10-26 | 56 | -235/+2562 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Merge from jackhumbert/qmk_firmware | ||||
* | \ \ \ \ \ | Merge pull request #866 from fredizzimo/infinity60_clockfixes | Jack Humbert | 2016-11-16 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Increase the infinity60 system tick frequency | ||||
| * | | | | | | | Increase the infinity60 system tick frequency | Fred Sundvik | 2016-11-05 | 2 | -2/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #860 from IBNobody/master | Jack Humbert | 2016-11-16 | 7 | -226/+394 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Improved Quantum Matrix | ||||
| * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-11-08 | 5 | -3/+178 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Adding SKIP_GIT to speed up compiles. | IBNobody | 2016-11-01 | 1 | -18/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-11-01 | 15 | -76/+785 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | added fixed debounce code | IBNobody | 2016-10-29 | 1 | -73/+70 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmware | IBNobody | 2016-10-29 | 105 | -1181/+5745 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Made scanning more efficient | IBNobody | 2016-10-29 | 1 | -31/+24 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Refactoring Matrix scanning | IBNobody | 2016-10-28 | 2 | -88/+95 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixing Debounce - WIP | IBNobody | 2016-10-28 | 3 | -84/+174 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-28 | 18 | -51/+613 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Fixing Line Terminations | IBNobody | 2016-10-23 | 3 | -472/+472 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed some large keyboard bugs | IBNobody | 2016-10-23 | 5 | -7/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some bugs relating to keyboards with more than 16 columns. Also added the ability to mask off keyboard matrix bits. | ||||
| | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-23 | 82 | -503/+4324 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Updating Vision keyboard files | IBNobody | 2016-10-18 | 2 | -99/+116 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-03 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-06 | 8 | -30/+313 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | | * \ | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-16 | 14 | -29/+278 |
| | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | * | | fixed conflict | climbalima | 2016-11-14 | 1 | -3/+0 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | * | | fixed extra paste | climbalima | 2016-11-14 | 1 | -3/+2 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | * | | Merge branch 'master' of https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-10 | 1 | -2/+19 |
| | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second try | ||||
| | | | | | | | | | | | | * | | returned to o | climbalima | 2016-11-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | * | | | Added both revisions into one folder | climbalima | 2016-11-10 | 11 | -101/+327 |
| | | | | | | | | | | | |/ / |