feat(CompositeDevice): change clear_state for targets that use hidraw…

… or usb virtual devices to reset their state
ShadowBlip · Feb 12, 2025 · d55996d · d55996d
1 parent b3fe66f
commit d55996d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 28 deletions.
diff --git a/src/input/target/dualsense.rs b/src/input/target/dualsense.rs
@@ -982,15 +982,12 @@ impl TargetInputDevice for DualSenseDevice {
 
     /// Clear any local state on the target device.
     fn clear_state(&mut self) {
-        let caps = self.get_capabilities().unwrap_or_else(|_| {
-            log::error!("No target device capabilities found while clearing state.");
-            Vec::new()
-        });
-        for cap in caps {
-            let ev = NativeEvent::new(cap, InputValue::Bool(false));
-            self.queued_events
-                .push(ScheduledNativeEvent::new(ev, Duration::from_millis(0)));
-        }
+        self.state = match self.state {
+            PackedInputDataReport::Usb(_) => PackedInputDataReport::Usb(Default::default()),
+            PackedInputDataReport::Bluetooth(_) => {
+                PackedInputDataReport::Bluetooth(Default::default())
+            }
+        };
     }
 }
 

diff --git a/src/input/target/horipad_steam.rs b/src/input/target/horipad_steam.rs
@@ -1,5 +1,5 @@
 //! Emulates a Horipad Steam Controller as a target input device.
-use std::{cmp::Ordering, error::Error, fmt::Debug, fs::File, time::Duration};
+use std::{cmp::Ordering, error::Error, fmt::Debug, fs::File};
 
 use packed_struct::prelude::*;
 use uhid_virt::{Bus, CreateParams, StreamError, UHIDDevice};
@@ -321,15 +321,7 @@ impl TargetInputDevice for HoripadSteamDevice {
 
     /// Clear any local state on the target device.
     fn clear_state(&mut self) {
-        let caps = self.get_capabilities().unwrap_or_else(|_| {
-            log::error!("No target device capabilities found while clearing state.");
-            Vec::new()
-        });
-        for cap in caps {
-            let ev = NativeEvent::new(cap, InputValue::Bool(false));
-            self.queued_events
-                .push(ScheduledNativeEvent::new(ev, Duration::from_millis(0)));
-        }
+        self.state = Default::default();
     }
 }
 

diff --git a/src/input/target/steam_deck.rs b/src/input/target/steam_deck.rs
@@ -834,15 +834,7 @@ impl TargetInputDevice for SteamDeckDevice {
 
     /// Clear any local state on the target device.
     fn clear_state(&mut self) {
-        let caps = self.get_capabilities().unwrap_or_else(|_| {
-            log::error!("No target device capabilities found while clearing state.");
-            Vec::new()
-        });
-        for cap in caps {
-            let ev = NativeEvent::new(cap, InputValue::Bool(false));
-            self.queued_events
-                .push(ScheduledNativeEvent::new(ev, Duration::from_millis(0)));
-        }
+        self.state = Default::default();
     }
 }