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

fix(mouse): Fix up tests and make ZMK_MOUSE explicit.

Browse source
This commit is contained in:
Peter Johanson 2024-04-09 21:43:07 -07:00
parent 0c3536cfc7
commit 37ba9eb527
16 changed files with 77 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Kconfig.behaviors
View file

@ -48,8 +48,7 @@ config ZMK_BEHAVIOR_KEY_TOGGLE
config ZMK_BEHAVIOR_MOUSE_KEY_PRESS config ZMK_BEHAVIOR_MOUSE_KEY_PRESS
bool bool
default y default y
depends on DT_HAS_ZMK_BEHAVIOR_MOUSE_KEY_PRESS_ENABLED depends on DT_HAS_ZMK_BEHAVIOR_MOUSE_KEY_PRESS_ENABLED && ZMK_MOUSE
imply ZMK_MOUSE
config ZMK_BEHAVIOR_SOFT_OFF config ZMK_BEHAVIOR_SOFT_OFF
bool bool
@ -59,8 +58,7 @@ config ZMK_BEHAVIOR_SOFT_OFF
config ZMK_BEHAVIOR_INPUT_TWO_AXIS config ZMK_BEHAVIOR_INPUT_TWO_AXIS
bool bool
default y default y
depends on DT_HAS_ZMK_BEHAVIOR_INPUT_TWO_AXIS_ENABLED depends on DT_HAS_ZMK_BEHAVIOR_INPUT_TWO_AXIS_ENABLED && ZMK_MOUSE
imply ZMK_MOUSE
config ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON config ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
bool bool

4
app/include/zmk/hid.h
View file

@ -61,10 +61,6 @@
#define ZMK_HID_REPORT_ID_CONSUMER 0x02 #define ZMK_HID_REPORT_ID_CONSUMER 0x02
#define ZMK_HID_REPORT_ID_MOUSE 0x03 #define ZMK_HID_REPORT_ID_MOUSE 0x03
// Needed until Zephyr offers a 2 byte usage macro
#define HID_USAGE16(idx) \
HID_ITEM(HID_ITEM_TAG_USAGE, HID_ITEM_TYPE_LOCAL, 2), (idx & 0xFF), (idx >> 8 & 0xFF)
static const uint8_t zmk_hid_report_desc[] = { static const uint8_t zmk_hid_report_desc[] = {
HID_USAGE_PAGE(HID_USAGE_GEN_DESKTOP), HID_USAGE_PAGE(HID_USAGE_GEN_DESKTOP),
HID_USAGE(HID_USAGE_GD_KEYBOARD), HID_USAGE(HID_USAGE_GD_KEYBOARD),

6
app/tests/mouse-keys/mkp/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y

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

@ -1,5 +1,4 @@
#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>

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

@ -1,18 +1,18 @@
movement_set: Mouse movement set 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_set: Mouse movement set to -2/-2
scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to -2/-2
scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to -3/-2
scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to -3/-3 movement_set: Mouse movement set 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_set: Mouse movement set to 0/-3 movement_set: Mouse movement set to -3/-3
scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to -5/-3
scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to -5/-5
scroll_set: Mouse scroll set to 0/0
movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to 0/-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

6
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_scaling/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y

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

@ -1,9 +1,13 @@
#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>
&mmv_input_listener {
scale-multiplier = <5>;
scale-divisor = <3>;
};
/ { / {
keymap { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
@ -16,16 +20,6 @@
>; >;
}; };
}; };
input_configs {
compatible = "zmk,input-configs";
mmv {
device = <&mmv>;
scale-multiplier = <5>;
scale-divisor = <3>;
};
};
}; };

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

@ -1,18 +1,18 @@
movement_set: Mouse movement set 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_set: Mouse movement set to -2/-2 movement_set: Mouse movement set 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_set: Mouse movement set to -2/-2 movement_set: Mouse movement set 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_set: Mouse movement set to -3/-2 movement_set: Mouse movement set 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_set: Mouse movement set to -3/-3 movement_set: Mouse movement set 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_set: Mouse movement set 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

6
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_xy_invert/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y

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

@ -1,9 +1,13 @@
#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>
&mmv_input_listener {
x-invert;
y-invert;
};
/ { / {
keymap { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
@ -16,16 +20,6 @@
>; >;
}; };
}; };
input_configs {
compatible = "zmk,input-configs";
mmv {
device = <&mmv>;
x-invert;
y-invert;
};
};
}; };

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

@ -1,4 +1,4 @@
movement_set: Mouse movement set to -1/0 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_set: Mouse movement set to -2/-2 movement_set: Mouse movement set to -2/-2
@ -7,12 +7,12 @@ movement_set: Mouse movement set to 0/0
movement_set: Mouse movement set to -2/-2 movement_set: Mouse movement set 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_set: Mouse movement set to -3/-2 movement_set: Mouse movement set 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_set: Mouse movement set to -3/-3 movement_set: Mouse movement set 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_set: Mouse movement set to 0/-3 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

6
app/tests/mouse-keys/mouse-move/input-configs/move_diagonal_xy_swap/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y

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

@ -1,9 +1,12 @@
#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>
&mmv_input_listener {
xy-swap;
};
/ { / {
keymap { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
@ -16,15 +19,6 @@
>; >;
}; };
}; };
input_configs {
compatible = "zmk,input-configs";
mmv {
device = <&mmv>;
xy-swap;
};
};
}; };

6
app/tests/mouse-keys/mouse-move/move_diagonal/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y

6
app/tests/mouse-keys/mouse-move/move_x/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y

6
app/tests/mouse-keys/mouse-move/move_y/native_posix_64.conf Normal file
View file

@ -0,0 +1,6 @@
CONFIG_GPIO=n
CONFIG_ZMK_BLE=n
CONFIG_LOG=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_ZMK_LOG_LEVEL_DBG=y
CONFIG_ZMK_MOUSE=y