summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-02Merge pull request #1058 from edasque/masterErez Zukerman
Reverted Dockerfile to put the CMD back
2017-02-01Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman
race condition between oneshot_mods and tap_dance
2017-02-01Merge pull request #1054 from deadcyclo/masterErez Zukerman
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-31Reverted Dockerfile to put the CMD backErik Dasque
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman
albert ergodox keymap
2017-01-31Merge pull request #1055 from matzebond/masterErez Zukerman
update my neo2 keymap
2017-01-30update my neo2 keymapMatthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-29race condition between oneshot_mods and tap_danceSjB
since the keycode for a tap dance process gets process only after the TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT - TAPPING_TERM time to tap or double tap on the key. This fix save the oneshot_mods into the action.state structure and applies the mods with the keycode when it's registered. It also unregisters the mod when the the tap dance process gets reset.
2017-01-27Merge pull request #1043 from potz/patch-1skullydazed
Clarify license on abnt2 keymap (#1038)
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert
Use `type cmp` to test for cmp in Makefile
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesJack Humbert
Updated urls due to transfer to qmk org
2017-01-26albert ergodox keymapAlbert Pretorius
2017-01-26Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-26replace jackhumbert with qmkJack Humbert
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert
fix: infinity60 keyboard was not using quantum features.
2017-01-26Merge pull request #1033 from smt/smt/preonicJack Humbert
Add smt's keymap for Preonic
2017-01-26Add gitter image, start update to qmk orgJack Humbert
2017-01-25Remove COLEMAK from preonic_keycodes enumStephen Tudor
2017-01-25Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert
2017-01-25layer defines to enumJack Humbert
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee
2017-01-25Update readme for smt Preonic keymapStephen Tudor
2017-01-25Add smt keymap for PreonicStephen Tudor
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee
2017-01-24Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert
added mods status bit to visualizer.
2017-01-24updated all the other keymaps to support the new changes.SjB
qmk firmware requires the matrix_init_user and matrix_scan_user function to be implementated. Added these function to all the existing keymaps.
2017-01-23fix: infinity60 keyboard was not using quantum features.SjB
the quantum matrix codes where not being initialized or/and called so no feature of the quantum firmware could be used. These codes have been added and now we can enjoy the quantum firmware goodness.
2017-01-24Compare Makefile with itself instead of using `--help`Dylan Scott
2017-01-23turn off rgb_midi in ezJack Humbert
2017-01-23Merge pull request #1026 from TerryMathews/masterJack Humbert
Let's Split: More code cleanup
2017-01-22More code cleanupTerryMathews
Missed a few commented out vestigal defines in revx/config.h that had been moved to keymap/serial and i2c.
2017-01-22Merge pull request #1018 from hot-leaf-juice/masterJack Humbert
simplified my keymap
2017-01-22More keyboard map tweaking (#1019)Christopher Browne
* Add HOME/END keys as upper/lower on arrow-up/down * Reduce .hex file size by turning off unneeded options * Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand
2017-01-22Merge pull request #1020 from remigius42/masterJack Humbert
Swiss German layout for Ergodox EZ & Infinity
2017-01-22Merge pull request #1022 from lucwastiaux/masterJack Humbert
Improvements to Dvorak Programmer Ergodox keymap
2017-01-22Merge pull request #1021 from luizribeiro/ps2avrGBJack Humbert
Support for ps2avrGB / winkeyless.kr boards
2017-01-22Merge pull request #1023 from TerryMathews/masterJack Humbert
Corrects Let's Split code
2017-01-22Missed commenting out notes at end of lineTerryMathews
2017-01-22Fixed keymap matrix on rev2TerryMathews
* Fixed keymap matrix in rev2 so that left half and right half match when in same orientation.
2017-01-22Created lines to uncomment keyboards built upside downTerryMathews
* Reverses column order to fix left-to-right key order that occurs if PCB assembled upside down.
2017-01-22Refactor code to eliminate duplicate definesTerryMathews
* Moved duplicated defines out of inappropriate source files (matrix pins in keymap subdirectory) * Eliminated default keymap directory * Hardcoded serial keymap to use serial defines and EE_CONFIG * Hardcoded i2c keymap to use i2c defines