From f91a42389b12db291c232fdfb941ef47139a3ea6 Mon Sep 17 00:00:00 2001 From: William Edwards Date: Tue, 21 Jan 2025 17:43:05 -0800 Subject: [PATCH] fix(External Gamepads): use maximum_sources instead of single_source to allow multiple gamepads --- rootfs/usr/share/inputplumber/devices/60-ps4_gamepad.yaml | 4 ++-- .../share/inputplumber/devices/60-ps5_ds-edge_gamepad.yaml | 4 ++-- rootfs/usr/share/inputplumber/devices/60-ps5_ds_gamepad.yaml | 4 ++-- rootfs/usr/share/inputplumber/devices/60-switch_pro.yaml | 4 ++-- .../usr/share/inputplumber/devices/60-xbox_360_gamepad.yaml | 4 ++-- rootfs/usr/share/inputplumber/devices/60-xbox_gamepad.yaml | 4 ++-- .../share/inputplumber/devices/60-xbox_one_elite_gamepad.yaml | 4 ++-- .../usr/share/inputplumber/devices/60-xbox_one_gamepad.yaml | 4 ++-- rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml | 4 ++-- rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rootfs/usr/share/inputplumber/devices/60-ps4_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-ps4_gamepad.yaml index 82d4f613..b5e9fa5d 100644 --- a/rootfs/usr/share/inputplumber/devices/60-ps4_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-ps4_gamepad.yaml @@ -8,8 +8,8 @@ kind: CompositeDevice # Name of the composite device mapping name: Sony Interactive Entertainment Wireless Controller -# Only allow a single source device per composite device of this type. -single_source: false +# Maximum number of source devices per CompositeDevice. +maximum_sources: 2 # Only use this profile if *any* of the given matches matches. If this list is # empty then the source devices will *always* be checked. diff --git a/rootfs/usr/share/inputplumber/devices/60-ps5_ds-edge_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-ps5_ds-edge_gamepad.yaml index 263128fd..a885fa5e 100644 --- a/rootfs/usr/share/inputplumber/devices/60-ps5_ds-edge_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-ps5_ds-edge_gamepad.yaml @@ -8,8 +8,8 @@ kind: CompositeDevice # Name of the composite device mapping name: Sony Interactive Entertainment DualSense Edge Wireless Controller -# Only allow a single source device per composite device of this type. -single_source: false +# Maximum number of source devices per CompositeDevice. +maximum_sources: 4 # Only use this profile if *any* of the given matches matches. If this list is # empty then the source devices will *always* be checked. diff --git a/rootfs/usr/share/inputplumber/devices/60-ps5_ds_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-ps5_ds_gamepad.yaml index 19eb60ca..d91faf2f 100644 --- a/rootfs/usr/share/inputplumber/devices/60-ps5_ds_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-ps5_ds_gamepad.yaml @@ -8,8 +8,8 @@ kind: CompositeDevice # Name of the composite device mapping name: Sony Interactive Entertainment DualSense Wireless Controller -# Only allow a single source device per composite device of this type. -single_source: false +# Maximum number of source devices per CompositeDevice. +maximum_sources: 4 # Only use this profile if *any* of the given matches matches. If this list is # empty then the source devices will *always* be checked. diff --git a/rootfs/usr/share/inputplumber/devices/60-switch_pro.yaml b/rootfs/usr/share/inputplumber/devices/60-switch_pro.yaml index 4fa4e0a9..eddaa54c 100644 --- a/rootfs/usr/share/inputplumber/devices/60-switch_pro.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-switch_pro.yaml @@ -8,8 +8,8 @@ kind: CompositeDevice # Name of the composite device mapping name: Nintendo Co., Ltd. Pro Controller -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # Only use this profile if *any* of the given matches matches. If this list is # empty, then the source devices will *always* be checked. diff --git a/rootfs/usr/share/inputplumber/devices/60-xbox_360_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-xbox_360_gamepad.yaml index 97b3d79e..5fe6a9e3 100644 --- a/rootfs/usr/share/inputplumber/devices/60-xbox_360_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-xbox_360_gamepad.yaml @@ -13,8 +13,8 @@ name: Microsoft X-Box 360 pad # /sys/class/dmi/id/product_name matches: [] -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # One or more source devices to combine into a single virtual device. The events # from these devices will be watched and translated according to the key map. diff --git a/rootfs/usr/share/inputplumber/devices/60-xbox_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-xbox_gamepad.yaml index 74806122..7296a43a 100644 --- a/rootfs/usr/share/inputplumber/devices/60-xbox_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-xbox_gamepad.yaml @@ -13,8 +13,8 @@ name: Microsoft X-Box pad # /sys/class/dmi/id/product_name matches: [] -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # One or more source devices to combine into a single virtual device. The events # from these devices will be watched and translated according to the key map. diff --git a/rootfs/usr/share/inputplumber/devices/60-xbox_one_elite_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-xbox_one_elite_gamepad.yaml index 6a9cfcf4..0b77e72b 100644 --- a/rootfs/usr/share/inputplumber/devices/60-xbox_one_elite_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-xbox_one_elite_gamepad.yaml @@ -13,8 +13,8 @@ name: Microsoft X-Box One Elite pad # /sys/class/dmi/id/product_name matches: [] -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # One or more source devices to combine into a single virtual device. The events # from these devices will be watched and translated according to the key map. diff --git a/rootfs/usr/share/inputplumber/devices/60-xbox_one_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/60-xbox_one_gamepad.yaml index a2d4dbec..e6e4e465 100644 --- a/rootfs/usr/share/inputplumber/devices/60-xbox_one_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/60-xbox_one_gamepad.yaml @@ -13,8 +13,8 @@ name: Microsoft X-Box One pad # /sys/class/dmi/id/product_name matches: [] -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # One or more source devices to combine into a single virtual device. The events # from these devices will be watched and translated according to the key map. diff --git a/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml b/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml index 5eb21678..2273a081 100644 --- a/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml +++ b/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml @@ -8,8 +8,8 @@ kind: CompositeDevice # Name of the composite device mapping name: Ignore Gamepads -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # Only use this profile if *any* of the given matches matches. If this list is # empty, then the source devices will *always* be checked. diff --git a/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml index a30a4a74..9035ae63 100644 --- a/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml +++ b/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml @@ -8,8 +8,8 @@ kind: CompositeDevice # Name of the composite device mapping name: Gamepads -# Only allow a single source device per composite device of this type. -single_source: true +# Maximum number of source devices per CompositeDevice. +maximum_sources: 1 # Only use this profile if *any* of the given matches matches. If this list is # empty, then the source devices will *always* be checked.