fix(OrangePi NEO): Add GamepadAxisButtons capability to target gamepads.

ShadowBlip · Jun 29, 2024 · 7c4b4f8 · 7c4b4f8
1 parent 558d258
commit 7c4b4f8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml b/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml
@@ -56,7 +56,7 @@ source_devices:
 
 # The target input device(s) that the virtual device profile can use
 target_devices:
-  - xbox-elite
+  - xb360
   - mouse
   - keyboard
 

diff --git a/src/input/target/dualsense.rs b/src/input/target/dualsense.rs
@@ -1868,6 +1868,14 @@ impl DualSenseDevice {
     fn get_capabilities(&self) -> Vec<Capability> {
         vec![
             Capability::Gamepad(Gamepad::Accelerometer),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::Buttons(
+                GamepadButton::DPadUp,
+                GamepadButton::DPadDown,
+            ))),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::Buttons(
+                GamepadButton::DPadLeft,
+                GamepadButton::DPadRight,
+            ))),
             Capability::Gamepad(Gamepad::Axis(GamepadAxis::LeftStick)),
             Capability::Gamepad(Gamepad::Axis(GamepadAxis::RightStick)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::DPadDown)),

diff --git a/src/input/target/xb360.rs b/src/input/target/xb360.rs
@@ -398,25 +398,33 @@ impl XBox360Controller {
     /// Returns capabilities of the target device
     fn get_capabilities(&self) -> Vec<Capability> {
         vec![
-            Capability::Gamepad(Gamepad::Button(GamepadButton::South)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::North)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::East)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::West)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::Start)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::Select)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::Guide)),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::Buttons(
+                GamepadButton::DPadUp,
+                GamepadButton::DPadDown,
+            ))),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::Buttons(
+                GamepadButton::DPadLeft,
+                GamepadButton::DPadRight,
+            ))),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::LeftStick)),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::RightStick)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::DPadDown)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::DPadUp)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::DPadLeft)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::DPadRight)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::DPadUp)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::East)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::Guide)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::LeftBumper)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::LeftTrigger)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::LeftStick)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::LeftTrigger)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::North)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::RightBumper)),
-            Capability::Gamepad(Gamepad::Button(GamepadButton::RightTrigger)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::RightStick)),
-            Capability::Gamepad(Gamepad::Axis(GamepadAxis::LeftStick)),
-            Capability::Gamepad(Gamepad::Axis(GamepadAxis::RightStick)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::RightTrigger)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::Select)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::South)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::Start)),
+            Capability::Gamepad(Gamepad::Button(GamepadButton::West)),
             Capability::Gamepad(Gamepad::Trigger(GamepadTrigger::LeftTrigger)),
             Capability::Gamepad(Gamepad::Trigger(GamepadTrigger::RightTrigger)),
         ]

diff --git a/src/input/target/xbox_elite.rs b/src/input/target/xbox_elite.rs
@@ -402,6 +402,14 @@ impl XboxEliteController {
     /// Returns capabilities of the target device
     fn get_capabilities(&self) -> Vec<Capability> {
         vec![
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::Buttons(
+                GamepadButton::DPadUp,
+                GamepadButton::DPadDown,
+            ))),
+            Capability::Gamepad(Gamepad::Axis(GamepadAxis::Buttons(
+                GamepadButton::DPadLeft,
+                GamepadButton::DPadRight,
+            ))),
             Capability::Gamepad(Gamepad::Axis(GamepadAxis::LeftStick)),
             Capability::Gamepad(Gamepad::Axis(GamepadAxis::RightStick)),
             Capability::Gamepad(Gamepad::Button(GamepadButton::DPadDown)),