| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1059 from qmk/hf/algr_t | Jack Humbert | 2017-02-06 | 1 | -0/+1 |
| |\ | | | | | Introduces ALGR_T for dual-function AltGr | ||||
| | * | Introduces ALGR_T for dual-function AltGr | Erez Zukerman | 2017-01-31 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #1036 from nicinabox/lets-split-improvements | Jack Humbert | 2017-02-06 | 2 | -0/+14 |
| |\ \ | | | | | | | Lets Split flashing improvements | ||||
| | * | | Update readme | Nic Aitch | 2017-01-26 | 1 | -0/+4 |
| | | | | |||||
| | * | | Add avrdude target | Nic Aitch | 2017-01-26 | 1 | -0/+10 |
| | | | | |||||
| * | | | Merge pull request #960 from ofples/feature/combos | Jack Humbert | 2017-02-06 | 5 | -0/+194 |
| |\ \ \ | | | | | | | | | Keyboard combination triggers | ||||
| | * | | | Moved combo processing lower down in process logic | Ofer Plesser | 2016-12-16 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'master' into feature/combos | Ofer Plesser | 2016-12-16 | 71 | -2020/+8113 |
| | |\ \ \ | |||||
| | * | | | | Refactored as well as added support for action keys in combos | Ofer Plesser | 2016-12-16 | 2 | -68/+89 |
| | | | | | | |||||
| | * | | | | Added support for timing out combos if a key as been pressed for longer than ↵ | Ofer Plesser | 2016-12-10 | 3 | -31/+101 |
| | | | | | | | | | | | | | | | | | | | | | COMBO_TERM | ||||
| | * | | | | Implemented basic key combination feature | Ofer Plesser | 2016-12-10 | 5 | -0/+103 |
| | | | | | | |||||
| * | | | | | Merge pull request #1010 from SjB/oneshot_timeout_fix | Jack Humbert | 2017-02-06 | 1 | -8/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | oneshot timeout would only timeout after an event. | ||||
| | * | | | | | moved oneshot cancellation code outside of process_record. | SjB | 2017-01-29 | 1 | -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. | SjB | 2017-01-15 | 1 | -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_firmware | Jack Humbert | 2017-02-06 | 1 | -1/+10 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs | Jack Humbert | 2017-02-06 | 1 | -1/+10 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add support for Unicode supplementary planes on OS X | ||||
| | | * | | | | | | Add support for supplementary planes for OS X | Jonas Oberschweiber | 2016-12-31 | 1 | -1/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 2 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1030 from SjB/refactor_register_code16 | Jack Humbert | 2017-02-06 | 1 | -2/+30 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | speeding up (un)register_code16 | ||||
| | * | | | | | | | registering a weak_mods when using register_code16 | SjB | 2017-01-29 | 1 | -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_code16 | SjB | 2017-01-23 | 1 | -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 script | Jack Humbert | 2017-02-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -3/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 2 | -19/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | fixes qmk.fm linking, tests out auto version incrementing | Jack Humbert | 2017-02-06 | 1 | -1/+20 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1063 from osamuaoki/master | Erez Zukerman | 2017-02-02 | 1 | -18/+18 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Typo fixes | ||||
| | * | | | | | | | | Typo fixes | Osamu Aoki | 2017-02-02 | 1 | -18/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1058 from edasque/master | Erez Zukerman | 2017-02-02 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Reverted Dockerfile to put the CMD back | ||||
| | * | | | | | | | | Reverted Dockerfile to put the CMD back | Erik Dasque | 2017-01-31 | 1 | -1/+2 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods | Erez Zukerman | 2017-02-01 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | race condition between oneshot_mods and tap_dance | ||||
| | * | | | | | | | | race condition between oneshot_mods and tap_dance | SjB | 2017-01-29 | 2 | -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/master | Erez Zukerman | 2017-02-01 | 7 | -103/+384 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout | ||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-02-01 | 5 | -30/+900 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1039 from zabereer/albert_ergodox_keymap | Erez Zukerman | 2017-01-31 | 4 | -0/+866 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | albert ergodox keymap | ||||
| | * | | | | | | | | | albert ergodox keymap | Albert Pretorius | 2017-01-26 | 4 | -0/+866 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1055 from matzebond/master | Erez Zukerman | 2017-01-31 | 1 | -30/+34 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | update my neo2 keymap | ||||
| | * | | | | | | | | | update my neo2 keymap | Matthias Schmitt | 2017-01-30 | 1 | -30/+34 |
| |/ / / / / / / / / | |||||
| | | * | | | | | | | [deadcyclo layout] Refactoring. Use custom functions and macros | Brendan Johan Lee | 2017-01-30 | 1 | -237/+266 |
| | | | | | | | | | | |||||
| | | * | | | | | | | [deadcyclo layout] fixed failing tests | Brendan Johan Lee | 2017-01-30 | 1 | -16/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-30 | 2 | -2/+18 |
| | | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1043 from potz/patch-1 | skullydazed | 2017-01-27 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Clarify license on abnt2 keymap (#1038) | ||||
| | * | | | | | | | | | Clarify license on abnt2 keymap (#1038) | Potiguar Faga | 2017-01-27 | 1 | -0/+16 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #869 from dylanjgscott/master | Jack Humbert | 2017-01-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | |||||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |