kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Testing fixes for listener refactor.

Browse source
This commit is contained in:
Peter Johanson 2024-02-19 10:23:16 +00:00
parent f8fa8aa1b9
commit dad5926fd0
19 changed files with 80 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/dts/behaviors.dtsi
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2024 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <behaviors/key_press.dtsi> #include <behaviors/key_press.dtsi>
#include <behaviors/key_toggle.dtsi> #include <behaviors/key_toggle.dtsi>
#include <behaviors/transparent.dtsi> #include <behaviors/transparent.dtsi>
@ -19,6 +25,4 @@
#include <behaviors/key_repeat.dtsi> #include <behaviors/key_repeat.dtsi>
#include <behaviors/backlight.dtsi> #include <behaviors/backlight.dtsi>
#include <behaviors/macros.dtsi> #include <behaviors/macros.dtsi>
#include <behaviors/mouse_key_press.dtsi>
#include <behaviors/soft_off.dtsi> #include <behaviors/soft_off.dtsi>
#include <behaviors/macros.dtsi>

5
app/dts/behaviors/mouse_key_press.dtsi
View file

@ -5,4 +5,9 @@
#binding-cells = <1>; #binding-cells = <1>;
}; };
}; };
mkp_input_listener {
compatible = "zmk,input-listener";
device = <&mkp>;
};
}; };

9
app/dts/behaviors/mouse_keys.dtsi Normal file
View file

@ -0,0 +1,9 @@
/*
* Copyright (c) 2024 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include "mouse_key_press.dtsi"
#include "mouse_move.dtsi"
#include "mouse_scroll.dtsi"

6
app/dts/behaviors/mouse_move.dtsi
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2024 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <zephyr/dt-bindings/input/input-event-codes.h> #include <zephyr/dt-bindings/input/input-event-codes.h>
/ { / {

6
app/dts/behaviors/mouse_scroll.dtsi
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2024 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <zephyr/dt-bindings/input/input-event-codes.h> #include <zephyr/dt-bindings/input/input-event-codes.h>
/ { / {

2
app/src/mouse/input_listener.c
View file

@ -154,7 +154,7 @@ static void input_handler(const struct input_listener_config *config,
if (data->button_clear != 0) { if (data->button_clear != 0) {
for (int i = 0; i < ZMK_HID_MOUSE_NUM_BUTTONS; i++) { for (int i = 0; i < ZMK_HID_MOUSE_NUM_BUTTONS; i++) {
if ((data->button_set & BIT(i)) != 0) { if ((data->button_clear & BIT(i)) != 0) {
zmk_hid_mouse_button_release(i); zmk_hid_mouse_button_release(i);
} }
} }

1
app/tests/mouse-keys/mkp/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_keys.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>

16
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_scaling/keycode_events.snapshot
View file

@ -1,22 +1,18 @@
movement_update: Mouse movement updated to -1/0 movement_set: Mouse movement set to -1/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -3/0 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to -3/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -3/0 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to -3/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -5/0 movement_set: Mouse movement set to -3/-2
movement_update: Mouse movement updated to -5/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -5/0 movement_set: Mouse movement set to -3/-3
movement_update: Mouse movement updated to -5/-5
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-5 movement_set: Mouse movement set to 0/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0

1
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_scaling/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>

16
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_xy_invert/keycode_events.snapshot
View file

@ -1,22 +1,18 @@
movement_update: Mouse movement updated to 1/0 movement_set: Mouse movement set to -1/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 2/0 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to 2/2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 2/0 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to 2/2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 3/0 movement_set: Mouse movement set to -3/-2
movement_update: Mouse movement updated to 3/2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 3/0 movement_set: Mouse movement set to -3/-3
movement_update: Mouse movement updated to 3/3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/3 movement_set: Mouse movement set to 0/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0

1
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_xy_invert/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>

16
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_xy_swap/keycode_events.snapshot
View file

@ -1,22 +1,18 @@
movement_update: Mouse movement updated to 0/-1 movement_set: Mouse movement set to -1/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-2 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to -2/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-2 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to -2/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-3 movement_set: Mouse movement set to -3/-2
movement_update: Mouse movement updated to -2/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-3 movement_set: Mouse movement set to -3/-3
movement_update: Mouse movement updated to -3/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -3/0 movement_set: Mouse movement set to 0/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0

1
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_xy_swap/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>

16
app/tests/mouse-keys/mouse-move/move_diagonal/keycode_events.snapshot
View file

@ -1,22 +1,18 @@
movement_update: Mouse movement updated to -1/0 movement_set: Mouse movement set to -1/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -2/0 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to -2/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -2/0 movement_set: Mouse movement set to -2/-2
movement_update: Mouse movement updated to -2/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -3/0 movement_set: Mouse movement set to -3/-2
movement_update: Mouse movement updated to -3/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -3/0 movement_set: Mouse movement set to -3/-3
movement_update: Mouse movement updated to -3/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-3 movement_set: Mouse movement set to 0/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0

1
app/tests/mouse-keys/mouse-move/move_diagonal/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>

16
app/tests/mouse-keys/mouse-move/move_x/keycode_events.snapshot
View file

@ -1,24 +1,24 @@
movement_update: Mouse movement updated to -1/0 movement_set: Mouse movement set to -1/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -2/0 movement_set: Mouse movement set to -2/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -2/0 movement_set: Mouse movement set to -2/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to -3/0 movement_set: Mouse movement set to -3/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 1/0 movement_set: Mouse movement set to 1/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 2/0 movement_set: Mouse movement set to 2/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 2/0 movement_set: Mouse movement set to 2/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 3/0 movement_set: Mouse movement set to 3/0
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0

1
app/tests/mouse-keys/mouse-move/move_x/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>

16
app/tests/mouse-keys/mouse-move/move_y/keycode_events.snapshot
View file

@ -1,24 +1,24 @@
movement_update: Mouse movement updated to 0/-1 movement_set: Mouse movement set to 0/-1
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-2 movement_set: Mouse movement set to 0/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-2 movement_set: Mouse movement set to 0/-2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/-3 movement_set: Mouse movement set to 0/-3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/1 movement_set: Mouse movement set to 0/1
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/2 movement_set: Mouse movement set to 0/2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/2 movement_set: Mouse movement set to 0/2
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0
movement_update: Mouse movement updated to 0/3 movement_set: Mouse movement set to 0/3
scroll_set: Mouse scroll set to 0/0 scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0 movement_set: Mouse movement set to 0/0

1
app/tests/mouse-keys/mouse-move/move_y/native_posix_64.keymap
View file

@ -1,4 +1,5 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
#include <dt-bindings/zmk/mouse.h> #include <dt-bindings/zmk/mouse.h>