decouple fake android gamepad

Author: orsinium

src/gamepad.rs

@@ -1,30 +1,22 @@
 use crate::shared::*;
-#[cfg(not(target_os = "android"))]
 use gilrs::ev::state::AxisData;
-#[cfg(not(target_os = "android"))]
 use gilrs::*;
 
 /// A gilrs-powered gamepad input reader.
 ///
 /// Shared between the hosted and the web device implementations.
 pub(crate) struct GamepadManager {
-    #[cfg(not(target_os = "android"))]
     gilrs: Gilrs,
-    #[cfg(not(target_os = "android"))]
     gamepad_id: Option<GamepadId>,
     input: InputState,
 }
 
 impl GamepadManager {
     pub fn new() -> Self {
-        #[cfg(not(target_os = "android"))]
         let mut gilrs = Gilrs::new().unwrap();
-        #[cfg(not(target_os = "android"))]
         let gamepad_id = gilrs.next_event().map(|Event { id, .. }| id);
         Self {
-            #[cfg(not(target_os = "android"))]
             gilrs,
-            #[cfg(not(target_os = "android"))]
             gamepad_id,
             input: InputState::default(),
         }
@@ -35,35 +27,27 @@ impl GamepadManager {
     }
 
     pub fn read_input(&mut self) -> Option<InputState> {
-        #[allow(unused_mut)]
+        // Detect gamepad
+        if self.gamepad_id.is_none() {
+            self.gamepad_id = self.gilrs.next_event().map(|Event { id, .. }| id);
+        }
+        // Consume all pending events to update the state
+        while self.gilrs.next_event().is_some() {}
+        let Some(gamepad_id) = self.gamepad_id else {
+            return Some(self.input.clone());
+        };
+        let gamepad = self.gilrs.connected_gamepad(gamepad_id)?;
+        let pad = read_pad(gamepad);
+        let buttons_array = [
+            gamepad.is_pressed(Button::South), // A
+            gamepad.is_pressed(Button::East),  // B
+            gamepad.is_pressed(Button::West),  // X
+            gamepad.is_pressed(Button::North), // Y
+            gamepad.is_pressed(Button::Start),
+        ];
         let mut buttons = 0u8;
-        #[allow(unused_mut, unused_assignments)]
-        let mut pad = None;
-
-        #[cfg(not(target_os = "android"))]
-        {
-            // Detect gamepad
-            if self.gamepad_id.is_none() {
-                self.gamepad_id = self.gilrs.next_event().map(|Event { id, .. }| id);
-            }
-            // Consume all pending events to update the state
-            while self.gilrs.next_event().is_some() {}
-            let Some(gamepad_id) = self.gamepad_id else {
-                return Some(self.input.clone());
-            };
-            let gamepad = self.gilrs.connected_gamepad(gamepad_id)?;
-            pad = read_pad(gamepad);
-            let buttons_array = [
-                gamepad.is_pressed(Button::South), // A
-                gamepad.is_pressed(Button::East),  // B
-                gamepad.is_pressed(Button::West),  // X
-                gamepad.is_pressed(Button::North), // Y
-                gamepad.is_pressed(Button::Start),
-            ];
-
-            for b in buttons_array.into_iter().rev() {
-                buttons = buttons << 1 | u8::from(b);
-            }
+        for b in buttons_array.into_iter().rev() {
+            buttons = buttons << 1 | u8::from(b);
         }
 
         // merge together input from gamepad and from keyboard
@@ -77,7 +61,6 @@ impl GamepadManager {
     }
 }
 
-#[cfg(not(target_os = "android"))]
 /// Read state of sticks and convert it into touchpad state.
 fn read_pad(gamepad: Gamepad<'_>) -> Option<Pad> {
     if gamepad.is_pressed(Button::DPadDown) {
@@ -94,27 +77,13 @@ fn read_pad(gamepad: Gamepad<'_>) -> Option<Pad> {
     }
 
     // Left stick works as pad only if it is pressed down.
-    //
-    // The only exceptions is Firefly Zero because
-    // it uses touchpad instead of stick and hence has no drift.
-    // Steam Controller, despite having two touchpads, by default uses
-    // stick for the left coordinate instead of the left touchpad.
-    //
-    // We don't check vendor ID for Firefly Zero because it's not settled yet.
-    // The dev version of the gamepad mode uses Flipper Devices Inc VID (0x37C1).
-    let is_precise = gamepad.product_id() == Some(0x1337);
     let pad_pressed =
         gamepad.is_pressed(Button::LeftTrigger) | gamepad.is_pressed(Button::LeftThumb);
-    if is_precise || pad_pressed {
-        let maybe_point = make_point(
+    if pad_pressed {
+        return make_point(
             gamepad.axis_data(Axis::LeftStickX),
             gamepad.axis_data(Axis::LeftStickY),
         );
-        let point = maybe_point?;
-        if is_precise && point.x == 0 && point.y == 0 {
-            return None;
-        }
-        return Some(point);
     };
 
     let pad = make_point(
@@ -135,7 +104,6 @@ fn read_pad(gamepad: Gamepad<'_>) -> Option<Pad> {
     Some(Pad { x, y })
 }
 
-#[cfg(not(target_os = "android"))]
 fn make_point(x: Option<&AxisData>, y: Option<&AxisData>) -> Option<Pad> {
     let x = data_to_i16(x);
     let y = data_to_i16(y);
@@ -145,7 +113,6 @@ fn make_point(x: Option<&AxisData>, y: Option<&AxisData>) -> Option<Pad> {
     }
 }
 
-#[cfg(not(target_os = "android"))]
 fn data_to_i16(v: Option<&AxisData>) -> Option<i16> {
     let v = v?;
     let v = v.value();

src/gamepad_android.rs

@@ -0,0 +1,23 @@
+use crate::shared::*;
+
+pub(crate) struct GamepadManager {
+    input: InputState,
+}
+
+impl GamepadManager {
+    pub fn new() -> Self {
+        Self {
+            input: InputState::default(),
+        }
+    }
+
+    pub fn update_input(&mut self, input: InputState) {
+        self.input = input;
+    }
+
+    pub fn read_input(&mut self) -> Option<InputState> {
+        let buttons = self.input.buttons;
+        let pad = self.input.pad.clone();
+        Some(InputState { pad, buttons })
+    }
+}

src/hosted.rs

@@ -144,6 +144,7 @@ impl<'a> Device for DeviceImpl<'a> {
     fn get_battery_status(&mut self) -> Option<BatteryStatus> {
         None
     }
+
     #[cfg(not(target_os = "android"))]
     fn get_battery_status(&mut self) -> Option<BatteryStatus> {
         use battery::units::electric_potential::microvolt;

src/lib.rs

@@ -6,9 +6,6 @@
 
 extern crate alloc;
 
-#[cfg(not(target_os = "none"))]
-mod gamepad;
-
 mod errors;
 mod shared;
 
@@ -17,6 +14,11 @@ mod shared;
 #[cfg_attr(target_os = "none", path = "embedded.rs")]
 mod device;
 
+#[cfg(not(target_os = "none"))]
+#[cfg_attr(target_os = "android", path = "gamepad_android.rs")]
+#[cfg_attr(not(target_os = "android"), path = "gamepad.rs")]
+mod gamepad;
+
 #[cfg(not(target_os = "none"))]
 pub use device::DeviceConfig;