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

change ModTap to allow for activating mod on hold, rolling key presses and fix stuck mod

Browse Source
This commit is contained in:
Christian Tu
2021-09-19 14:14:13 +02:00
parent 27cf8e7d4d
commit 0a61cbd4af
3 changed files with 151 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
kmk/modules/layers.py
View File

@@ -1,34 +1,25 @@
'''One layer isn't enough. Adds keys to get to more of them'''
from micropython import const
from kmk.key_validators import layer_key_validator
from kmk.keys import make_argumented_key
from kmk.kmktime import accurate_ticks, accurate_ticks_diff
from kmk.modules import Module
from kmk.modules.modtap import HoldTap
class LayerType:
'''Defines layer type values for readability'''
def curry(fn, *args, **kwargs):
def curried(*fn_args, **fn_kwargs):
merged_args = args + fn_args
merged_kwargs = kwargs.copy()
merged_kwargs.update(fn_kwargs)
return fn(*merged_args, **merged_kwargs)
MO = const(0)
DF = const(1)
LM = const(2)
LT = const(3)
TG = const(4)
TT = const(5)
return curried
class Layers(Module):
class Layers(HoldTap):
'''Gives access to the keys used to enable the layer system'''
def __init__(self):
# Layers
self.start_time = {
LayerType.LT: None,
LayerType.TG: None,
LayerType.TT: None,
LayerType.LM: None,
}
super().__init__()
make_argumented_key(
validator=layer_key_validator,
names=('MO',),
@@ -47,8 +38,8 @@ class Layers(Module):
make_argumented_key(
validator=layer_key_validator,
names=('LT',),
on_press=self._lt_pressed,
on_release=self._lt_released,
on_press=curry(self.ht_pressed, key_type='LT'),
on_release=curry(self.ht_released, key_type='LT'),
)
make_argumented_key(
validator=layer_key_validator, names=('TG',), on_press=self._tg_pressed
@@ -59,31 +50,10 @@ class Layers(Module):
make_argumented_key(
validator=layer_key_validator,
names=('TT',),
on_press=self._tt_pressed,
on_release=self._tt_released,
on_press=curry(self.ht_pressed, key_type='TT'),
on_release=curry(self.ht_released, key_type='TT'),
)
def during_bootup(self, keyboard):
return
def before_matrix_scan(self, keyboard):
return
def after_matrix_scan(self, keyboard):
return
def before_hid_send(self, keyboard):
return
def after_hid_send(self, keyboard):
return
def on_powersave_enable(self, keyboard):
return
def on_powersave_disable(self, keyboard):
return
def _df_pressed(self, key, keyboard, *args, **kwargs):
'''
Switches the default layer
@@ -129,24 +99,6 @@ class Layers(Module):
keyboard.keys_pressed.discard(key.meta.kc)
self._mo_released(key, keyboard, *args, **kwargs)
def _lt_pressed(self, key, keyboard, *args, **kwargs):
# Sets the timer start and acts like MO otherwise
self.start_time[LayerType.LT] = accurate_ticks()
self._mo_pressed(key, keyboard, *args, **kwargs)
def _lt_released(self, key, keyboard, *args, **kwargs):
# On keyup, check timer, and press key if needed.
if self.start_time[LayerType.LT] and (
accurate_ticks_diff(
accurate_ticks(), self.start_time[LayerType.LT], keyboard.tap_time
)
):
keyboard.hid_pending = True
keyboard.tap_key(key.meta.kc)
self._mo_released(key, keyboard, *args, **kwargs)
self.start_time[LayerType.LT] = None
def _tg_pressed(self, key, keyboard, *args, **kwargs):
'''
Toggles the layer (enables it if not active, and vise versa)
@@ -165,27 +117,36 @@ class Layers(Module):
keyboard.active_layers.clear()
keyboard.active_layers.insert(0, key.meta.layer)
def _tt_pressed(self, key, keyboard, *args, **kwargs):
'''
Momentarily activates layer if held, toggles it if tapped repeatedly
'''
if self.start_time[LayerType.TT] is None:
# Sets the timer start and acts like MO otherwise
self.start_time[LayerType.TT] = accurate_ticks()
self._mo_pressed(key, keyboard, *args, **kwargs)
elif accurate_ticks_diff(
accurate_ticks(), self.start_time[LayerType.TT], keyboard.tap_time
):
self.start_time[LayerType.TT] = None
self._tg_pressed(key, keyboard, *args, **kwargs)
return
return
def ht_activate_hold(self, key, keyboard, *args, **kwargs):
self._mo_pressed(key, keyboard, *args, **kwargs)
def _tt_released(self, key, keyboard, *args, **kwargs):
if self.start_time[LayerType.TT] is None or not accurate_ticks_diff(
accurate_ticks(), self.start_time[LayerType.TT], keyboard.tap_time
):
# On first press, works like MO. On second press, does nothing unless let up within
# time window, then acts like TG.
self.start_time[LayerType.TT] = None
self._mo_released(key, keyboard, *args, **kwargs)
def ht_deactivate_hold(self, key, keyboard, *args, **kwargs):
self._mo_released(key, keyboard, *args, **kwargs)
def ht_activate_tap(self, key, keyboard, *args, **kwargs):
key_type = kwargs['key_type']
if key_type == 'LT':
keyboard.hid_pending = True
keyboard.keys_pressed.add(key.meta.kc)
elif key_type == 'TT':
self._tg_pressed(key, keyboard, *args, **kwargs)
def ht_deactivate_tap(self, key, keyboard, *args, **kwargs):
key_type = kwargs['key_type']
if key_type == 'LT':
keyboard.hid_pending = True
keyboard.keys_pressed.discard(key.meta.kc)
def ht_activate_on_interrupt(self, key, keyboard, *args, **kwargs):
key_type = kwargs['key_type']
if key_type == 'LT':
self.ht_activate_tap(key, keyboard, *args, **kwargs)
elif key_type == 'TT':
self.ht_activate_hold(key, keyboard, *args, **kwargs)
def ht_deactivate_on_interrupt(self, key, keyboard, *args, **kwargs):
key_type = kwargs['key_type']
if key_type == 'LT':
self.ht_deactivate_tap(key, keyboard, *args, **kwargs)
elif key_type == 'TT':
self.ht_deactivate_hold(key, keyboard, *args, **kwargs)