pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(behaviors): Capture mods for &key_repeat

Browse source 
* When tracking the last keycode, also capture the currently held
  explicit modifiers to use when replaying the key later.
This commit is contained in:
Peter Johanson 2021-11-29 15:41:22 +00:00 committed by Pete Johanson
parent 70bb7c9334
commit 52b1fd5dd3
5 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/behaviors/behavior_key_repeat.c
View file

@ -10,6 +10,7 @@
#include <drivers/behavior.h> #include <drivers/behavior.h>
#include <logging/log.h> #include <logging/log.h>
#include <zmk/behavior.h> #include <zmk/behavior.h>
#include <zmk/hid.h>
#include <zmk/event_manager.h> #include <zmk/event_manager.h>
#include <zmk/events/keycode_state_changed.h> #include <zmk/events/keycode_state_changed.h>
@ -93,6 +94,7 @@ static int key_repeat_keycode_state_changed_listener(const zmk_event_t *eh) {
for (int u = 0; u < config->usage_pages_count; u++) { for (int u = 0; u < config->usage_pages_count; u++) {
if (config->usage_pages[u] == ev->usage_page) { if (config->usage_pages[u] == ev->usage_page) {
memcpy(&data->last_keycode_pressed, ev, sizeof(struct zmk_keycode_state_changed)); memcpy(&data->last_keycode_pressed, ev, sizeof(struct zmk_keycode_state_changed));
data->last_keycode_pressed.implicit_modifiers |= zmk_hid_get_explicit_mods();
break; break;
} }
} }

2
app/tests/key-repeat/behavior_keymap.dtsi
View file

@ -10,7 +10,7 @@
default_layer { default_layer {
bindings = < bindings = <
&key_repeat &kp A &key_repeat &kp A
&kp B &kp C_VOL_UP &kp LCTRL &kp C_VOL_UP
>; >;
}; };
}; };

2
app/tests/key-repeat/press-and-release-with-explicit-modifiers/events.patterns Normal file
View file

@ -0,0 +1,2 @@
s/.*hid_listener_keycode_//p
s/.*hid_implicit_modifiers_//p

12
app/tests/key-repeat/press-and-release-with-explicit-modifiers/keycode_events.snapshot Normal file
View file

@ -0,0 +1,12 @@
pressed: usage_page 0x07 keycode 0xe0 implicit_mods 0x00 explicit_mods 0x00
press: Modifiers set to 0x01
pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
press: Modifiers set to 0x01
released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
release: Modifiers set to 0x01
released: usage_page 0x07 keycode 0xe0 implicit_mods 0x00 explicit_mods 0x00
release: Modifiers set to 0x00
pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x01 explicit_mods 0x00
press: Modifiers set to 0x01
released: usage_page 0x07 keycode 0x04 implicit_mods 0x01 explicit_mods 0x00
release: Modifiers set to 0x00

15
app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix.keymap Normal file
View file

@ -0,0 +1,15 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"
&kscan {
events = <
ZMK_MOCK_PRESS(1,0,10)
ZMK_MOCK_PRESS(0,1,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_PRESS(0,0,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};