Merge branch 'master' into topic-backspace-delete

kmk/firmware.py

@@ -22,9 +22,19 @@ import kmk.kmktime  # isort:skip
 import kmk.types  # isort:skip
 import kmk.util  # isort:skip
 
+import busio  # isort:skip
+import gc  # isort:skip
+
+import supervisor  # isort:skip
+from kmk.consts import LeaderMode, UnicodeMode  # isort:skip
+from kmk.hid import USB_HID  # isort:skip
+from kmk.internal_state import InternalState  # isort:skip
+from kmk.keys import KC  # isort:skip
+from kmk.matrix import MatrixScanner  # isort:skip
+
 # Now handlers that will be used in keys later
-import kmk.handlers.layers
-import kmk.handlers.stock
+import kmk.handlers.layers  # isort:skip
+import kmk.handlers.stock  # isort:skip
 
 # Now stuff that depends on the above (and so on)
 import kmk.keys  # isort:skip
@@ -39,16 +49,6 @@ import kmk.internal_state  # isort:skip
 
 # Thanks for sticking around. Now let's do real work, starting below
 
-import busio
-import gc
-
-import supervisor
-from kmk.consts import LeaderMode, UnicodeMode
-from kmk.hid import USB_HID
-from kmk.internal_state import InternalState
-from kmk.keys import KC
-from kmk.matrix import MatrixScanner
-
 
 class Firmware:
     debug_enabled = False

kmk/handlers/modtap.py

@@ -0,0 +1,23 @@
+from kmk.kmktime import ticks_diff, ticks_ms
+
+
+def mt_pressed(key, state, *args, **kwargs):
+    # Sets the timer start and acts like a modifier otherwise
+    state.keys_pressed.add(key.meta.mods)
+
+    state.start_time['mod_tap'] = ticks_ms()
+    return state
+
+
+def mt_released(key, state, *args, **kwargs):
+    # On keyup, check timer, and press key if needed.
+    state.keys_pressed.discard(key.meta.mods)
+    timer_name = 'mod_tap'
+    if state.start_time[timer_name] and (
+            ticks_diff(ticks_ms(), state.start_time[timer_name]) < state.config.tap_time
+    ):
+        state.hid_pending = True
+        state.tap_key(key.meta.kc)
+
+    state.start_time[timer_name] = None
+    return state

kmk/keys.py

@@ -1,9 +1,10 @@
 import gc
 
 import kmk.handlers.layers as layers
+import kmk.handlers.modtap as modtap
 import kmk.handlers.stock as handlers
 from kmk.consts import UnicodeMode
-from kmk.types import (AttrDict, KeySeqSleepMeta, LayerKeyMeta,
+from kmk.types import (AttrDict, KeySeqSleepMeta, LayerKeyMeta, ModTapKeyMeta,
                        TapDanceKeyMeta, UnicodeModeKeyMeta)
 
 FIRST_KMK_INTERNAL_KEY = 1000
@@ -679,6 +680,22 @@ make_argumented_key(
 )
 
 
+def mod_tap_validator(kc, mods=None):
+    '''
+    Validates that mod tap keys are correctly used
+    '''
+    return ModTapKeyMeta(kc=kc, mods=mods)
+
+
+# ModTap
+make_argumented_key(
+    validator=mod_tap_validator,
+    names=('MT',),
+    on_press=modtap.mt_pressed,
+    on_release=modtap.mt_released,
+)
+
+
 gc.collect()
 
 

kmk/types.py

@@ -32,6 +32,12 @@ class LayerKeyMeta:
         self.kc = kc
 
 
+class ModTapKeyMeta:
+    def __init__(self, kc=None, mods=None):
+        self.mods = mods
+        self.kc = kc
+
+
 class KeySequenceMeta:
     def __init__(self, seq):
         self.seq = seq