add saitek rudder and combat rudder, and invert x52 throttle axis

JoystickProxy/JoystickProxy/Program.cs

@@ -12,11 +12,14 @@
 using IniParser;
 using IniParser.Model;
 using System.Collections.Concurrent;
+using System.Diagnostics;
 
 namespace JoystickProxy
 {
     class Program
     {
+        private static int FPS = 30;
+        private static int FrameTime;
         private bool Debug = true;
         private static Dictionary<string, string> SupportedDevices = new Dictionary<string, string>();
         private static Dictionary<Guid, string> InstanceGuidToUsbIdLookup = new Dictionary<Guid, string>();
@@ -30,6 +33,7 @@ static void Main(string[] args)
 
             host = IPAddress.Parse(data["Config"]["Host"]);
             port = Int32.Parse(data["Config"]["Port"]);
+            FrameTime = 1000 / Int32.Parse(data["Config"]["FPS"]);
 
             Console.WriteLine("JoystickProxy");
             Console.WriteLine("=============");
@@ -84,8 +88,10 @@ public Program()
 
                 while (true)
                 {
-                    foreach(Joystick joystick in connectedJoysticks.Values)
+                    Stopwatch sw = new Stopwatch();
+                    foreach (Joystick joystick in connectedJoysticks.Values)
                     {
+                        sw.Start();
                         try
                         {
                             joystick.Poll();
@@ -108,8 +114,12 @@ public Program()
                         {}
 
                     }
-
-                    Thread.Sleep(20);
+                    sw.Stop();
+                    int sleepTime = FrameTime - (int)sw.ElapsedMilliseconds;
+                    if (sleepTime > 0)
+                    {
+                        Thread.Sleep(sleepTime);
+                    }
                 }
             }
             catch (Exception e)

JoystickProxy/JoystickProxy/settings.ini

@@ -1,12 +1,14 @@
 [Config]
 Host = 127.0.0.1
 Port = 11011
+FPS = 60
 
 [Devices]
 044f:0402 = Warthog Joystick
 044f:0404 = Warthog Throttle
 044f:b10a = T.16000M
-# 06a3:0764 = Saitek Pro Combat Rudder
+06a3:0763 = Saitek Rudder Pedals
+06a3:0764 = Saitek Combat Rudder Pedals
 068e:00f = CH Pro Pedals
 231d:011f = VKB Gunfighter
 046d:c215 = Logitech 3D Pro

JoystickVisualizer/Assets/Devices/Saitek Combat Rudder/SaitekCombatRudder.cs

@@ -43,16 +43,15 @@ void StickEvent(JoystickState state)
                         Model.SetActive(entry.Value == 1);
                     break;
 
-                case "RotationZ": // Pedal Position -0.05 0.05
-                    LeftPedal.transform.position = new Vector3(LeftPedal.transform.position.x, LeftPedal.transform.position.y, ConvertRange(entry.Value, 0, 65535, 3, -3));
-                    RightPedal.transform.position = new Vector3(RightPedal.transform.position.x, RightPedal.transform.position.y, ConvertRange(entry.Value, 0, 65535, -3, 3));
+                case "RotationZ":
+                    LeftPedal.transform.localPosition = new Vector3(LeftPedal.transform.localPosition.x, ConvertRange(entry.Value, 0, 65535, 2.4, -2.4), LeftPedal.transform.localPosition.z);
+                    RightPedal.transform.localPosition = new Vector3(RightPedal.transform.localPosition.x, ConvertRange(entry.Value, 0, 65535, -2.4, 2.4), RightPedal.transform.localPosition.z);
                     break;
                 case "X": // Left brake
-                    // Rotate Z between 0 and 20
-                    LeftPedalBrake.transform.localEulerAngles = new Vector3(ConvertRange(entry.Value, 0, 65535, 0, 20), 0, 0);
+                    LeftPedalBrake.transform.localEulerAngles = new Vector3(ConvertRange(entry.Value, 0, 65535, 20, 0), 0, 0);
                     break;
                 case "Y": // Right brake
-                    RightPedalBrake.transform.localEulerAngles = new Vector3(ConvertRange(entry.Value, 0, 65535, 0, 20), 0, 0);
+                    RightPedalBrake.transform.localEulerAngles = new Vector3(ConvertRange(entry.Value, 0, 65535, 20, 0), 0, 0);
                     break;
             }
         }