Fix layer tap interrupted

KMKfw · Mar 13, 2023 · 4ce29ed · 4ce29ed
1 parent 878fe0d
commit 4ce29ed
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/kmk/kmk_keyboard.py b/kmk/kmk_keyboard.py
@@ -197,7 +197,7 @@ def _process_resume_buffer(self):
             key = ksf.key
 
             # Handle any unaccounted-for layer shifts by looking up the key resolution again.
-            if ksf.int_coord in self._coordkeys_pressed.keys():
+            if ksf.int_coord is not None:
                 key = self._find_key_in_map(ksf.int_coord)
 
             # Resume the processing of the key event and update the HID report

diff --git a/kmk/modules/oneshot.py b/kmk/modules/oneshot.py
@@ -53,7 +53,7 @@ def process_key(self, keyboard, current_key, is_pressed, int_coord):
             elif state.activated == ActivationType.INTERRUPTED:
                 if is_pressed:
                     send_buffer = True
-                self.key_buffer.insert(0, (0, key, False))
+                self.key_buffer.insert(0, (None, key, False))
 
         if send_buffer:
             self.key_buffer.append((int_coord, current_key, is_pressed))

diff --git a/tests/test_layers.py b/tests/test_layers.py
@@ -10,8 +10,12 @@ def setUp(self):
         self.kb = KeyboardTest(
             [Layers()],
             [
-                [KC.N0, KC.LM(1, KC.LCTL)],
-                [KC.A, KC.B],
+                [
+                    KC.N0,
+                    KC.LM(1, KC.LCTL),
+                    KC.LT(1, KC.N2, tap_interrupted=True, prefer_hold=True),
+                ],
+                [KC.A, KC.B, KC.C],
             ],
             debug_enabled=False,
         )
@@ -23,6 +27,19 @@ def test_layermod(self):
             [{KC.LCTL}, {KC.LCTL, KC.A}, {KC.A}, {}],
         )
 
+    def test_layertap(self):
+        self.kb.test(
+            'Layertap roll',
+            [(2, True), (0, True), (2, False), (0, False)],
+            [{KC.N2}, {KC.N0, KC.N2}, {KC.N0}, {}],
+        )
+
+        self.kb.test(
+            'Layertap tap interrupted',
+            [(2, True), (0, True), (0, False), (2, False)],
+            [{KC.A}, {}],
+        )
+
 
 if __name__ == '__main__':
     unittest.main()