Skip to content

Added ability to adjust tap and pair key delays #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiongyihui merged 2 commits into from
Sep 10, 2020
Merged

Added ability to adjust tap and pair key delays #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99be278
Added ability to adjust tap and pair key delays
mehalter Sep 10, 2020
6ecf6b7
Added adjustment ability to the fast typing threshold and renamed is_…
mehalter Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions keyboard/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,6 @@ def reset_into_bootloader():
microcontroller.reset()


def is_tapped(matrix, key):
"""Check if the key is tapped (press & release quickly)"""
n = len(matrix)
if n == 0:
n = matrix.wait(500 - matrix.ms(matrix.time() - matrix.get_keydown_time(key)))
target = key | 0x80
if n == 1:
if target == matrix.view(0):
return True
else:
n = matrix.wait(
200 - matrix.ms(matrix.time() - matrix.get_keydown_time(key))
)
if n == 2 and target == matrix.view(1):
# Fast typing: A down, B down, A up, B up
return True

return False


class Device:
def __init__(self, kbd):
Expand Down Expand Up @@ -157,6 +138,9 @@ def __init__(self, keymap=KEYMAP, pairs=(), verbose=True):
self.uid = microcontroller.cpu.uid * 2
self.usb_status = 0
self.leds = None
self.tap_delay = 500
self.fast_type_thresh = 200
self.pair_delay = 10

self._current_conn = ""

Expand Down Expand Up @@ -264,6 +248,25 @@ def stop_advertising(self):
except Exception as e:
print(e)

def is_tap_key(self, matrix, key):
"""Check if the key is tapped (press & release quickly)"""
n = len(matrix)
if n == 0:
n = matrix.wait(self.tap_delay - matrix.ms(matrix.time() - matrix.get_keydown_time(key)))
target = key | 0x80
if n == 1:
if target == matrix.view(0):
return True
else:
n = matrix.wait(
self.fast_type_thresh - matrix.ms(matrix.time() - matrix.get_keydown_time(key))
)
if n == 2 and target == matrix.view(1):
# Fast typing: A down, B down, A up, B up
return True

return False

def change_bt(self, n):
if self.ble.connected:
for c in self.ble.connections:
Expand Down Expand Up @@ -396,7 +399,7 @@ def run(self):
key = matrix.view(0)
if key < 0x80 and key in self.pair_keys:
n = matrix.wait(
10 - ms(matrix.time() - matrix.get_keydown_time(key))
self.pair_delay - ms(matrix.time() - matrix.get_keydown_time(key))
)

if n >= 2:
Expand Down Expand Up @@ -438,7 +441,7 @@ def run(self):
self.press(*keycodes)
elif kind < ACT_USAGE:
# MODS_TAP
if is_tapped(matrix, key):
if self.is_tap_key(matrix, key):
log("TAP")
keycode = action_code & 0xFF
keys[key] = keycode
Expand All @@ -462,7 +465,7 @@ def run(self):
keycodes = mods_to_keycodes(mods)
self.press(*keycodes)
self.layer_mask |= mask
elif is_tapped(matrix, key):
elif self.is_tap_key(matrix, key):
log("TAP")
keycode = action_code & 0xFF
if keycode == OP_TAP_TOGGLE:
Expand Down