sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix late release of oneshot keys

Browse Source
This commit is contained in:
xs5871 2022-04-16 10:52:43 +00:00 committed by Kyle Brown
parent f7dac9e96e
commit 63973e4a6e
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kmk/modules/oneshot.py
View File

@ -29,7 +29,7 @@ class OneShot(HoldTap):
state.activated = ActivationType.HOLD_TIMEOUT state.activated = ActivationType.HOLD_TIMEOUT
elif state.activated == ActivationType.RELEASED and is_pressed: elif state.activated == ActivationType.RELEASED and is_pressed:
state.activated = ActivationType.INTERRUPTED state.activated = ActivationType.INTERRUPTED
elif state.activated == ActivationType.INTERRUPTED and not is_pressed: elif state.activated == ActivationType.INTERRUPTED:
self.ht_released(key, keyboard) self.ht_released(key, keyboard)
return current_key return current_key

56
tests/test_hold_tap.py
View File

@ -102,22 +102,72 @@ class TestHoldTap(unittest.TestCase):
# TODO test TT # TODO test TT
def test_oneshot(self):
keyboard = KeyboardTest(
[Layers(), ModTap(), OneShot()],
[
[
KC.MT(KC.A, KC.LCTL),
KC.LT(1, KC.B),
KC.C,
KC.D,
KC.OS(KC.E, tap_time=50),
],
[KC.N1, KC.N2, KC.N3, KC.N4, KC.N5],
],
debug_enabled=False,
)
t_within = 40
t_after = 60
# OS # OS
keyboard.test( keyboard.test(
'OS timed out', 'OS timed out',
[(4, True), (4, False), 1050], [(4, True), (4, False), t_after],
[{KC.E}, {}], [{KC.E}, {}],
) )
keyboard.test( keyboard.test(
'OS interrupt within tap time', 'OS interrupt within tap time',
[(4, True), (4, False), 100, (3, True), (3, False)], [(4, True), (4, False), t_within, (3, True), (3, False)],
[{KC.E}, {KC.D, KC.E}, {}], [{KC.E}, {KC.D, KC.E}, {}],
) )
keyboard.test(
'OS interrupt, multiple within tap time',
[(4, True), (4, False), (3, True), (3, False), (2, True), (2, False)],
[{KC.E}, {KC.D, KC.E}, {}, {KC.C}, {}],
)
keyboard.test(
'OS interrupt, multiple interleaved',
[(4, True), (4, False), (3, True), (2, True), (2, False), (3, False)],
[{KC.E}, {KC.D, KC.E}, {KC.C, KC.D}, {KC.D}, {}],
)
keyboard.test(
'OS interrupt, multiple interleaved',
[(4, True), (4, False), (3, True), (2, True), (3, False), (2, False)],
[{KC.E}, {KC.D, KC.E}, {KC.C, KC.D}, {KC.C}, {}],
)
keyboard.test(
'OS interrupt within tap time, hold',
[(4, True), (3, True), (4, False), t_after, (3, False)],
[{KC.E}, {KC.D, KC.E}, {KC.D}, {}],
)
keyboard.test( keyboard.test(
'OS hold with multiple interrupt keys', 'OS hold with multiple interrupt keys',
[(4, True), 100, (3, True), (3, False), (2, True), (2, False), (4, False)], [
(4, True),
t_within,
(3, True),
(3, False),
(2, True),
(2, False),
(4, False),
],
[{KC.E}, {KC.D, KC.E}, {KC.E}, {KC.C, KC.E}, {KC.E}, {}], [{KC.E}, {KC.D, KC.E}, {KC.E}, {KC.C, KC.E}, {KC.E}, {}],
) )