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

fix failing unit test.

Browse Source 
During timeout processing, cancelations have to take immediate effect,
but new 0-delay timeouts have to be moved to the next cycle.
This commit is contained in:
xs5871 2022-04-01 17:55:40 +00:00 committed by Kyle Brown
parent 2a53bd8b64
commit cc70c8f4a8
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kmk/kmk_keyboard.py
View File

@ -55,6 +55,7 @@ class KMKKeyboard:
_trigger_powersave_disable = False _trigger_powersave_disable = False
i2c_deinit_count = 0 i2c_deinit_count = 0
_go_args = None _go_args = None
_processing_timeouts = False
# this should almost always be PREpended to, replaces # this should almost always be PREpended to, replaces
# former use of reversed_active_layers which had pointless # former use of reversed_active_layers which had pointless
@ -207,11 +208,14 @@ class KMKKeyboard:
return self return self
def set_timeout(self, after_ticks, callback): def set_timeout(self, after_ticks, callback):
# We allow passing False as an implicit "run this on the next process timeouts cycle"
if after_ticks is False: if after_ticks is False:
# We allow passing False as an implicit "run this on the next process timeouts cycle" after_ticks = 0
timeout_key = ticks_ms()
else: if after_ticks == 0 and self._processing_timeouts:
timeout_key = ticks_add(ticks_ms(), after_ticks) after_ticks += 1
timeout_key = ticks_add(ticks_ms(), after_ticks)
if timeout_key not in self._timeouts: if timeout_key not in self._timeouts:
self._timeouts[timeout_key] = [] self._timeouts[timeout_key] = []
@ -232,22 +236,24 @@ class KMKKeyboard:
if not self._timeouts: if not self._timeouts:
return self return self
# Copy timeout keys to a temporary list to allow sorting.
# Prevent net timeouts set during handling from running on the current
# cycle by setting a flag `_processing_timeouts`.
current_time = ticks_ms() current_time = ticks_ms()
timeout_keys = []
self._processing_timeouts = True
# Copy to a temporary list to allow sorting and ensure that if a for k in self._timeouts.keys():
# callback itself sets timeouts, we do not handle them on the current
# cycle.
timeouts = []
for k, v in self._timeouts.items():
if ticks_diff(k, current_time) <= 0: if ticks_diff(k, current_time) <= 0:
timeouts.append((k, v)) timeout_keys.append(k)
timeouts.sort(key=lambda k: k[0]) for k in sorted(timeout_keys):
for k, callbacks in timeouts: for callback in self._timeouts[k]:
del self._timeouts[k]
for callback in callbacks:
if callback: if callback:
callback() callback()
del self._timeouts[k]
self._processing_timeouts = False
return self return self