Prevent re-reading of data already passed as Callback parameter

Author: perpetualKid

Source/RunActivity/Viewer3D/UserInputRailDriver.cs

@@ -104,33 +104,24 @@ 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;