~ruther/qmk_firmware

c7b56bee96b17a84a3de372117394b62191e22ce — Drashna Jaelre 5 years ago b506c49 
[Bug] Fix Swap Hands bug introduced by OSH (#9968)

Fixes the handling for the oneshot cleanup, so it only cleans up if it is active.  It should not cleanup of SHO is off (eg using a normal oneshot key), nor if it's actively pressed or used.  

Previous behavior BROKE swap hand key.
patch browse .tar.gz 
1 files changed, 1 insertions(+), 1 deletions(-)

M tmk_core/common/action_util.c

M tmk_core/common/action_util.c => tmk_core/common/action_util.c +1 -1
@@ 97,7 97,7 @@ static uint16_t oneshot_layer_time = 0;
inline bool     has_oneshot_layer_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED); }
#        ifdef SWAP_HANDS_ENABLE
static uint16_t oneshot_swaphands_time = 0;
inline bool     has_oneshot_swaphands_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_swaphands_time) >= ONESHOT_TIMEOUT && !(swap_hands_oneshot >= SHO_PRESSED); }
inline bool     has_oneshot_swaphands_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_swaphands_time) >= ONESHOT_TIMEOUT && (swap_hands_oneshot == SHO_ACTIVE); }
#        endif
#    endif