From ec9c12ffccef9e1cecc499a6a2a0e8eb83f602af Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Sat, 1 Mar 2025 18:54:59 +0200 Subject: [PATCH] enabled relative mouse by default on all v2+ configurations --- configs/kvmd/main/v4mini-hdmi-rpi4.yaml | 2 -- configs/kvmd/main/v4plus-hdmi-rpi4.yaml | 2 -- kvmd/plugins/hid/otg/__init__.py | 2 +- testenv/v2-hdmi-rpi4.override.yaml | 4 ++-- testenv/v2-hdmiusb-rpi4.override.yaml | 2 ++ 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configs/kvmd/main/v4mini-hdmi-rpi4.yaml b/configs/kvmd/main/v4mini-hdmi-rpi4.yaml index 117637ab..fe301711 100644 --- a/configs/kvmd/main/v4mini-hdmi-rpi4.yaml +++ b/configs/kvmd/main/v4mini-hdmi-rpi4.yaml @@ -17,8 +17,6 @@ kvmd: hid: type: otg - mouse_alt: - device: /dev/kvmd-hid-mouse-alt atx: type: gpio diff --git a/configs/kvmd/main/v4plus-hdmi-rpi4.yaml b/configs/kvmd/main/v4plus-hdmi-rpi4.yaml index 7b979dc6..2fd84ebf 100644 --- a/configs/kvmd/main/v4plus-hdmi-rpi4.yaml +++ b/configs/kvmd/main/v4plus-hdmi-rpi4.yaml @@ -17,8 +17,6 @@ kvmd: hid: type: otg - mouse_alt: - device: /dev/kvmd-hid-mouse-alt atx: type: gpio diff --git a/kvmd/plugins/hid/otg/__init__.py b/kvmd/plugins/hid/otg/__init__.py index 25424257..c9051f82 100644 --- a/kvmd/plugins/hid/otg/__init__.py +++ b/kvmd/plugins/hid/otg/__init__.py @@ -110,7 +110,7 @@ class Plugin(BaseHid): # pylint: disable=too-many-instance-attributes "horizontal_wheel": Option(True, type=valid_bool), }, "mouse_alt": { - "device": Option("", type=valid_abs_path, if_empty="", unpack_as="device_path"), + "device": Option("/dev/kvmd-hid-mouse-alt", type=valid_abs_path, if_empty="", unpack_as="device_path"), "select_timeout": Option(0.1, type=valid_float_f01), "queue_timeout": Option(0.1, type=valid_float_f01), "write_retries": Option(150, type=valid_int_f1), diff --git a/testenv/v2-hdmi-rpi4.override.yaml b/testenv/v2-hdmi-rpi4.override.yaml index 138c6eec..2c6f4d23 100644 --- a/testenv/v2-hdmi-rpi4.override.yaml +++ b/testenv/v2-hdmi-rpi4.override.yaml @@ -11,8 +11,8 @@ kvmd: mouse: device: /dev/null # absolute_win98_fix: true -# mouse_alt: -# device: /dev/null + mouse_alt: + device: /dev/null noop: true msd: diff --git a/testenv/v2-hdmiusb-rpi4.override.yaml b/testenv/v2-hdmiusb-rpi4.override.yaml index 8d5568f6..215de3f5 100644 --- a/testenv/v2-hdmiusb-rpi4.override.yaml +++ b/testenv/v2-hdmiusb-rpi4.override.yaml @@ -10,6 +10,8 @@ kvmd: device: /dev/null mouse: device: /dev/null + mouse_alt: + device: /dev/null noop: true msd: