From e48a6b659c6da4afd56f2c3e3fa56d291ebf80e4 Mon Sep 17 00:00:00 2001
From: Okke Formsma <okke@formsma.nl>
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.
---
 .../momentary-layer/3-covered/events.patterns      |  3 ++
 .../3-covered/keycode_events.snapshot              |  2 ++
 .../momentary-layer/3-covered/native_posix.keymap  | 33 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 app/tests/momentary-layer/3-covered/events.patterns
 create mode 100644 app/tests/momentary-layer/3-covered/keycode_events.snapshot
 create mode 100644 app/tests/momentary-layer/3-covered/native_posix.keymap

(limited to 'app/tests/momentary-layer/3-covered')

diff --git a/app/tests/momentary-layer/3-covered/events.patterns b/app/tests/momentary-layer/3-covered/events.patterns
new file mode 100644
index 0000000..08b1e98
--- /dev/null
+++ b/app/tests/momentary-layer/3-covered/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/3-covered/keycode_events.snapshot b/app/tests/momentary-layer/3-covered/keycode_events.snapshot
new file mode 100644
index 0000000..87d1281
--- /dev/null
+++ b/app/tests/momentary-layer/3-covered/keycode_events.snapshot
@@ -0,0 +1,2 @@
+mo_pressed: position 1 layer 1
+mo_released: position 1 layer 1
diff --git a/app/tests/momentary-layer/3-covered/native_posix.keymap b/app/tests/momentary-layer/3-covered/native_posix.keymap
new file mode 100644
index 0000000..2484d8b
--- /dev/null
+++ b/app/tests/momentary-layer/3-covered/native_posix.keymap
@@ -0,0 +1,33 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+/*
+this test verifies that the correct key is released when a layer is enabled "on top"
+and the original key is "covered".
+*/
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&trans &mo 1
+				&trans &trans>;
+		};
+
+		layer_1 {
+			bindings = <
+				&trans &kp A
+				&trans &trans>;
+		};
+	};
+};
+
+&kscan {
+	events = <
+		ZMK_MOCK_PRESS(0,1,10) 
+		ZMK_MOCK_RELEASE(0,1,10)
+	>;
+};
-- 
cgit v1.2.3