summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-02-061-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert2017-02-061-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Unicode supplementary planes on OS X
| | | * | | | | | | | | | | | | Add support for supplementary planes for OS XJonas Oberschweiber2016-12-311-1/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | / / [skip build] testing travis scriptJack Humbert2017-02-062-1/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert2017-02-061-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | speeding up (un)register_code16
| | * | | | | | | | | | | | | registering a weak_mods when using register_code16SjB2017-01-291-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | | | | | speeding up (un)register_code16SjB2017-01-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-3/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-062-19/+25
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fixes qmk.fm linking, tests out auto version incrementingJack Humbert2017-02-061-1/+20
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1063 from osamuaoki/masterErez Zukerman2017-02-021-18/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo fixes
| | * | | | | | | | | | | | | Typo fixesOsamu Aoki2017-02-021-18/+18
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1058 from edasque/masterErez Zukerman2017-02-021-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Reverted Dockerfile to put the CMD back
| | * | | | | | | | | | | | Reverted Dockerfile to put the CMD backErik Dasque2017-01-311-1/+2
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2017-02-012-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | race condition between oneshot_mods and tap_dance
| | * | | | | | | | | | | | race condition between oneshot_mods and tap_danceSjB2017-01-292-1/+7
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | Merge pull request #1054 from deadcyclo/masterErez Zukerman2017-02-017-103/+384
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | albert ergodox keymap
| | * | | | | | | | | | | | albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1055 from matzebond/masterErez Zukerman2017-01-311-30/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | update my neo2 keymap
| | * | | | | | | | | | | update my neo2 keymapMatthias Schmitt2017-01-301-30/+34
| |/ / / / / / / / / / /
| | | * | | | | | | | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-301-237/+266
| | | | | | | | | | | |
| | | * | | | | | | | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-301-16/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Mer