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. --- app/src/keymap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'app/src') diff --git a/app/src/keymap.c b/app/src/keymap.c index 1d289e5..70db2fa 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -130,14 +130,12 @@ int zmk_keymap_apply_position_state(int layer, u32_t position, bool pressed, s64 } int zmk_keymap_position_state_changed(u32_t position, bool pressed, s64_t timestamp) { + if (pressed) { + zmk_keymap_active_behavior_layer[position] = zmk_keymap_layer_state; + } for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--) { - u32_t layer_state = - pressed ? zmk_keymap_layer_state : zmk_keymap_active_behavior_layer[position]; - if (is_active_layer(layer, layer_state)) { + if (is_active_layer(layer, zmk_keymap_active_behavior_layer[position])) { int ret = zmk_keymap_apply_position_state(layer, position, pressed, timestamp); - - zmk_keymap_active_behavior_layer[position] = zmk_keymap_layer_state; - if (ret > 0) { LOG_DBG("behavior processing to continue to next layer"); continue; -- cgit v1.2.3