Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 pull request #987 from belak/belak/whitefox-initial-support | Jack Humbert | 2017-01-15 | 15 | -1/+1460 |
|\ | | | | | Initial whitefox support | ||||
| * | Wait for two ticks rather than 1 | Kaleb Elwert | 2017-01-10 | 1 | -1/+1 |
| | | |||||
| * | Fix mismatched indentation | Kaleb Elwert | 2017-01-09 | 1 | -1/+1 |
| | | |||||
| * | Update clock frequencies to match the infinity ergodox | Kaleb Elwert | 2017-01-09 | 1 | -15/+4 |
| | | |||||
| * | Increase tick frequency for responsiveness | Kaleb Elwert | 2017-01-09 | 2 | -2/+2 |
| | | | | | | | | Based off of PR #866 which did the same thing for the infinity60 | ||||
| * | Remove KC_ prefix from KEYMAP macro to match other keyboards | Kaleb Elwert | 2017-01-09 | 3 | -35/+35 |
| | | |||||
| * | Fix unrelated spelling error | Kaleb Elwert | 2017-01-04 | 1 | -1/+1 |
| | | |||||
| * | Add white fox to keyboards readme | Kaleb Elwert | 2017-01-04 | 1 | -0/+1 |
| | | |||||
| * | Add whitefox readme | Kaleb Elwert | 2017-01-04 | 1 | -0/+7 |
| | | |||||
| * | Remove unneeded define | Kaleb Elwert | 2017-01-04 | 1 | -1/+0 |
| | | |||||
| * | Initial whitefox support | Kaleb Elwert | 2017-01-03 | 13 | -0/+1463 |
| | | |||||
* | | Merge pull request #996 from milestogo/master | Jack Humbert | 2017-01-15 | 37 | -303/+765 |
|\ \ | | | | | | | kinesis keyboard with subdirectories for different hardware - matches pull #911 | ||||
| * | | removing old programmer layout, in favor of milestogo | milestogo | 2017-01-08 | 4 | -276/+0 |
| | | | |||||
| * | | trying to clean up duplicate docs | milestogo | 2017-01-08 | 8 | -1001/+0 |
| | | | |||||
| * | | kinesis remap | milestogo | 2017-01-08 | 45 | -266/+2005 |
| | | | |||||
* | | | Merge pull request #999 from deadcyclo/master | Jack Humbert | 2017-01-15 | 5 | -0/+26 |
|\ \ \ | | | | | | | | | Adds layer images to the deadcyclo layout readme | ||||
| * | | | Fixed incorrect layer image in deadcyclo readme | Brendan Johan Lee | 2017-01-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-10 | 24 | -35/+2265 |
| |\| | | |||||
| * | | | Added layer images to deadcyclo layout readme | Brendan Johan Lee | 2017-01-10 | 5 | -0/+26 |
| | | | | |||||
* | | | | Merge pull request #1003 from mneme/master | Jack Humbert | 2017-01-15 | 8 | -0/+519 |
|\ \ \ \ | | | | | | | | | | | Layout "Mneme" for Atreus62 | ||||
| * | | | | Update makefile. | David Olsson | 2017-01-12 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | Readme. | ||||
| * | | | | - Change docs to match keymap. | David Olsson | 2017-01-12 | 3 | -21/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Switched around modifiers on the function layer to match muscle memory. - Added support for application switching. | ||||
| * | | | | Remove comments and change to correct KN_PLUS instead of KC_PLUS. | David Olsson | 2017-01-12 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Link fix in readme. | David Olsson | 2017-01-11 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Readme + minor change to make it match reality. | David Olsson | 2017-01-11 | 5 | -14/+60 |
| | | | | | |||||
| * | | | | Atreus62 first semi-final draft | David Olsson | 2017-01-11 | 5 | -0/+445 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1005 from kd0kkv/patch-1 | Jack Humbert | 2017-01-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Update keymap.c | ||||
| * | | | | Update keymap.c | kd0kkv | 2017-01-13 | 1 | -1/+1 |
| |/ / / | | | | | | | | | Fixed the default querty layout to have a B button and just one F | ||||
* | | | | Merge pull request #1006 from Vifon/master | Jack Humbert | 2017-01-15 | 3 | -6/+8 |
|\ \ \ \ | | | | | | | | | | | Update the vifon keymap | ||||
| * | | | | Update the vifon keymap | Wojciech Siewierski | 2017-01-13 | 3 | -6/+8 |
| |/ / / | |||||
* | | | | Merge pull request #1007 from bryan4887/bryan | Jack Humbert | 2017-01-15 | 1 | -0/+226 |
|\ \ \ \ | | | | | | | | | | | Added Bryan's keymap | ||||
| * | | | | Added Bryan's keymap | Bryan Hernandez | 2017-01-13 | 1 | -0/+226 |
| | | | | | |||||
* | | | | | Merge pull request #1009 from getclacking/master | Jack Humbert | 2017-01-15 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Typo fix | ||||
| * | | | | | Typo fix | Jason Milkins | 2017-01-15 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1004 from jackhumbert/hf/scmd | Erez Zukerman | 2017-01-13 | 1 | -0/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Adds SCMD and SCMD_T | ||||
| * | | | | Update quantum_keycodes.h | Jack Humbert | 2017-01-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | A shot at aliasing | Erez Zukerman | 2017-01-12 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Adds SCMD and SCMD_T | Erez Zukerman | 2017-01-11 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #994 from priyadi/unicode_mods_fix | Jack Humbert | 2017-01-08 | 1 | -8/+33 |
|\ \ \ \ | | | | | | | | | | | Unregister all mods before inputting Unicode, and reregister afterwards | ||||
| * | | | | Unregister all mods before inputting Unicode, and reregister afterwards | Priyadi Iman Nurcahyo | 2017-01-09 | 1 | -8/+33 |
| | | | | | |||||
* | | | | | Merge pull request #993 from priyadi/greek_layer | Jack Humbert | 2017-01-08 | 2 | -5/+193 |
|\ \ \ \ \ | | | | | | | | | | | | | Greek alphabet layer | ||||
| * | | | | | Greek alphabet layer | Priyadi Iman Nurcahyo | 2017-01-09 | 1 | -4/+183 |
| | | | | | | |||||
| * | | | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium | Priyadi Iman Nurcahyo | 2017-01-09 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | om telolet om | Priyadi Iman Nurcahyo | 2017-01-08 | 2 | -1/+10 |
| | | | | | | | |||||
| * | | | | | | om telolet om | Priyadi Iman Nurcahyo | 2017-01-08 | 2 | -1/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #990 from replicaJunction/master | Jack Humbert | 2017-01-08 | 12 | -22/+536 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update replicaJunction keymap | ||||
| * | | | | | Removed build.bat | Joshua T | 2017-01-07 | 1 | -51/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Make.exe is easy enough to use, and there's no real sense in having a wrapper aroung it. | ||||
| * | | | | | Merged from upstream | Joshua T | 2017-01-07 | 336 | -3127/+39980 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | |