aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-10-04 03:30:09 +0900
committertmk <nobody@nowhere>2013-10-04 16:04:31 +0900
commitd52d554360d3bf06189bfd4f386fa99348d8a0a8 (patch)
treeb05d27552402f371e61aa0f29906a60c87e213ad /doc
parentcb434cfebc607db15b52a42adae6423bd40f1f98 (diff)
downloadqmk_firmware-d52d554360d3bf06189bfd4f386fa99348d8a0a8.tar.gz
qmk_firmware-d52d554360d3bf06189bfd4f386fa99348d8a0a8.zip
Fix mod stuck of MODS_KEY when leaving layer #62
- Add action_util.c and remove action_oneshot.c - Add oneshot_mods for MODS_ONESHOT - Add weak_mods for MODS_KEY and MACRO - weak_mods is cleared when layer switching
Diffstat (limited to 'doc')
-rw-r--r--doc/keymap.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/keymap.md b/doc/keymap.md
index e4728b507..c509651be 100644
--- a/doc/keymap.md
+++ b/doc/keymap.md
@@ -227,7 +227,7 @@ You can define these actions on *'A'* key and *'left shift'* modifier with:
227 ACTION_KEY(KC_A) 227 ACTION_KEY(KC_A)
228 ACTION_KEY(KC_LSFT) 228 ACTION_KEY(KC_LSFT)
229 229
230#### 2.1.2 Key with modifiers 230#### 2.1.2 Modified key
231This action is comprised of strokes of modifiers and a key. `Macro` action is needed if you want more complex key strokes. 231This action is comprised of strokes of modifiers and a key. `Macro` action is needed if you want more complex key strokes.
232 232
233Say you want to assign a key to `Shift + 1` to get charactor *'!'* or `Alt + Tab` to switch application windows. 233Say you want to assign a key to `Shift + 1` to get charactor *'!'* or `Alt + Tab` to switch application windows.
@@ -244,7 +244,7 @@ Registers multiple modifiers with pressing a key. To specify multiple modifiers
244 244
245 ACTION_MODS(MOD_ALT | MOD_LSFT) 245 ACTION_MODS(MOD_ALT | MOD_LSFT)
246 246
247#### 2.1.3 Modifier with tap key 247#### 2.1.3 Modifier with Tap key([Dual role][dual_role])
248Works as a modifier key while holding, but registers a key on tap(press and release quickly). 248Works as a modifier key while holding, but registers a key on tap(press and release quickly).
249 249
250 250
@@ -497,7 +497,7 @@ Number of taps can be configured with `TAPPING_TOGGLE` in `config.h`, `5` by def
497Tapping is to press and release a key quickly. Tapping speed is determined with setting of `TAPPING_TERM`, which can be defined in `config.h`, 200ms by default. 497Tapping is to press and release a key quickly. Tapping speed is determined with setting of `TAPPING_TERM`, which can be defined in `config.h`, 200ms by default.
498 498
499### 4.1 Tap Key 499### 4.1 Tap Key
500This is a feature to assign normal key action and modifier including layer switching to just same one physical key. This is a kind of [Dual role modifier][dual_role]. It works as modifier when holding the key but registers normal key when tapping. 500This is a feature to assign normal key action and modifier including layer switching to just same one physical key. This is a kind of [Dual role key][dual_role]. It works as modifier when holding the key but registers normal key when tapping.
501 501
502Modifier with tap key: 502Modifier with tap key:
503 503
@@ -507,7 +507,7 @@ Layer switching with tap key:
507 507
508 ACTION_LAYER_TAP_KEY(2, KC_SCLN) 508 ACTION_LAYER_TAP_KEY(2, KC_SCLN)
509 509
510[dual_role]: http://en.wikipedia.org/wiki/Modifier_key#Dual-role_modifier_keys 510[dual_role]: http://en.wikipedia.org/wiki/Modifier_key#Dual-role_keys
511 511
512 512
513### 4.2 Tap Toggle 513### 4.2 Tap Toggle
@@ -571,5 +571,5 @@ Top layer has higher precedence than lower layers.
571is to press and release a key quickly. 571is to press and release a key quickly.
572### Fn key 572### Fn key
573is key which executes a special action like layer switching, mouse key, macro or etc. 573is key which executes a special action like layer switching, mouse key, macro or etc.
574### dual role modifier 574### dual role key
575<http://en.wikipedia.org/wiki/Modifier_key#Dual-role_modifier_keys> 575<http://en.wikipedia.org/wiki/Modifier_key#Dual-role_keys>