diff options
author | Simon Melhart <simon.snth@xoxy.net> | 2013-11-19 15:29:09 -0800 |
---|---|---|
committer | Simon Melhart <simon.snth@xoxy.net> | 2013-11-20 09:21:33 -0800 |
commit | a6afa845b98d4fa7097c840fedbace59fef8f738 (patch) | |
tree | 9c437cd6e0208afb2b681550b4e9cdac594150bc /common | |
parent | 821578293c79c5612f9b77e447295f2947fd6c3d (diff) | |
download | qmk_firmware-a6afa845b98d4fa7097c840fedbace59fef8f738.tar.gz qmk_firmware-a6afa845b98d4fa7097c840fedbace59fef8f738.zip |
Add tap toggle modifiers
Including documentation.
Diffstat (limited to 'common')
-rw-r--r-- | common/action.c | 11 | ||||
-rw-r--r-- | common/action_code.h | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/common/action.c b/common/action.c index f7ae85b94..38ee12abe 100644 --- a/common/action.c +++ b/common/action.c | |||
@@ -128,6 +128,17 @@ void process_action(keyrecord_t *record) | |||
128 | } | 128 | } |
129 | break; | 129 | break; |
130 | #endif | 130 | #endif |
131 | case MODS_TAP_TOGGLE: | ||
132 | if (event.pressed) { | ||
133 | if (tap_count <= TAPPING_TOGGLE) { | ||
134 | register_mods(mods); | ||
135 | } | ||
136 | } else { | ||
137 | if (tap_count < TAPPING_TOGGLE) { | ||
138 | unregister_mods(mods); | ||
139 | } | ||
140 | } | ||
141 | break; | ||
131 | default: | 142 | default: |
132 | if (event.pressed) { | 143 | if (event.pressed) { |
133 | if (tap_count > 0) { | 144 | if (tap_count > 0) { |
diff --git a/common/action_code.h b/common/action_code.h index c153838f2..bd3652e38 100644 --- a/common/action_code.h +++ b/common/action_code.h | |||
@@ -34,6 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
34 | * | 34 | * |
35 | * ACT_MODS_TAP(001r): | 35 | * ACT_MODS_TAP(001r): |
36 | * 001r|mods|0000 0000 Modifiers with OneShot | 36 | * 001r|mods|0000 0000 Modifiers with OneShot |
37 | * 001r|mods|0000 0001 Modifiers with tap toggle | ||
37 | * 001r|mods|0000 00xx (reserved) | 38 | * 001r|mods|0000 00xx (reserved) |
38 | * 001r|mods| keycode Modifiers with Tap Key(Dual role) | 39 | * 001r|mods| keycode Modifiers with Tap Key(Dual role) |
39 | * | 40 | * |
@@ -205,12 +206,14 @@ enum mods_bit { | |||
205 | }; | 206 | }; |
206 | enum mods_codes { | 207 | enum mods_codes { |
207 | MODS_ONESHOT = 0x00, | 208 | MODS_ONESHOT = 0x00, |
209 | MODS_TAP_TOGGLE = 0x01, | ||
208 | }; | 210 | }; |
209 | #define ACTION_KEY(key) ACTION(ACT_MODS, (key)) | 211 | #define ACTION_KEY(key) ACTION(ACT_MODS, (key)) |
210 | #define ACTION_MODS(mods) ACTION(ACT_MODS, (mods&0x1f)<<8 | 0) | 212 | #define ACTION_MODS(mods) ACTION(ACT_MODS, (mods&0x1f)<<8 | 0) |
211 | #define ACTION_MODS_KEY(mods, key) ACTION(ACT_MODS, (mods&0x1f)<<8 | (key)) | 213 | #define ACTION_MODS_KEY(mods, key) ACTION(ACT_MODS, (mods&0x1f)<<8 | (key)) |
212 | #define ACTION_MODS_TAP_KEY(mods, key) ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | (key)) | 214 | #define ACTION_MODS_TAP_KEY(mods, key) ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | (key)) |
213 | #define ACTION_MODS_ONESHOT(mods) ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_ONESHOT) | 215 | #define ACTION_MODS_ONESHOT(mods) ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_ONESHOT) |
216 | #define ACTION_MODS_TAP_TOGGLE(mods) ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_TAP_TOGGLE) | ||
214 | 217 | ||
215 | 218 | ||
216 | /* | 219 | /* |