summaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorJun Wako <wakojun@gmail.com>2015-04-23 13:15:35 +0200
committerJun Wako <wakojun@gmail.com>2015-04-23 13:18:01 +0200
commit1f4a22ee81ec1986d1ca190c78c66231d37b50e2 (patch)
treeb49acd5126aed2dd5ecd456922d030cc0ffcdf47 /tmk_core
parent3f32b224788f9e938e41e02f6ad6fcbbec67479f (diff)
downloadqmk_firmware-1f4a22ee81ec1986d1ca190c78c66231d37b50e2.tar.gz
qmk_firmware-1f4a22ee81ec1986d1ca190c78c66231d37b50e2.tar.xz
Remove unneeded tap delays #201
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action.c7
-rw-r--r--tmk_core/common/action_code.h14
2 files changed, 13 insertions, 8 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index ec8eeae7b..1f15bd091 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -518,7 +518,12 @@ bool is_tap_key(keypos_t key)
case ACT_RMODS_TAP:
case ACT_LAYER_TAP:
case ACT_LAYER_TAP_EXT:
- return true;
+ switch (action.layer_tap.code) {
+ case 0x00 ... 0xdf:
+ case OP_TAP_TOGGLE:
+ return true;
+ }
+ return false;
case ACT_MACRO:
case ACT_FUNCTION:
if (action.func.opt & FUNC_TAP) { return true; }
diff --git a/tmk_core/common/action_code.h b/tmk_core/common/action_code.h
index bc40e2c6f..32ef07216 100644
--- a/tmk_core/common/action_code.h
+++ b/tmk_core/common/action_code.h
@@ -70,13 +70,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* 1001|oopp|BBBB BBBB 8-bit Bitwise Operation???
*
* ACT_LAYER_TAP(101x):
- * 101E|LLLL| keycode On/Off with tap key
- * 101E|LLLL|1110 mods On/Off with modifiers(0xE0-EF)
- * 101E|LLLL|1111 0000 Invert with tap toggle(0xF0)
- * 101E|LLLL|1111 0001 On/Off
- * 101E|LLLL|1111 0010 Off/On
- * 101E|LLLL|1111 0011 Set/Clear
- * 101E|LLLL|1111 xxxx Reserved(0xF4-FF)
+ * 101E|LLLL| keycode On/Off with tap key (0x00-DF)[TAP]
+ * 101E|LLLL|1110 mods On/Off with modifiers (0xE0-EF)[NOT TAP]
+ * 101E|LLLL|1111 0000 Invert with tap toggle (0xF0) [TAP]
+ * 101E|LLLL|1111 0001 On/Off (0xF1) [NOT TAP]
+ * 101E|LLLL|1111 0010 Off/On (0xF2) [NOT TAP]
+ * 101E|LLLL|1111 0011 Set/Clear (0xF3) [NOT TAP]
+ * 101E|LLLL|1111 xxxx Reserved (0xF4-FF)
* ELLLL: layer 0-31(E: extra bit for layer 16-31)
*
*