aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Always initialze the Infinity Ergodox backlightFred Sundvik2016-11-202-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_keymapJack Humbert2016-11-195-68/+148
|\ | | | | add sethbc keymap for gh60 and update macro expansion
| * remove KC expansion from GH60Seth Chandler2016-11-194-99/+55
| |
| * move KC expansion to separate macrosSeth Chandler2016-11-194-23/+66
| |
| * merge upstream/masterSeth Chandler2016-11-1949-378/+2213
| |\ | |/ |/|
* | don't always detect a matrix change (fixes debounce)Jack Humbert2016-11-181-1/+1
| |
* | Merge pull request #883 from climbalima/masterJack Humbert2016-11-1625-129/+760
|\ \ | | | | | | added rev2 lets split after merging with qmk
| * | fixed readme conflictsclimbalima2016-11-161-20/+2
| | |
| * | should have fixed conflixedclimbalima2016-11-1613-268/+10
| | |
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-11-1624-249/+1453
| |\ \ | |/ / |/| |
* | | Merge pull request #882 from seebs/masterJack Humbert2016-11-162-0/+244
|\ \ \ | | | | | | | | dvorak/plover keyboard layout
| * | | dvorak/plover keyboard layoutSeebs2016-11-162-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/masterJack Humbert2016-11-166-0/+678
|\ \ \ | | | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.
| * | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
| | | |
* | | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert2016-11-163-13/+3
|\ \ \ \ | | | | | | | | | | update sethbc ergodox keymap
| * | | | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| |/ / /
* | | | Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-161-7/+7
|\ \ \ \ | | | | | | | | | | update sethbc keymap
| * | | | oops, fixed inverted if statementSeth Chandler2016-11-131-6/+6
| | | | |
| * | | | update sethbc keymapSeth Chandler2016-11-121-1/+1
| |/ / /
* | | | Merge pull request #876 from Dbroqua/masterJack Humbert2016-11-163-1/+120
|\ \ \ \ | | | | | | | | | | Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
| * | | | Merge pull request #12 from jackhumbert/masterDamien2016-11-127-4/+237
| |\| | | | | | | | | | | | | Merged from qmk
| * | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-11-1218-548/+1257
| |\ \ \ \
| | * \ \ \ Merge pull request #11 from jackhumbert/masterDamien2016-11-0318-548/+1257
| | |\ \ \ \ | | | | | | | | | | | | | | Merged from jackhumbert
| * | | | | | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-122-0/+119
| |/ / / / /
| * | | | | - Fixed typo in gh60/dbroqua layoutdbroqua2016-10-261-1/+1
| | | | | |
| * | | | | Merge pull request #10 from jackhumbert/masterDamien2016-10-2656-235/+2562
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge from jackhumbert/qmk_firmware
* | \ \ \ \ \ Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2016-11-162-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Increase the infinity60 system tick frequency
| * | | | | | | Increase the infinity60 system tick frequencyFred Sundvik2016-11-052-2/+7
| | | | | | | |
* | | | | | | | Merge pull request #860 from IBNobody/masterJack Humbert2016-11-167-226/+394
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Improved Quantum Matrix
| * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-085-3/+178
| |\ \ \ \ \ \ \
| * | | | | | | | Adding SKIP_GIT to speed up compiles.IBNobody2016-11-011-18/+39
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-0115-76/+785
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | added fixed debounce codeIBNobody2016-10-291-73/+70
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmwareIBNobody2016-10-29105-1181/+5745
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Made scanning more efficientIBNobody2016-10-291-31/+24
| | | | | | | | | |
| | * | | | | | | | Refactoring Matrix scanningIBNobody2016-10-282-88/+95
| | | | | | | | | |
| | * | | | | | | | Fixing Debounce - WIPIBNobody2016-10-283-84/+174
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2818-51/+613
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Fixing Line TerminationsIBNobody2016-10-233-472/+472
| | | | | | | | | |
| | * | | | | | | | Fixed some large keyboard bugsIBNobody2016-10-235-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'IBNobody2016-10-2382-503/+4324
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Updating Vision keyboard filesIBNobody2016-10-182-99/+116
| | | | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-030-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-068-30/+313
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-11-1614-29/+278
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | fixed conflictclimbalima2016-11-141-3/+0
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | fixed extra pasteclimbalima2016-11-141-3/+2
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | Merge branch 'master' of https://github.com/climbalima/qmk_firmwareclimbalima2016-11-101-2/+19
| | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second try
| | | | | | | | | | | | | * | returned to oclimbalima2016-11-101-4/+4
| | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | Added both revisions into one folderclimbalima2016-11-1011-101/+327
| | | | | | | | | | | | |/ /