From e48a6b659c6da4afd56f2c3e3fa56d291ebf80e4 Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Wed, 11 Nov 2020 16:40:13 +0100 Subject: fix momentary layer bug when top layer is not &trans Key release events released keys on the wrong layer if the 'top layer' was not &trans above the &mo key. base <&mo 1> layer 1 <&kp B> This was caused by overwriting `zmk_keymap_active_behavior_layer[position]` after the &mo key was handled. --- .../5-nested-early-key-release/events.patterns | 3 ++ .../keycode_events.snapshot | 6 ++++ .../5-nested-early-key-release/native_posix.keymap | 39 ++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 app/tests/momentary-layer/5-nested-early-key-release/events.patterns create mode 100644 app/tests/momentary-layer/5-nested-early-key-release/keycode_events.snapshot create mode 100644 app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap (limited to 'app/tests/momentary-layer/5-nested-early-key-release') diff --git a/app/tests/momentary-layer/5-nested-early-key-release/events.patterns b/app/tests/momentary-layer/5-nested-early-key-release/events.patterns new file mode 100644 index 0000000..08b1e98 --- /dev/null +++ b/app/tests/momentary-layer/5-nested-early-key-release/events.patterns @@ -0,0 +1,3 @@ +s/.*hid_listener_keycode/kp/p +s/.*mo_keymap_binding/mo/p +s/.*keymap_position_state_changed/kp_st/p \ No newline at end of file diff --git a/app/tests/momentary-layer/5-nested-early-key-release/keycode_events.snapshot b/app/tests/momentary-layer/5-nested-early-key-release/keycode_events.snapshot new file mode 100644 index 0000000..15be601 --- /dev/null +++ b/app/tests/momentary-layer/5-nested-early-key-release/keycode_events.snapshot @@ -0,0 +1,6 @@ +mo_pressed: position 1 layer 1 +mo_pressed: position 0 layer 2 +kp_pressed: usage_page 0x07 keycode 0x05 mods 0x00 +mo_released: position 1 layer 1 +mo_released: position 0 layer 2 +kp_released: usage_page 0x07 keycode 0x05 mods 0x00 diff --git a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap b/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap new file mode 100644 index 0000000..a67035b --- /dev/null +++ b/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap @@ -0,0 +1,39 @@ +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &none &mo 1 + &none &none>; + }; + + layer_1 { + bindings = < + &mo 2 &none + &none &none>; + }; + + layer_2 { + bindings = < + &none &none + &kp B &none>; + }; + }; +}; + +&kscan { + events = < + ZMK_MOCK_PRESS(0,1,10) + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_PRESS(1,0,10) + ZMK_MOCK_RELEASE(0,1,10) + ZMK_MOCK_RELEASE(0,0,10) + ZMK_MOCK_RELEASE(1,0,10) + >; +}; \ No newline at end of file -- cgit v1.2.3