fix(Capability): Ensure HAT0-HAT3 are avaialable.

ShadowBlip · Jul 16, 2024 · 4de18fe · 4de18fe
1 parent 6726b7f
commit 4de18fe
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 6 deletions.
diff --git a/rootfs/usr/share/inputplumber/profiles/mouse_keyboard_wasd.yaml b/rootfs/usr/share/inputplumber/profiles/mouse_keyboard_wasd.yaml
@@ -28,6 +28,32 @@ mapping:
     target_events:
       - dbus: ui_quick
 
+  # Dpad
+  - name: D-Up
+    source_event:
+      gamepad:
+        button: DPadUp
+    target_events:
+      - keyboard: KeyUp
+  - name: D-Down
+    source_event:
+      gamepad:
+        button: DPadDown
+    target_events:
+      - keyboard: KeyDown
+  - name: D-Left
+    source_event:
+      gamepad:
+        button: DPadLeft
+    target_events:
+      - keyboard: KeyLeft
+  - name: D-Right
+    source_event:
+      gamepad:
+        button: DPadRight
+    target_events:
+      - keyboard: KeyRight
+
   # Left Stick
   - name: Left
     source_event:

diff --git a/rootfs/usr/share/inputplumber/schema/capability_map_v1.json b/rootfs/usr/share/inputplumber/schema/capability_map_v1.json
@@ -251,6 +251,7 @@
           "enum": [
             "LeftStick",
             "RightStick",
+            "Hat0",
             "Hat1",
             "Hat2",
             "Hat3"

diff --git a/rootfs/usr/share/inputplumber/schema/device_profile_v1.json b/rootfs/usr/share/inputplumber/schema/device_profile_v1.json
@@ -541,6 +541,7 @@
           "enum": [
             "LeftStick",
             "RightStick",
+            "Hat0",
             "Hat1",
             "Hat2",
             "Hat3"

diff --git a/src/input/capability.rs b/src/input/capability.rs
@@ -513,6 +513,7 @@ impl FromStr for GamepadButton {
 pub enum GamepadAxis {
     LeftStick,
     RightStick,
+    Hat0,
     Hat1,
     Hat2,
     Hat3,
@@ -525,6 +526,7 @@ impl fmt::Display for GamepadAxis {
         match self {
             GamepadAxis::LeftStick => write!(f, "LeftStick"),
             GamepadAxis::RightStick => write!(f, "RightStick"),
+            GamepadAxis::Hat0 => write!(f, "Hat0"),
             GamepadAxis::Hat1 => write!(f, "Hat1"),
             GamepadAxis::Hat2 => write!(f, "Hat2"),
             GamepadAxis::Hat3 => write!(f, "Hat3"),
@@ -540,6 +542,7 @@ impl FromStr for GamepadAxis {
         match s {
             "LeftStick" => Ok(GamepadAxis::LeftStick),
             "RightStick" => Ok(GamepadAxis::RightStick),
+            "Hat0" => Ok(GamepadAxis::Hat0),
             "Hat1" => Ok(GamepadAxis::Hat1),
             "Hat2" => Ok(GamepadAxis::Hat2),
             "Hat3" => Ok(GamepadAxis::Hat3),

diff --git a/src/input/event/dbus.rs b/src/input/event/dbus.rs
@@ -215,7 +215,7 @@ fn actions_from_capability(capability: Capability) -> Vec<Action> {
                 GamepadAxis::LeftStick => {
                     vec![Action::Left, Action::Right, Action::Up, Action::Down]
                 }
-                GamepadAxis::Hat1 => {
+                GamepadAxis::Hat0 => {
                     vec![Action::Left, Action::Right, Action::Up, Action::Down]
                 }
                 GamepadAxis::Buttons(negative, positive) => {

diff --git a/src/input/event/evdev.rs b/src/input/event/evdev.rs
@@ -623,15 +623,18 @@ fn event_codes_from_capability(capability: Capability) -> Vec<u16> {
                 GamepadAxis::RightStick => {
                     vec![AbsoluteAxisCode::ABS_RX.0, AbsoluteAxisCode::ABS_RY.0]
                 }
-                GamepadAxis::Hat1 => {
+                GamepadAxis::Hat0 => {
                     vec![AbsoluteAxisCode::ABS_HAT0X.0, AbsoluteAxisCode::ABS_HAT0Y.0]
                 }
-                GamepadAxis::Hat2 => {
+                GamepadAxis::Hat1 => {
                     vec![AbsoluteAxisCode::ABS_HAT1X.0, AbsoluteAxisCode::ABS_HAT1Y.0]
                 }
-                GamepadAxis::Hat3 => {
+                GamepadAxis::Hat2 => {
                     vec![AbsoluteAxisCode::ABS_HAT2X.0, AbsoluteAxisCode::ABS_HAT2Y.0]
                 }
+                GamepadAxis::Hat3 => {
+                    vec![AbsoluteAxisCode::ABS_HAT3X.0, AbsoluteAxisCode::ABS_HAT3Y.0]
+                }
                 GamepadAxis::Buttons(_, _) => {
                     vec![AbsoluteAxisCode::ABS_HAT0X.0, AbsoluteAxisCode::ABS_HAT0Y.0]
                 }

diff --git a/src/input/target/dualsense.rs b/src/input/target/dualsense.rs
@@ -1290,7 +1290,7 @@ impl DualSenseDevice {
                             }
                         }
                     }
-                    GamepadAxis::Hat1 => {
+                    GamepadAxis::Hat0 => {
                         if let InputValue::Vector2 { x, y } = value {
                             if let Some(x) = x {
                                 let value = denormalize_signed_value(x, -1.0, 1.0);
@@ -1480,6 +1480,7 @@ impl DualSenseDevice {
                             }
                         }
                     }
+                    GamepadAxis::Hat1 => (),
                     GamepadAxis::Hat2 => (),
                     GamepadAxis::Hat3 => (),
                     // TODO: Remove GamepadAxis::Buttons

diff --git a/src/input/target/steam_deck.rs b/src/input/target/steam_deck.rs
@@ -356,7 +356,7 @@ impl SteamDeckDevice {
                             y,
                         } => (),
                     },
-                    GamepadAxis::Hat1 => match value {
+                    GamepadAxis::Hat0 => match value {
                         InputValue::None => (),
                         InputValue::Bool(_) => (),
                         InputValue::Float(_) => (),
@@ -405,6 +405,7 @@ impl SteamDeckDevice {
                             y: _,
                         } => (),
                     },
+                    GamepadAxis::Hat1 => (),
                     GamepadAxis::Hat2 => (),
                     GamepadAxis::Hat3 => (),
                     GamepadAxis::Buttons(_, _) => (),
-Original file line number
+Diff line change
@@ Expand Up / @@ -251,6 +251,7 @@ @@
               "enum": [
                 "LeftStick",
                 "RightStick",
+                "Hat0",
                 "Hat1",
                 "Hat2",
                 "Hat3"
@@ Expand Down @@