From 2f071415a823569bfcabf4c0c03359829d9b35b8 Mon Sep 17 00:00:00 2001
From: William Edwards <shadowapex@gmail.com>
Date: Mon, 10 Feb 2025 09:32:20 -0800
Subject: [PATCH] fix(Gamepads): fallback to managing all gamepad devices

---
 .../devices/69-ignore_generic.yaml            | 37 -------------------
 .../devices/70-generic_gamepad.yaml           |  9 +++--
 2 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml

diff --git a/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml b/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml
deleted file mode 100644
index 2273a081..00000000
--- a/rootfs/usr/share/inputplumber/devices/69-ignore_generic.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/ShadowBlip/InputPlumber/main/rootfs/usr/share/inputplumber/schema/composite_device_v1.json
-# Schema version number
-version: 1
-
-# The type of configuration schema
-kind: CompositeDevice
-
-# Name of the composite device mapping
-name: Ignore Gamepads
-
-# 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.
-# /sys/class/dmi/id/product_name
-matches: []
-
-# 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.
-source_devices:
-  - group: gamepad
-    ignore: true
-    evdev:
-      handler: js*
-  - group: gamepad
-    ignore: true
-    evdev:
-      handler: event*
-  - group: mouse
-    ignore: true
-    evdev:
-      handler: mouse*
-  - group: mouse
-    ignore: true
-    evdev:
-      handler: mice*
diff --git a/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml b/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml
index 9035ae63..78a4d740 100644
--- a/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml
+++ b/rootfs/usr/share/inputplumber/devices/70-generic_gamepad.yaml
@@ -20,9 +20,12 @@ matches: []
 # from these devices will be watched and translated according to the key map.
 source_devices:
   - group: gamepad
-    unique: true
-    evdev:
-      handler: js*
+    udev:
+      properties:
+        - name: ID_INPUT_JOYSTICK
+          value: "1"
+      sys_name: "event*"
+      subsystem: input
 
 # The target input device(s) to emulate by default
 target_devices: