aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-06Merge branch 'master' of github.com:jackhumbert/qmk_firmwareGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsGravatar Jack Humbert
Add support for Unicode supplementary planes on OS X
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Gravatar Jack Humbert
speeding up (un)register_code16
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06fixes qmk.fm linking, tests out auto version incrementingGravatar Jack Humbert
2017-02-02Merge pull request #1063 from osamuaoki/masterGravatar Erez Zukerman
Typo fixes
2017-02-02Merge pull request #1058 from edasque/masterGravatar Erez Zukerman
Reverted Dockerfile to put the CMD back
2017-02-02Typo fixesGravatar Osamu Aoki
2017-02-01Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsGravatar Erez Zukerman
race condition between oneshot_mods and tap_dance
2017-02-01Merge pull request #1054 from deadcyclo/masterGravatar Erez Zukerman
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
2017-02-01Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-31Reverted Dockerfile to put the CMD backGravatar Erik Dasque
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapGravatar Erez Zukerman
albert ergodox keymap
2017-01-31Merge pull request #1055 from matzebond/masterGravatar Erez Zukerman
update my neo2 keymap
2017-01-30update my neo2 keymapGravatar Matthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosGravatar Brendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsGravatar Brendan Johan Lee
2017-01-30Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-29race condition between oneshot_mods and tap_danceGravatar SjB
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-29registering a weak_mods when using register_code16Gravatar SjB
Scenario: Locking the KC_LSHIFT, and then using a tap dance key that registers a S(KC_9) will unregister the KC_LSHIFT. The tap dance or any keycode that is registered should not have the side effect of cancelling a locked moditifier. We should be using a similar logic as the TMK codes in tmk_core/comman/action.c:158.
2017-01-27Merge pull request #1043 from potz/patch-1Gravatar skullydazed
Clarify license on abnt2 keymap (#1038)
2017-01-27Clarify license on abnt2 keymap (#1038)Gravatar Potiguar Faga
2017-01-27Merge pull request #869 from dylanjgscott/masterGravatar Jack Humbert
Use `type cmp` to test for cmp in Makefile
2017-01-27Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysGravatar Brendan Johan Lee
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesGravatar Jack Humbert
Updated urls due to transfer to qmk org
2017-01-26albert ergodox keymapGravatar Albert Pretorius
2017-01-26Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-26replace jackhumbert with qmkGravatar Jack Humbert
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Gravatar Jack Humbert
fix: infinity60 keyboard was not using quantum features.
2017-01-26Merge pull request #1033 from smt/smt/preonicGravatar Jack Humbert
Add smt's keymap for Preonic
2017-01-26Add gitter image, start update to qmk orgGravatar Jack Humbert
2017-01-25Remove COLEMAK from preonic_keycodes enumGravatar Stephen Tudor
2017-01-25Merge branch 'master' of github.com:jackhumbert/qmk_firmwareGravatar Jack Humbert
2017-01-25layer defines to enumGravatar Jack Humbert
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysGravatar Brendan Johan Lee
2017-01-25Update readme for smt Preonic keymapGravatar Stephen Tudor
2017-01-25Add smt keymap for PreonicGravatar Stephen Tudor
2017-01-24Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-24[deadcyclo layout] Added unicode layerGravatar Brendan Johan Lee
2017-01-24[deadcyclo layout] Added support for ergodox ez shineGravatar Brendan Johan Lee
2017-01-24Merge pull request #1014 from SjB/lcd_mods_statusGravatar Jack Humbert
added mods status bit to visualizer.
2017-01-24updated all the other keymaps to support the new changes.Gravatar 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-23speeding up (un)register_code16Gravatar SjB
In register_code16 and unregister_code16 we call register_code and unregister_code twice, once for the mods and once for the keycode. The (un)register_code have many check to see that keycode we have sent however because we know that we are sending it a mods key, why not just skip all of it and call (un)register_mods instead. This will skip alot of checks and should speedup the loop a little.