Update git submodule url

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "spacenav-driver"]
 	path = spacenav-driver
-	url = https://git.digiserv.ovh/thibaud/spacenav-driver.git
+	url = https://github.com/thib8956/spacenav-driver.git

Program.cs

@@ -14,28 +14,27 @@ namespace SpaceNavWrapper
 			//	var ev = spnavwrapper.SpaceNav.Instance.WaitEvent(100);
 			//	Console.WriteLine(ev);
 			//}
-			SpaceNavDriver navDriver = new SpaceNavDriver();
+			SpaceNav navDriver = new SpaceNav();
 			navDriver.InitDevice();
-			navDriver.Button += OnButton;
+			navDriver.Button += delegate (object sender, ButtonEventArgs e)
+			{
+				navDriver.Nonblocking = !navDriver.Nonblocking;
+			};
 			navDriver.Motion += OnMotion;
             
             Console.CancelKeyPress += delegate {
 				navDriver.Dispose();
             };
-
-			for (; ; )
-			{
-			}
+			for (; ; ) 
+            {
+                navDriver.WaitEvent();
+				Console.WriteLine("AA");
+            }
 		}
 
 		private static void OnMotion(object sender, MotionEventArgs e)
 		{
 			Console.WriteLine(e);
 		}
-
-		private static void OnButton(object sender, EventArgs e)
-		{
-			Console.WriteLine("Button pressed");
-		}
 	}
 }

Readme.md

@@ -1,3 +1,3 @@
 # spnav-csharp-wrapper
 
-Simple C# wrapper for the HID spacenavigator [driver](https://git.digiserv.ovh/thibaud/spacenav-driver)
+Simple C# wrapper for the [HID spacenavigator driver](https://github.com/thib8956/spacenav-driver.git)

SpaceNav.cs

@@ -1,147 +1,165 @@
 using System;
 using System.Runtime.InteropServices;
-using System.Threading;
 
 namespace SpaceNavWrapper
 {
-	public class SpaceNavDriver : IDisposable
-    {
+	public class SpaceNav : IDisposable
+	{
 
 		const string DLL_NAME = "spnavhdi";
-        
-        #region Constants
-        private const int SPNAV_EVENT_MOTION = 1;
-        private const int SPNAV_EVENT_BUTTON = 2;
-        private const ushort SPNAV_VENDOR_ID = 0x046d;
-        private const ushort SPNAV_PRODUCT_ID = 0x0c627;
-        #endregion
+
+		#region Constants
+		private const int SPNAV_EVENT_MOTION = 1;
+		private const int SPNAV_EVENT_BUTTON = 2;
+		private const ushort SPNAV_VENDOR_ID = 0x046d;
+		private const ushort SPNAV_PRODUCT_ID = 0x0c627;
+		#endregion
 
 		public event EventHandler<MotionEventArgs> Motion;
-		public event EventHandler<EventArgs> Button;
-        
-		private Thread eventThread;
-        private bool deviceReady;
-        private double _sensitivity = 1.0;
-        private int _threshold = 5;
+		public event EventHandler<ButtonEventArgs> Button;
+
+		private double _sensitivity = 1.0;
+		private int _threshold = 5;
+        private bool _nonblocking;
 		private bool isDisposed;
 
 		#region Structures
 		private struct SpNavEventMotion
-        {
-            public int type;
-            public int x, y, z;
-            public int rx, ry, rz;
-            public uint period;
-            public IntPtr data;
-        }
+		{
+			public int type;
+			public int x, y, z;
+			public int rx, ry, rz;
+			public uint period;
+			public IntPtr data;
+		}
 
-        private struct SpNavEventButton
-        {
-            public int type;
-            public int press;
-            public int bnum;
-        }
+		private struct SpNavEventButton
+		{
+			public int type;
+            [MarshalAs(UnmanagedType.Bool)]
+			public bool press;
+			public int bnum;
+		}
 
-        [StructLayout(LayoutKind.Explicit)]
-        private struct SpNavEvent
-        {
-            [FieldOffset(0)] public int type;
-            [FieldOffset(0)] public SpNavEventMotion motion;
-            [FieldOffset(0)] public SpNavEventButton button;
-        }
-        #endregion
-        
-        #region DLL Imports
+		[StructLayout(LayoutKind.Explicit)]
+		private struct SpNavEvent
+		{
+			[FieldOffset(0)] public int type;
+			[FieldOffset(0)] public SpNavEventMotion motion;
+			[FieldOffset(0)] public SpNavEventButton button;
+		}
+		#endregion
+
+		#region DLL Imports
+		[DllImport(DLL_NAME)]
+		private static extern int spnav_open(ushort vendor_id, ushort product_id);
+		[DllImport(DLL_NAME)]
+		private static extern int spnav_close();
         [DllImport(DLL_NAME)]
-        private static extern int spnav_open(ushort vendor_id, ushort product_id);
-        [DllImport(DLL_NAME)]
-        private static extern int spnav_close();
-        [DllImport(DLL_NAME)]
-        private static extern int spnav_wait_event(ref SpNavEvent ev);
-        [DllImport(DLL_NAME)]
-        private static extern int spnav_wait_event_timeout(ref SpNavEvent ev, int timeout);
-        [DllImport(DLL_NAME)]
-        private static extern int spnav_sensitivity(double sens);
-        [DllImport(DLL_NAME)]
-        private static extern int spnav_deadzone(int threshold);
-        #endregion
-        
-        public SpaceNavDriver()
-        {
-			eventThread = new Thread(HandleEvents)
-			{
-				IsBackground = true,
-				Name = "3Dconnexion-Event-Dispatcher"
-			};
-			eventThread.Start();
-        }
-        
-        public void InitDevice()
-        {
+        private static extern int spnav_set_nonblocking(bool nonblock);
+		[DllImport(DLL_NAME)]
+		private static extern int spnav_wait_event(ref SpNavEvent ev);
+		[DllImport(DLL_NAME)]
+		private static extern int spnav_wait_event_timeout(ref SpNavEvent ev, int timeout);
+		[DllImport(DLL_NAME)]
+		private static extern int spnav_sensitivity(double sens);
+		[DllImport(DLL_NAME)]
+		private static extern int spnav_deadzone(int threshold);
+		#endregion
+
+		public void InitDevice()
+		{
+			// TODO handle retcode and errors
 			spnav_open(SPNAV_VENDOR_ID, SPNAV_PRODUCT_ID);
-			spnav_deadzone(5);
-			deviceReady = true;
-        }
-
-		private void HandleEvents(object obj)
-		{        
-            // Block while the device isn't ready
-            while (!deviceReady) {}
-            Console.WriteLine("Device ready !");
-			while (!isDisposed)
-            {
-                SpNavEvent sev = new SpNavEvent();
-				int ev_type = spnav_wait_event(ref sev);
-				Console.WriteLine("Event type : {0}", sev.type);
-                switch (ev_type)
-                {
-                    case SPNAV_EVENT_BUTTON:
-						//return new SpaceNavButtonEvent(Convert.ToBoolean(sev.button.press), sev.button.bnum);
-						Button(this, new EventArgs());
-						break;
-                    case SPNAV_EVENT_MOTION:
-						var ev = sev.motion;
-                        Motion(this, new MotionEventArgs(ev.x, ev.y, ev.z, ev.rx, ev.ry, ev.rz));
-						break;
-                }
-            }
 		}
 
-		public double Sensitivity
+		public void WaitEvent(int millis = -1)
 		{
-			get => _sensitivity;
-			set
+			SpNavEvent sev = new SpNavEvent();
+			int ev_type;
+			if (millis == -1)
 			{
-				_sensitivity = value;
-				spnav_sensitivity(value);
+				ev_type = spnav_wait_event(ref sev);
 			}
-		}
-
-		public int Threshold
-		{
-			get => _threshold;
-			set
+			else
 			{
-				_threshold = value;
-				spnav_deadzone(value);
+				ev_type = spnav_wait_event_timeout(ref sev, (int)millis);
+			}
+
+			switch (ev_type)
+			{
+				case SPNAV_EVENT_BUTTON:
+					var e = sev.button;
+					Button(this, new ButtonEventArgs(e.press, e.bnum));
+					break;
+				case SPNAV_EVENT_MOTION:
+					var ev = sev.motion;
+					Motion(this, new MotionEventArgs(ev.x, ev.y, ev.z, ev.rx, ev.ry, ev.rz));
+					break;
+				default:
+					break;
 			}
 		}
         
-        public void Dispose()
+        private void CloseDevice()
         {
-            if (!isDisposed)
-            {
-                CloseDevice();
-                Button = null;
-                Motion = null;
-            }
-            isDisposed = true;
+            // TODO : handle retcode and errors
+            spnav_close();
         }
 
-		private void CloseDevice()
+		#region Properties
+        public double Sensitivity
+        {
+            get
+            {
+                return _sensitivity;
+            }
+
+            set
+            {
+                _sensitivity = value;
+                spnav_sensitivity(value);
+            }
+        }
+
+        public int Threshold
+        {
+            get
+            {
+                return _threshold;
+            }
+
+            set
+            {
+                _threshold = value;
+                spnav_deadzone(value);
+            }
+        }
+
+        public bool Nonblocking
+        {
+            get
+            {
+                return _nonblocking;
+            }
+
+            set
+            {
+                _nonblocking = value;
+                spnav_set_nonblocking(value);
+            }
+        }
+        #endregion
+
+        public void Dispose()
 		{
-			// TODO : handle retcode and errors
-			spnav_close();
+			if (!isDisposed)
+			{
+				CloseDevice();
+				Button = null;
+				Motion = null;
+			}
+			isDisposed = true;
 		}
 	}
 }

SpaceNavEvent.cs

@@ -1,37 +1,100 @@
 using System;
+using System.Collections.Generic;
 
 namespace SpaceNavWrapper
 {
+    public enum SpaceNavAxis {
+        X, Y, Z, Rx, Ry, Rz
+    }
+
     public class MotionEventArgs : EventArgs 
     {
-        public readonly int X, Y, Z;
-        public readonly int Rx, Ry, Rz;
-        
+		public readonly Dictionary<SpaceNavAxis, int> axisValues;
+                
         public MotionEventArgs(int x, int y, int z, int rx, int ry, int rz)
 		{
-			X = x;
-			Y = y;
-			Z = z;
-			Rx = rx;
-			Ry = ry;
-			Rz = rz;
+            axisValues = new Dictionary<SpaceNavAxis, int>();
+            axisValues[SpaceNavAxis.X] = x;
+			axisValues[SpaceNavAxis.Y] = y;
+			axisValues[SpaceNavAxis.Z] = y;
+			axisValues[SpaceNavAxis.Rx] = rx;
+			axisValues[SpaceNavAxis.Ry] = ry;
+			axisValues[SpaceNavAxis.Rz] = rz;
 		}
-        
-        public override string ToString()
+
+        public int X
         {
-            return "x=" + X + " y=" + Y + " z=" + Z +
-                " rx=" + Rz + " ry=" + Ry + " rz=" + Rz;
+            get
+            {
+                return axisValues[SpaceNavAxis.X];
+            }
+        }
+
+        public int Y
+        {
+            get
+            {
+                return axisValues[SpaceNavAxis.Y];
+            }
+        }
+
+        public int Z
+        {
+            get
+            {
+                return axisValues[SpaceNavAxis.Z];
+            }
+        }
+
+        public int Rx
+        {
+            get
+            {
+                return axisValues[SpaceNavAxis.Rx];
+            }
+        }
+
+        public int Ry
+        {
+            get
+            {
+                return axisValues[SpaceNavAxis.Ry];
+            }
+        }
+
+        public int Rz
+        {
+            get
+            {
+                return axisValues[SpaceNavAxis.Rz];
+            }
+        }
+
+        public override string ToString()
+		{
+			return string.Format("x={0} y={1} z={2} rx={3} ry={4} rz={5}", X, Y, Z, Rx, Ry, Rz);
+        }        
+
+		public int GetAxis(SpaceNavAxis axis)
+        {
+			return axisValues[axis];
         }
     }
 
 	public class ButtonEventArgs : EventArgs
-    {
-		public readonly int button;
-		public readonly bool pressed;
+	{
+		public readonly bool Pressed;
+		public readonly int Button;
         
-        public override string ToString()
+		public ButtonEventArgs(bool pressed, int button)
 		{
-			return string.Format("[ButtonEventArgs: button={0}, pressed={1}]", button, pressed);
+			Pressed = pressed;
+			Button = button;
 		}
-    }
+        
+		public override string ToString()
+		{
+			return string.Format("button={0}, pressed={1}", Button, Pressed);
+		}
+	}
 }

spacenav-driver

@@ -1 +1 @@
-Subproject commit f37537fa836f19905f43dc5fd49e58384790d38a
+Subproject commit f654a62bdb4dbe14991fa89c2af69034587f816a

spnav-csharp-wrapper.csproj

@@ -27,9 +27,9 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="SpaceNav.cs" />
     <Compile Include="SpaceNavEvent.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="SpaceNav.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>