Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1057 from priyadi/selectable_output | Jack Humbert | 2017-02-07 | 7 | -71/+189 |
|\ | | | | | Implement runtime selectable output (USB or BT) | ||||
| * | Restrict outputselect to LUFA only for now | Priyadi Iman Nurcahyo | 2017-02-01 | 1 | -2/+2 |
| | | |||||
| * | Fix wrong include | Priyadi Iman Nurcahyo | 2017-02-01 | 1 | -1/+1 |
| | | |||||
| * | Limit outputselect to AVR only for now | Priyadi Iman Nurcahyo | 2017-02-01 | 5 | -3/+6 |
| | | |||||
| * | Move outputselect to parent dir to satisfy non LUFA keyboards | Priyadi Iman Nurcahyo | 2017-02-01 | 2 | -0/+0 |
| | | |||||
| * | Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE | Priyadi Iman Nurcahyo | 2017-02-01 | 2 | -0/+39 |
| | | |||||
| * | Implement runtime selectable output (USB or BT) | Priyadi Iman Nurcahyo | 2017-02-01 | 4 | -69/+145 |
| | | |||||
* | | pass through travis errors | Jack Humbert | 2017-02-07 | 3 | -2/+6 |
| | | |||||
* | | Merge pull request #1056 from upils/master | Jack Humbert | 2017-02-07 | 8 | -0/+334 |
|\ \ | | | | | | | Add reddot handwired keyboard. | ||||
| * | | Add reddot handwired keyboard. | upils | 2017-01-31 | 8 | -0/+334 |
| |/ | |||||
* | | Merge pull request #1053 from TerryMathews/master | Jack Humbert | 2017-02-07 | 10 | -4/+175 |
|\ \ | | | | | | | Let's Split: establish rev2fliphalf subproject | ||||
| * | | Reverse rev2 and rev2fliphalf | TerryMathews | 2017-02-06 | 2 | -8/+8 |
| | | | | | | | | | | | | Flipped definitions on what constitutes "fliphalf" by popular demand. | ||||
| * | | Revert "Reverse rev2 and rev2fliphalf" | TerryMathews | 2017-02-06 | 2 | -7/+7 |
| | | | | | | | | | | | | This reverts commit 0537977ba1412aa2ba753e152eec445e18858244. | ||||
| * | | Reverse rev2 and rev2fliphalf | TerryMathews | 2017-02-06 | 2 | -7/+7 |
| | | | | | | | | | | | | Flipped definitions on what constitutes "fliphalf" by popular demand. | ||||
| * | | Let's Split: establish rev2fliphalf subproject | TerryMathews | 2017-01-29 | 9 | -0/+171 |
| | | | | | | | | | | | | | | | Subproject to accomodate second half pad built in opposite orientation (places TRRS jacks on opposing edges for shorter cable runs) | ||||
* | | | variable scope fix for travis | Jack Humbert | 2017-02-07 | 2 | -5/+3 |
| | | | |||||
* | | | correctly assign bash variable | Jack Humbert | 2017-02-07 | 2 | -3/+3 |
| | | | |||||
* | | | fix typo | Jack Humbert | 2017-02-07 | 1 | -1/+1 |
| | | | |||||
* | | | add comma | Jack Humbert | 2017-02-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1069 from hot-leaf-juice/master | Jack Humbert | 2017-02-07 | 2 | -5/+3 |
|\ \ \ | | | | | | | | | change cmd-l and cmd-r for actual home and end | ||||
| * | | | change cmd-l and cmd-r for actual home and end | Callum Oakley | 2017-02-06 | 2 | -5/+3 |
| | | | | |||||
* | | | | try building only keyboards needed | Jack Humbert | 2017-02-07 | 3 | -7/+23 |
| | | | | |||||
* | | | | Merge pull request #1041 from folkert4/master | Jack Humbert | 2017-02-07 | 5 | -0/+503 |
|\ \ \ \ | | | | | | | | | | | Added Espynn's keymap | ||||
| * | | | | Added Espynn's keymap | folkert4 | 2017-01-27 | 5 | -0/+503 |
| | | | | | |||||
* | | | | | Merge pull request #1047 from lordchair/keymap_yale | Jack Humbert | 2017-02-07 | 4 | -0/+144 |
|\ \ \ \ \ | | | | | | | | | | | | | yale planck layout | ||||
| * | | | | | added picture of layout | Yale Thomas | 2017-01-28 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | usability tweaks | Yale Thomas | 2017-01-28 | 1 | -44/+49 |
| | | | | | | |||||
| * | | | | | mouse keys added | Yale Thomas | 2017-01-28 | 1 | -6/+15 |
| | | | | | | |||||
| * | | | | | new 'yale' keymap | Yale Thomas | 2017-01-28 | 3 | -0/+130 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1048 from smt/smt/planck | Jack Humbert | 2017-02-06 | 5 | -22/+385 |
|\ \ \ \ \ | | | | | | | | | | | | | Add smt's keymap for Planck | ||||
| * | | | | | s/Bkps/Bksp | Stephen Tudor | 2017-01-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Carry over Planck updates to my Preonic keymap | Stephen Tudor | 2017-01-28 | 2 | -22/+50 |
| | | | | | | |||||
| * | | | | | Improve Planck keymap | Stephen Tudor | 2017-01-28 | 2 | -11/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added escape+shift mod-tap key - replaced BRITE with backtick | ||||
| * | | | | | Merge branch 'master' into smt/planck | Stephen Tudor | 2017-01-28 | 28 | -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 Planck | Stephen Tudor | 2017-01-26 | 3 | -0/+313 |
| | | | | | | |||||
* | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ |