From 84baf929c9bb95f255d4bafd0e57f2ec47455fca Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 10 Dec 2024 00:29:35 -0700 Subject: [PATCH] fix(pointing): Complete header rename missed in refactor (#2702) * Update a few mouse.h -> pointing.h missed refactors. --- app/tests/pointing/mkp/native_posix.keymap | 2 +- app/tests/pointing/mkp/native_posix_64.conf | 2 +- app/tests/pointing/mkp/native_posix_64.keymap | 2 +- .../mouse-move/move_diagonal/native_posix_64.keymap | 2 +- app/tests/pointing/mouse-move/move_x/native_posix_64.keymap | 2 +- app/tests/pointing/mouse-move/move_y/native_posix_64.keymap | 2 +- .../processors/move_diagonal_scaling/native_posix_64.keymap | 2 +- .../move_diagonal_xy_invert/native_posix_64.keymap | 2 +- .../processors/move_diagonal_xy_swap/native_posix_64.keymap | 2 +- .../1-deactivate-layer-timeout/native_posix_64.keymap | 2 +- .../native_posix_64.keymap | 2 +- .../native_posix_64.keymap | 2 +- .../3-require-prior-idle-ms/native_posix_64.keymap | 2 +- docs/docs/keymaps/behaviors/mouse-emulation.md | 6 +++--- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/tests/pointing/mkp/native_posix.keymap b/app/tests/pointing/mkp/native_posix.keymap index 8e3071d4..cec0b6e1 100644 --- a/app/tests/pointing/mkp/native_posix.keymap +++ b/app/tests/pointing/mkp/native_posix.keymap @@ -1,7 +1,7 @@ #include #include #include -#include +#include / { keymap { diff --git a/app/tests/pointing/mkp/native_posix_64.conf b/app/tests/pointing/mkp/native_posix_64.conf index 65ed54bb..fa514727 100644 --- a/app/tests/pointing/mkp/native_posix_64.conf +++ b/app/tests/pointing/mkp/native_posix_64.conf @@ -3,4 +3,4 @@ CONFIG_ZMK_BLE=n CONFIG_LOG=y CONFIG_LOG_BACKEND_SHOW_COLOR=n CONFIG_ZMK_LOG_LEVEL_DBG=y -CONFIG_ZMK_MOUSE=y +CONFIG_ZMK_POINTING=y diff --git a/app/tests/pointing/mkp/native_posix_64.keymap b/app/tests/pointing/mkp/native_posix_64.keymap index 8e3071d4..cec0b6e1 100644 --- a/app/tests/pointing/mkp/native_posix_64.keymap +++ b/app/tests/pointing/mkp/native_posix_64.keymap @@ -1,7 +1,7 @@ #include #include #include -#include +#include / { keymap { diff --git a/app/tests/pointing/mouse-move/move_diagonal/native_posix_64.keymap b/app/tests/pointing/mouse-move/move_diagonal/native_posix_64.keymap index 7e4d7af2..8fa0781d 100644 --- a/app/tests/pointing/mouse-move/move_diagonal/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/move_diagonal/native_posix_64.keymap @@ -2,7 +2,7 @@ #include #include #include -#include +#include / { keymap { diff --git a/app/tests/pointing/mouse-move/move_x/native_posix_64.keymap b/app/tests/pointing/mouse-move/move_x/native_posix_64.keymap index 89d50e2b..ac367238 100644 --- a/app/tests/pointing/mouse-move/move_x/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/move_x/native_posix_64.keymap @@ -2,7 +2,7 @@ #include #include #include -#include +#include / { keymap { diff --git a/app/tests/pointing/mouse-move/move_y/native_posix_64.keymap b/app/tests/pointing/mouse-move/move_y/native_posix_64.keymap index 5b02246b..12d5725c 100644 --- a/app/tests/pointing/mouse-move/move_y/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/move_y/native_posix_64.keymap @@ -2,7 +2,7 @@ #include #include #include -#include +#include / { keymap { diff --git a/app/tests/pointing/mouse-move/processors/move_diagonal_scaling/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/move_diagonal_scaling/native_posix_64.keymap index 0ec7163f..7e4b71ae 100644 --- a/app/tests/pointing/mouse-move/processors/move_diagonal_scaling/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/move_diagonal_scaling/native_posix_64.keymap @@ -6,7 +6,7 @@ #include #include #include -#include +#include &mmv_input_listener { input-processors = <&zip_xy_scaler 5 3>; diff --git a/app/tests/pointing/mouse-move/processors/move_diagonal_xy_invert/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/move_diagonal_xy_invert/native_posix_64.keymap index 51c8e505..bc74135c 100644 --- a/app/tests/pointing/mouse-move/processors/move_diagonal_xy_invert/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/move_diagonal_xy_invert/native_posix_64.keymap @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include &mmv_input_listener { diff --git a/app/tests/pointing/mouse-move/processors/move_diagonal_xy_swap/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/move_diagonal_xy_swap/native_posix_64.keymap index be3e9f73..e1d2d600 100644 --- a/app/tests/pointing/mouse-move/processors/move_diagonal_xy_swap/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/move_diagonal_xy_swap/native_posix_64.keymap @@ -2,7 +2,7 @@ #include #include #include -#include +#include &mmv_input_listener { input-processors = <&zip_xy_swap_mapper>; diff --git a/app/tests/pointing/mouse-move/processors/temp_layer/1-deactivate-layer-timeout/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/temp_layer/1-deactivate-layer-timeout/native_posix_64.keymap index 16642767..2088e5ce 100644 --- a/app/tests/pointing/mouse-move/processors/temp_layer/1-deactivate-layer-timeout/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/temp_layer/1-deactivate-layer-timeout/native_posix_64.keymap @@ -6,7 +6,7 @@ #include #include #include -#include +#include &mmv_input_listener { input-processors = <&zip_temp_layer 1 500>; diff --git a/app/tests/pointing/mouse-move/processors/temp_layer/2a-deactivate-layer-position-trigger/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/temp_layer/2a-deactivate-layer-position-trigger/native_posix_64.keymap index 5f3c0dbf..814d889c 100644 --- a/app/tests/pointing/mouse-move/processors/temp_layer/2a-deactivate-layer-position-trigger/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/temp_layer/2a-deactivate-layer-position-trigger/native_posix_64.keymap @@ -6,7 +6,7 @@ #include #include #include -#include +#include &mmv_input_listener { input-processors = <&auto_mouse_layer 1 0>; diff --git a/app/tests/pointing/mouse-move/processors/temp_layer/2b-deactivate-layer-position-not-trigger/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/temp_layer/2b-deactivate-layer-position-not-trigger/native_posix_64.keymap index 675a8bce..73ff0463 100644 --- a/app/tests/pointing/mouse-move/processors/temp_layer/2b-deactivate-layer-position-not-trigger/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/temp_layer/2b-deactivate-layer-position-not-trigger/native_posix_64.keymap @@ -6,7 +6,7 @@ #include #include #include -#include +#include &mmv_input_listener { input-processors = <&auto_mouse_layer 1 0>; diff --git a/app/tests/pointing/mouse-move/processors/temp_layer/3-require-prior-idle-ms/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/temp_layer/3-require-prior-idle-ms/native_posix_64.keymap index e641588a..ec78569c 100644 --- a/app/tests/pointing/mouse-move/processors/temp_layer/3-require-prior-idle-ms/native_posix_64.keymap +++ b/app/tests/pointing/mouse-move/processors/temp_layer/3-require-prior-idle-ms/native_posix_64.keymap @@ -6,7 +6,7 @@ #include #include #include -#include +#include &mmv_input_listener { input-processors = <&auto_mouse_layer 1 500>; diff --git a/docs/docs/keymaps/behaviors/mouse-emulation.md b/docs/docs/keymaps/behaviors/mouse-emulation.md index a91c24b3..6726bad2 100644 --- a/docs/docs/keymaps/behaviors/mouse-emulation.md +++ b/docs/docs/keymaps/behaviors/mouse-emulation.md @@ -25,11 +25,11 @@ CONFIG_ZMK_POINTING=y ## Mouse Emulation Defines To make it easier to encode the HID mouse button and move/scroll speed numeric values, include -the [`dt-bindings/zmk/mouse.h`](https://github.com/zmkfirmware/zmk/blob/main/app/include/dt-bindings/zmk/mouse.h) header +the [`dt-bindings/zmk/pointing.h`](https://github.com/zmkfirmware/zmk/blob/main/app/include/dt-bindings/zmk/pointing.h) header provided by ZMK near the top: ``` -#include +#include ``` Should you wish to override the default movement or scrolling max velocities, you can define the defaults before including the header, e.g.: @@ -38,7 +38,7 @@ Should you wish to override the default movement or scrolling max velocities, yo #define ZMK_POINTING_DEFAULT_MOVE_VAL 1500 // default: 600 #define ZMK_POINTING_DEFAULT_SCRL_VAL 20 // default: 10 -#include +#include ``` ## Mouse Button Press