From 437446ba8f636afbc2048aa655fc1c2662fbe2ce Mon Sep 17 00:00:00 2001 From: Tsan-Kuang Lee <1425438+tsankuanglee@users.noreply.github.com> Date: Wed, 10 Jun 2020 16:40:17 -0500 Subject: 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 --- tmk_core/common/action.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tmk_core') diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 909b9c39c..b39836f0f 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 -- cgit v1.2.3