Merge pull request #721 from cesarBLG/fix-wheelslip-alarm

Do not trigger wheelslip alarm until some time passes

Author: twpol

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs

@@ -259,19 +259,11 @@ public float TransmissionEfficiency
         public float TrainSpeedMpS;
 
         /// <summary>
-        /// Read only wheel slip indicator
+        /// Wheel slip indicator
         /// - is true when absolute value of SlipSpeedMpS is greater than WheelSlipThresholdMpS, otherwise is false
         /// </summary>
-        public bool IsWheelSlip
-        {
-            get
-            {
-                if (Math.Abs(SlipSpeedMpS) > WheelSlipThresholdMpS) 
-                    return true;
-                else
-                    return false;
-            }
-        }
+        public bool IsWheelSlip { get; private set; }
+        float WheelSlipTimeS;
 
         /// <summary>
         /// Read only wheelslip threshold value used to indicate maximal effective slip
@@ -290,18 +282,13 @@ public float WheelSlipThresholdMpS
         }
 
         /// <summary>
-        /// Read only wheelslip warning indication
+        /// Wheelslip warning indication
         /// - is true when SlipSpeedMpS is greater than zero and 
         ///   SlipSpeedPercent is greater than SlipWarningThresholdPercent in both directions,
         ///   otherwise is false
         /// </summary>
-        public bool IsWheelSlipWarning
-        {
-            get
-            {
-                return Math.Abs(SlipSpeedPercent) > SlipWarningTresholdPercent;
-            }
-        }
+        public bool IsWheelSlipWarning { get; private set; }
+        float WheelSlipWarningTimeS;
 
         /// <summary>
         /// Read only slip speed value in metric meters per second
@@ -553,6 +540,29 @@ public virtual void Update(float timeSpan)
             CompensatedAxleForceN = AxleForceN + Math.Sign(TrainSpeedMpS) * BrakeRetardForceN;
             if (AxleForceN == 0) CompensatedAxleForceN = 0;
 
+            if (Math.Abs(SlipSpeedMpS) > WheelSlipThresholdMpS)
+            {
+                // Wait some time before indicating wheelslip to avoid false triggers
+                if (WheelSlipTimeS > 0.1f)
+                {
+                    IsWheelSlip = IsWheelSlipWarning = true;
+                }
+                WheelSlipTimeS += timeSpan;
+            }
+            else if (Math.Abs(SlipSpeedPercent) > SlipWarningTresholdPercent)
+            {
+                // Wait some time before indicating wheelslip to avoid false triggers
+                if (WheelSlipWarningTimeS > 0.1f) IsWheelSlipWarning = true;
+                IsWheelSlip = false;
+                WheelSlipWarningTimeS += timeSpan;
+            }
+            else
+            {
+                IsWheelSlipWarning = false;
+                IsWheelSlip = false;
+                WheelSlipWarningTimeS = WheelSlipTimeS = 0;
+            }
+
             if (timeSpan > 0.0f)
             {
                 slipDerivationMpSS = (SlipSpeedMpS - previousSlipSpeedMpS) / timeSpan;