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

fix combos to match new unittest

Browse Source
This commit is contained in:
xs5871 2022-07-03 15:32:35 +00:00 committed by Kyle Brown
parent 258e622bb4
commit ac8a696acb
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kmk/modules/combos.py
View File

@ -181,7 +181,7 @@ class Combos(Module):
continue continue
# Combo matches, but first key released before timeout. # Combo matches, but first key released before timeout.
elif not combo._remaining: elif not combo._remaining and len(self._matching) == 1:
keyboard.cancel_timeout(combo._timeout) keyboard.cancel_timeout(combo._timeout)
self._matching.remove(combo) self._matching.remove(combo)
self.activate(keyboard, combo) self.activate(keyboard, combo)
@ -194,6 +194,9 @@ class Combos(Module):
combo._remaining.insert(0, key) combo._remaining.insert(0, key)
self._matching.append(combo) self._matching.append(combo)
elif not combo._remaining:
continue
# Skip combos that allow tapping. # Skip combos that allow tapping.
elif combo.fast_reset: elif combo.fast_reset:
continue continue
@ -202,8 +205,9 @@ class Combos(Module):
elif len(combo._remaining) == len(combo.match) - 1: elif len(combo._remaining) == len(combo.match) - 1:
self._matching.remove(combo) self._matching.remove(combo)
self.reset_combo(keyboard, combo) self.reset_combo(keyboard, combo)
self.send_key_buffer(keyboard) if not self._matching:
self._key_buffer = [] self.send_key_buffer(keyboard)
self._key_buffer = []
# Anything between first and last key released. # Anything between first and last key released.
else: else:
@ -228,6 +232,10 @@ class Combos(Module):
if not combo._remaining: if not combo._remaining:
self.activate(keyboard, combo) self.activate(keyboard, combo)
# check if the last buffered key event was a release
if self._key_buffer[-1][2] == False:
keyboard._send_hid()
self.deactivate(keyboard, combo)
self._key_buffer = [] self._key_buffer = []
self.reset(keyboard) self.reset(keyboard)
else: else: