fix better device polling in JoystickProxyWin

mdjarv · Apr 6, 2018 · fee34e0 · fee34e0
1 parent a63c1ed
commit fee34e0
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 39 deletions.
diff --git a/JoystickProxyWin/Joystick Proxy/ControllerDevice.cs b/JoystickProxyWin/Joystick Proxy/ControllerDevice.cs
@@ -24,7 +24,7 @@ public class ControllerDevice : IEquatable<ControllerDevice>
         private Joystick _joystick;
         private string _usbId;
 
-
+        private bool NotPollable = false;
 
         public ControllerDevice(DirectInput di, DeviceInstance deviceInstance)
         {
@@ -35,13 +35,19 @@ public ControllerDevice(DirectInput di, DeviceInstance deviceInstance)
             Joystick.Properties.BufferSize = 32;
         }
 
-        ~ControllerDevice()
-        {
-            try { Joystick.Unacquire(); } catch (Exception) {}
-        }
-
         public void Update() {
-            Joystick.Poll();
+            if (NotPollable)
+                return;
+
+            try
+            {
+                Joystick.Poll();
+            }
+            catch (Exception)
+            {
+                NotPollable = true;
+                return;
+            }
 
             List<JoystickUpdate> updatedStates = new List<JoystickUpdate>();
 

diff --git a/JoystickProxyWin/Joystick Proxy/Form1.Designer.cs b/JoystickProxyWin/Joystick Proxy/Form1.Designer.cs
diff --git a/JoystickProxyWin/Joystick Proxy/Form1.cs b/JoystickProxyWin/Joystick Proxy/Form1.cs
@@ -161,7 +161,10 @@ private void ReadInputTimer_Tick(object sender, EventArgs e)
         {
             foreach(ControllerDevice device in _devices)
             {
-                try { device.Update(); } catch(Exception) {}
+                try { device.Update(); } catch(Exception ex) {
+                    Debug("Failure when running device Update()");
+                    Debug(ex.Message);
+                }
             }
 
             ControllerDevice selectedDevice = (ControllerDevice)devicesDataGridView.CurrentRow.DataBoundItem;

diff --git a/JoystickVisualizer/Assets/Devices/MFG Crosswind/MFGCrosswind.cs b/JoystickVisualizer/Assets/Devices/MFG Crosswind/MFGCrosswind.cs
@@ -4,7 +4,8 @@
 
 public class MFGCrosswind : MonoBehaviour
 {
-    public const string USB_ID = "06a3:0764";
+    public const string USB_ID = "????:????";
+    //public const string USB_ID = "06a3:0764";
 
     public GameObject Model;