summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert2017-02-061-8/+8
|\ | | | | oneshot timeout would only timeout after an event.
| * moved oneshot cancellation code outside of process_record.SjB2017-01-291-8/+8
| | | | | | | | | | | | | | The oneshot cancellation code do not depend on the action_tapping_process and since process_record get called via the action_tapping_process logic moved the oneshot cancellation code into the action_exec function just before the action_tapping_process call
| * oneshot timeout would only timeout after an event.SjB2017-01-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | After setting a ONESHOT_TIMEOUT value, the oneshot layer state would not expire without an event being triggered (key pressed). The reason was that in the process_record function we would return priort to execute the process_action function if it detected a NOEVENT cycle. The process_action contained the codes to timeout the oneshot layer state. The codes to clear the oneshot layer state have been move just in front of where we check for the NOEVENT cycle in the process_record function.
* | 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
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-302-2/+18
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1043 from potz/patch-1skullydazed2017-01-271-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify license on abnt2 keymap (#1038)
| * | | | | | Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
|/ / / / / /
* | | | | | Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-271-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use `type cmp` to test for cmp in Makefile
| * | | | | | Compare Makefile with itself instead of using `--help`Dylan Scott2017-01-241-2/+2
| | | | | | |
| | | * | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2716-22/+22
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #1035 from qmk/qmk_org_changesJack Humbert2017-01-2716-22/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Updated urls due to transfer to qmk org
| * | | | | | replace jackhumbert with qmkJack Humbert2017-01-2616-22/+22
|/ / / / / /
| | * | | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-274-23/+26
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2611-16/+403
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-265-0/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix: infinity60 keyboard was not using quantum features.
| * | | | | | updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmk firmware requires the matrix_init_user and matrix_scan_user function to be implementated. Added these function to all the existing keymaps.
| * | | | | | fix: infinity60 keyboard was not using quantum features.SjB2017-01-232-0/+18
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-263-0/+335
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add smt's keymap for Preonic
| * | | | | | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-251-1/+0
| | | | | | |
| * | | | | | Update readme for smt Preonic keymapStephen Tudor2017-01-251-1/+85
| | | | | | |
| * | | | | | Add smt keymap for PreonicStephen Tudor2017-01-253-0/+252
| | | | | | |
* | | | | | | Add gitter image, start update to qmk orgJack Humbert2017-01-261-3/+3
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-01-253-3/+66
|\| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 10:37:39 +0000