Commit Graph

4457 Commits (38a83700c3c21326e691452c4dc002d398812679)

Author SHA1 Message Date
Priyadi Iman Nurcahyo 11eb3d5491 Merge branch 'master' into promethium 2017-01-17 01:39:29 +07:00
SjB 6f44ca7a59 oneshot timeout would only timeout after an event.
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.
2017-01-15 23:29:24 -05:00
Jack Humbert 6f44885615 Merge pull request #987 from belak/belak/whitefox-initial-support
Initial whitefox support
2017-01-15 01:14:02 -05:00
Jack Humbert 81b89f8b2b Merge pull request #996 from milestogo/master
kinesis keyboard with subdirectories for different hardware - matches pull #911
2017-01-15 01:13:15 -05:00
Jack Humbert 99d0b54e5e Merge pull request #999 from deadcyclo/master
Adds layer images to the deadcyclo layout readme
2017-01-15 01:12:21 -05:00
Jack Humbert b2dcac9655 Merge pull request #1003 from mneme/master
Layout "Mneme" for Atreus62
2017-01-15 01:12:04 -05:00
Jack Humbert ff76ee8377 Merge pull request #1005 from kd0kkv/patch-1
Update keymap.c
2017-01-15 01:11:38 -05:00
Jack Humbert 5036112d39 Merge pull request #1006 from Vifon/master
Update the vifon keymap
2017-01-15 01:11:04 -05:00
Jack Humbert a896b300ec Merge pull request #1007 from bryan4887/bryan
Added Bryan's keymap
2017-01-15 01:10:39 -05:00
Jack Humbert 5521d854d0 Merge pull request #1009 from getclacking/master
Typo fix
2017-01-15 01:09:50 -05:00
Jason Milkins b56ec38d5c Typo fix 2017-01-15 14:08:17 +08:00
Bryan Hernandez aa0939b5ef Added Bryan's keymap 2017-01-13 21:51:55 -06:00
Erez Zukerman 0fde5a34e2 Merge pull request #1004 from jackhumbert/hf/scmd
Adds SCMD and SCMD_T
2017-01-13 21:16:10 -05:00
Jack Humbert 7288e5ab9c Update quantum_keycodes.h 2017-01-13 14:04:51 -05:00
Wojciech Siewierski c6299a7859 Update the vifon keymap 2017-01-13 18:52:13 +01:00
kd0kkv c660d5f814 Update keymap.c
Fixed the default querty layout to have a B button and just one F
2017-01-13 08:30:46 -06:00
David Olsson 236a0b0b60 Update makefile.
Readme.
2017-01-12 16:00:09 +01:00
David Olsson b2419b31d3 - Change docs to match keymap.
- Switched around modifiers on the function layer to match muscle memory.
- Added support for application switching.
2017-01-12 15:36:14 +01:00
Erez Zukerman 3717cf5864 A shot at aliasing 2017-01-12 07:38:07 -05:00
Erez Zukerman 8459bb97c1 Adds SCMD and SCMD_T 2017-01-11 21:57:41 -05:00
David Olsson ed975f2454 Remove comments and change to correct KN_PLUS instead of KC_PLUS. 2017-01-12 00:14:42 +01:00
David Olsson 1bef7bf45a Link fix in readme. 2017-01-11 23:43:13 +01:00
David Olsson e491f5a4d0 Readme + minor change to make it match reality. 2017-01-11 23:41:07 +01:00
David Olsson 3a453a03ed Atreus62 first semi-final draft 2017-01-11 23:00:34 +01:00
Brendan Johan Lee c4fca8b6bc Fixed incorrect layer image in deadcyclo readme 2017-01-10 19:23:59 +01:00
Brendan Johan Lee 1121753746 Merge remote-tracking branch 'upstream/master' 2017-01-10 19:21:33 +01:00
Brendan Johan Lee db1aec159d Added layer images to deadcyclo layout readme 2017-01-10 19:20:25 +01:00
Kaleb Elwert a55c5e3ea3 Wait for two ticks rather than 1 2017-01-10 03:00:36 -08:00
Kaleb Elwert 0b38204e62 Fix mismatched indentation 2017-01-09 11:57:44 -08:00
Kaleb Elwert 49a00a535f Update clock frequencies to match the infinity ergodox 2017-01-09 11:15:10 -08:00
Kaleb Elwert a702f4631e Increase tick frequency for responsiveness
Based off of PR #866 which did the same thing for the infinity60
2017-01-09 10:54:36 -08:00
Kaleb Elwert ef2ebeb3ca Remove KC_ prefix from KEYMAP macro to match other keyboards 2017-01-09 10:45:34 -08:00
Priyadi Iman Nurcahyo 87b675241a minimize LEDs 2017-01-09 23:19:34 +07:00
Priyadi Iman Nurcahyo 8c2cc30b0e fix greek layers 2017-01-09 21:24:26 +07:00
Priyadi Iman Nurcahyo cf0650e3f0 Implement greek layers on my Promethium layout 2017-01-09 19:35:01 +07:00
milestogo 9d4cc2f3f1 removing old programmer layout, in favor of milestogo 2017-01-08 22:25:41 -08:00
milestogo 62f1c13c3a trying to clean up duplicate docs 2017-01-08 22:17:47 -08:00
milestogo f74ff86f9c kinesis remap 2017-01-08 22:02:01 -08:00
Jack Humbert 176b93d08e Merge pull request #994 from priyadi/unicode_mods_fix
Unregister all mods before inputting Unicode, and reregister afterwards
2017-01-08 21:12:02 -05:00
Jack Humbert 18d013b25b Merge pull request #993 from priyadi/greek_layer
Greek alphabet layer
2017-01-08 21:11:32 -05:00
Jack Humbert d8b445b03b Merge pull request #990 from replicaJunction/master
Update replicaJunction keymap
2017-01-08 21:10:42 -05:00
Priyadi Iman Nurcahyo 30b80a23f3 Unregister all mods before inputting Unicode, and reregister afterwards 2017-01-09 02:59:10 +07:00
Priyadi Iman Nurcahyo 02055406e8 Greek alphabet layer 2017-01-09 02:50:13 +07:00
Priyadi Iman Nurcahyo 3a71f3534a Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2017-01-09 02:48:07 +07:00
Priyadi Iman Nurcahyo 58b2536bf1 om telolet om 2017-01-08 23:45:16 +07:00
Priyadi Iman Nurcahyo b0a9bd319b om telolet om 2017-01-08 22:45:16 +07:00
Joshua T cfb45027bb Removed build.bat
Make.exe is easy enough to use, and there's no real sense in having a wrapper aroung it.
2017-01-07 14:05:04 -06:00
Joshua T 8f8d104759 Merged from upstream 2017-01-07 14:01:21 -06:00
Joshua T b7b44dc481 Updated README and images to reflect latest keymap 2017-01-07 13:57:51 -06:00
Joshua T 677ae86bde Added another Shift on Extend layer.
This moves the GUI key to the pinkie, but honestly, I never use that function anyway.
2017-01-07 13:07:55 -06:00