fix(Profiles): Use translated version of osk/quick2 instead.

- While at it, fix some ayaneo controllers intitially reporting as a Nintendo Co., Ltd. Pro Controller.
ShadowBlip · May 13, 2024 · adc620c · adc620c
1 parent 8a1f157
commit adc620c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 2 deletions.
diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2.yaml
@@ -22,6 +22,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:e4:00.3-4/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2s.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2s.yaml
@@ -22,6 +22,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:c4:00.3-4/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_1s.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_1s.yaml
@@ -22,6 +22,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:c4:00.3-4/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus.yaml
@@ -28,6 +28,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:64:00.3-3/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_flip.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_flip.yaml
@@ -22,6 +22,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:c4:00.3-4/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_kun.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_kun.yaml
@@ -19,6 +19,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:c4:00.3-4.1/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_slide.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_slide.yaml
@@ -19,6 +19,10 @@ 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
+    evdev:
+      name: Nintendo Co., Ltd. Pro Controller
+      phys_path: usb-0000:c4:00.3-3/input0
   - group: gamepad
     evdev:
       name: Microsoft X-Box 360 pad

diff --git a/rootfs/usr/share/inputplumber/profiles/default.yaml b/rootfs/usr/share/inputplumber/profiles/default.yaml
@@ -31,14 +31,18 @@ mapping:
         button: LeftTop
     target_events:
       - gamepad:
-          button: Keyboard
+          button: Guide
+      - gamepad:
+          button: North
   - name: RightTop
     source_event:
       gamepad:
         button: RightTop
     target_events:
       - gamepad:
-          button: QuickAccess2
+          button: Guide
+      - gamepad:
+          button: East
   - name: Keyboard
     source_event:
       gamepad: