Merge pull request #408 from perpetualKid/RailDriverUpdate

Updating RailDriver SDK library to prepare for 64bit mode

Author: perpetualKid

Source/3rdPartyLibs/PIEHidDotNet.dll

@@ -152,7 +152,6 @@ static void CheckOR(List<string> missingFiles, string path)
                 "GNU.Gettext.WinForms.dll",
                 "ICSharpCode.SharpZipLib.dll",
                 "Ionic.Zip.dll",
-                "PIEHidDotNet.dll",
                 @"Native/X86/OpenAL32.dll",
                 @"Native/X64/OpenAL32.dll",
                 // Programs:

Source/Launcher/Program.cs

@@ -67,9 +67,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="PIEHidDotNet, Version=2.2.3.26389, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\3rdPartyLibs\PIEHidDotNet.dll</HintPath>
+    <Reference Include="RailDriver, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RailDriver.0.7.10\lib\netstandard2.0\RailDriver.dll</HintPath>
     </Reference>
     <Reference Include="Swan.Lite, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30c707c872729fff, processorArchitecture=MSIL">
       <HintPath>..\packages\Unosquare.Swan.Lite.3.0.0\lib\net461\Swan.Lite.dll</HintPath>

Source/RunActivity/RunActivity.csproj

@@ -23,14 +23,14 @@
 using Orts.Simulation.RollingStocks;
 using ORTS.Common;
 using ORTS.Common.Input;
-using PIEHidDotNet;
+using RailDriver;
 
 namespace Orts.Viewer3D
 {
     /// <summary>
     /// Class to get data from RailDriver and translate it into something useful for UserInput
     /// </summary>
-    public class UserInputRailDriver : PIEDataHandler, PIEErrorHandler
+    public class UserInputRailDriver : IDataHandler, IErrorHandler
     {
         PIEDevice Device;                   // Our RailDriver
         byte[] WriteBuffer;                 // Buffer for sending data to RailDriver
@@ -69,15 +69,15 @@ public UserInputRailDriver(string basePath)
         {
             try
             {
-                PIEDevice[] devices = PIEHidDotNet.PIEDevice.EnumeratePIE();
+                PIEDevice[] devices = PIEDevice.EnumeratePIE();
                 for (int i = 0; i < devices.Length; i++)
                 {
                     if (devices[i].HidUsagePage == 0xc && devices[i].Pid == 210)
                     {
                         Device = devices[i];
                         Device.SetupInterface();
                         Device.SetErrorCallback(this);
-                        Device.SetDataCallback(this, DataCallbackFilterType.callOnChangedData);
+                        Device.SetDataCallback(this);
                         WriteBuffer = new byte[Device.WriteLength];
                         State = new RailDriverState();
                         SetLEDs(0x40, 0x40, 0x40);
@@ -98,38 +98,29 @@ public UserInputRailDriver(string basePath)
         /// </summary>
         /// <param name="data"></param>
         /// <param name="sourceDevice"></param>
-        public void HandlePIEHidData(Byte[] data, PIEDevice sourceDevice)
+        public void HandleHidData(byte[] data, PIEDevice sourceDevice, int error)
         {
             if (sourceDevice != Device)
                 return;
             State.SaveButtonData();
-            byte[] rdata = null;
-            while (0 == sourceDevice.ReadData(ref rdata)) //do this so don't ever miss any data
-            {
-#if false
-                    String output = "Callback: " + sourceDevice.Pid + ", ID: " + Device.ToString() + ", data=";
-                    for (int i = 0; i < sourceDevice.ReadLength; i++)
-                        output = output + rdata[i].ToString() + "  ";
-                    Console.WriteLine(output);
-#endif
-                State.DirectionPercent = Percentage(rdata[1], FullReversed, Neutral, FullForward);
-
-                State.ThrottlePercent = Percentage(rdata[2], ThrottleIdle, FullThrottle);
-
-                State.DynamicBrakePercent = Percentage(rdata[2], ThrottleIdle, DynamicBrakeSetup, DynamicBrake);
-                State.TrainBrakePercent = Percentage(rdata[3], AutoBrakeRelease, FullAutoBrake);
-                State.EngineBrakePercent = Percentage(rdata[4], IndependentBrakeRelease, IndependentBrakeFull);
-                float a = .01f * State.EngineBrakePercent;
-                float calOff = (1 - a) * BailOffDisengagedRelease + a * BailOffDisengagedFull;
-                float calOn = (1 - a) * BailOffEngagedRelease + a * BailOffEngagedFull;
-                State.BailOff = Percentage(rdata[5], calOff, calOn) > 50;
-                if (State.TrainBrakePercent >= 100)
-                    State.Emergency = Percentage(rdata[3], FullAutoBrake, EmergencyBrake) > 50;
-
-                State.Wipers = (int)(.01 * Percentage(rdata[6], Rotary1Position1, Rotary1Position2, Rotary1Position3) + 2.5);
-                State.Lights = (int)(.01 * Percentage(rdata[7], Rotary2Position1, Rotary2Position2, Rotary2Position3) + 2.5);
-                State.AddButtonData(rdata);
-            }
+
+            State.DirectionPercent = Percentage(data[1], FullReversed, Neutral, FullForward);
+
+            State.ThrottlePercent = Percentage(data[2], ThrottleIdle, FullThrottle);
+
+            State.DynamicBrakePercent = Percentage(data[2], ThrottleIdle, DynamicBrakeSetup, DynamicBrake);
+            State.TrainBrakePercent = Percentage(data[3], AutoBrakeRelease, FullAutoBrake);
+            State.EngineBrakePercent = Percentage(data[4], IndependentBrakeRelease, IndependentBrakeFull);
+            float a = .01f * State.EngineBrakePercent;
+            float calOff = (1 - a) * BailOffDisengagedRelease + a * BailOffDisengagedFull;
+            float calOn = (1 - a) * BailOffEngagedRelease + a * BailOffEngagedFull;
+            State.BailOff = Percentage(data[5], calOff, calOn) > 50;
+            if (State.TrainBrakePercent >= 100)
+                State.Emergency = Percentage(data[3], FullAutoBrake, EmergencyBrake) > 50;
+
+            State.Wipers = (int)(.01 * Percentage(data[6], Rotary1Position1, Rotary1Position2, Rotary1Position3) + 2.5);
+            State.Lights = (int)(.01 * Percentage(data[7], Rotary2Position1, Rotary2Position2, Rotary2Position3) + 2.5);
+            State.AddButtonData(data);
 
             if (State.IsPressed(4, 0x30))
                 State.Emergency = true;
@@ -157,7 +148,7 @@ public void HandlePIEHidData(Byte[] data, PIEDevice sourceDevice)
         /// </summary>
         /// <param name="error"></param>
         /// <param name="sourceDevice"></param>
-        public void HandlePIEHidError(Int32 error, PIEDevice sourceDevice)
+        public void HandleHidError(PIEDevice sourceDevice, int error)
         {
             Trace.TraceWarning("RailDriver Error: {0}", error);
         }

Source/RunActivity/Viewer3D/UserInputRailDriver.cs

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EmbedIO" version="3.4.3" targetFramework="net472" />
+  <package id="RailDriver" version="0.7.10" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Unosquare.Swan.Lite" version="3.0.0" targetFramework="net472" />
 </packages>