summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #1041 from folkert4/masterJack Humbert2017-02-075-0/+503
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added Espynn's keymap
| * | | | | | | | Added Espynn's keymapfolkert42017-01-275-0/+503
| | | | | | | | |
* | | | | | | | | Merge pull request #1047 from lordchair/keymap_yaleJack Humbert2017-02-074-0/+144
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | yale planck layout
| * | | | | | | | added picture of layoutYale Thomas2017-01-281-0/+0
| | | | | | | | |
| * | | | | | | | usability tweaksYale Thomas2017-01-281-44/+49
| | | | | | | | |
| * | | | | | | | mouse keys addedYale Thomas2017-01-281-6/+15
| | | | | | | | |
| * | | | | | | | new 'yale' keymapYale Thomas2017-01-283-0/+130
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #1048 from smt/smt/planckJack Humbert2017-02-065-22/+385
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add smt's keymap for Planck
| * | | | | | | | s/Bkps/BkspStephen Tudor2017-01-281-1/+1
| | | | | | | | |
| * | | | | | | | Carry over Planck updates to my Preonic keymapStephen Tudor2017-01-282-22/+50
| | | | | | | | |
| * | | | | | | | Improve Planck keymapStephen Tudor2017-01-282-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added escape+shift mod-tap key - replaced BRITE with backtick
| * | | | | | | | Merge branch 'master' into smt/planckStephen Tudor2017-01-2828-39/+442
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Clarify license on abnt2 keymap (#1038) replace jackhumbert with qmk Add gitter image, start update to qmk org Remove COLEMAK from preonic_keycodes enum layer defines to enum Update readme for smt Preonic keymap Add smt keymap for Preonic updated all the other keymaps to support the new changes. fix: infinity60 keyboard was not using quantum features. Compare Makefile with itself instead of using `--help`
| * | | | | | | | Add smt keymap for PlanckStephen Tudor2017-01-263-0/+313
| | | | | | | | |
* | | | | | | | | Merge pull request #1059 from qmk/hf/algr_tJack Humbert2017-02-061-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Introduces ALGR_T for dual-function AltGr
| * | | | | | | | | Introduces ALGR_T for dual-function AltGrErez Zukerman2017-01-311-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert2017-02-062-0/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Lets Split flashing improvements
| * | | | | | | | | | Update readmeNic Aitch2017-01-261-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Add avrdude targetNic Aitch2017-01-261-0/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #960 from ofples/feature/combosJack Humbert2017-02-065-0/+194
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Keyboard combination triggers
| * | | | | | | | | | Moved combo processing lower down in process logicOfer Plesser2016-12-161-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into feature/combosOfer Plesser2016-12-1671-2020/+8113
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactored as well as added support for action keys in combosOfer Plesser2016-12-162-68/+89
| | | | | | | | | | | |
| * | | | | | | | | | | Added support for timing out combos if a key as been pressed for longer than ↵Ofer Plesser2016-12-103-31/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COMBO_TERM
| * | | | | | | | | | | Implemented basic key combination featureOfer Plesser2016-12-105-0/+103
| | | | | | | | | | | |
* | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |