summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorTsan-Kuang Lee <1425438+tsankuanglee@users.noreply.github.com>2020-06-10 16:40:17 -0500
committerDrashna Jael're <drashna@live.com>2020-08-08 21:04:33 -0700
commitd34a4d0062d40dbf20affc61b865f5f17fd6ba6e (patch)
tree87a2e3129600e819288218b128c7dae1d90c99df /tmk_core
parent7d8930c80579798cbdd992c6561a6e3a3c447a33 (diff)
Fix one shot swaphands compiler error when NO_ACTION_ONESHOT is defined (#9296)
* init * add RETRO_TAP; tap anyway after TAP_TERM, if no interruption * RETRO_TAP works for other types of taps * revert to upstream/master * explain this fork in readme * use one readme.md file instaed * fix the error if NO_ACTION_ONESHOT is defined * restore readme.md to upstream master Co-authored-by: Tsan-Kuang Lee <tsan.kuang.lee@gmail.com>
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 9d5b0fcad1..d7b766becd 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -604,6 +604,7 @@ void process_action(keyrecord_t *record, action_t action) {
swap_hands = false;
}
break;
+# ifndef NO_ACTION_ONESHOT
case OP_SH_ONESHOT:
if (event.pressed) {
set_oneshot_swaphands();
@@ -611,6 +612,7 @@ void process_action(keyrecord_t *record, action_t action) {
release_oneshot_swaphands();
}
break;
+# endif
# ifndef NO_ACTION_TAPPING
case OP_SH_TAP_TOGGLE:
@@ -701,9 +703,11 @@ void process_action(keyrecord_t *record, action_t action) {
#endif
#ifdef SWAP_HANDS_ENABLE
+# ifndef NO_ACTION_ONESHOT
if (event.pressed && !(action.kind.id == ACT_SWAP_HANDS && action.swap.code == OP_SH_ONESHOT)) {
use_oneshot_swaphands();
}
+# endif
#endif
#ifndef NO_ACTION_ONESHOT