Further adjustments to WSP

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -1030,16 +1030,16 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                         WheelBrakeSlideProtectionFitted = false;
                     }
                     break;
-                case "wagon(ortsemergencybrakingdisableswsp":
+                case "wagon(ortswheelbrakesslideprotectionlimitdisable":
                     // stf.MustMatch("(");
                     var brakeslideprotectiondisable = stf.ReadFloatBlock(STFReader.UNITS.None, null);
                     if (brakeslideprotectiondisable == 1)
                     {
-                        WheelBrakeSlideProtectionEmergencyDisabled = true;
+                        WheelBrakeSlideProtectionLimitDisabled = true;
                     }
                     else
                     {
-                        WheelBrakeSlideProtectionEmergencyDisabled = false;
+                        WheelBrakeSlideProtectionLimitDisabled = false;
                     }
                     break;
                 case "wagon(ortsdavis_a": DavisAN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); break;
@@ -1366,7 +1366,7 @@ public virtual void Copy(MSTSWagon copy)
             MainSoundFileName = copy.MainSoundFileName;
             BrakeShoeFrictionFactor = copy.BrakeShoeFrictionFactor;
             WheelBrakeSlideProtectionFitted = copy.WheelBrakeSlideProtectionFitted;
-            WheelBrakeSlideProtectionEmergencyDisabled = copy.WheelBrakeSlideProtectionEmergencyDisabled;
+            WheelBrakeSlideProtectionLimitDisabled = copy.WheelBrakeSlideProtectionLimitDisabled;
             InitialMaxBrakeForceN = copy.InitialMaxBrakeForceN;
             InitialMaxHandbrakeForceN = copy.InitialMaxHandbrakeForceN;
             MaxBrakeForceN = copy.MaxBrakeForceN;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

@@ -500,10 +500,10 @@ public override void Update(float elapsedClockSeconds)
 
             // (ii) When Brake Pipe Pressure has been reduced below 250 kPa (36.25psi). 
 
-            if (Car.WheelBrakeSlideProtectionFitted)
+            if (Car.WheelBrakeSlideProtectionFitted && Car.Train.IsPlayerDriven)
             {
                 // WSP dump valve active
-                if ((Car.BrakeSkidWarning || Car.BrakeSkid) && !Car.WheelBrakeSlideProtectionDumpValveLockout && ( (!Car.WheelBrakeSlideProtectionEmergencyDisabled && BrakeLine1PressurePSI > 36.25) || Car.WheelBrakeSlideProtectionEmergencyDisabled) )
+                if ((Car.BrakeSkidWarning || Car.BrakeSkid) && CylPressurePSI > 0 && !Car.WheelBrakeSlideProtectionDumpValveLockout && ( (!Car.WheelBrakeSlideProtectionLimitDisabled && BrakeLine1PressurePSI > 36.25) || Car.WheelBrakeSlideProtectionLimitDisabled) )
                 {
                     Car.WheelBrakeSlideProtectionActive = true;
                     AutoCylPressurePSI -= elapsedClockSeconds * MaxReleaseRatePSIpS;

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -258,7 +258,7 @@ public float ConvectionFactor
         // Used to calculate wheel sliding for locked brake
         public bool WheelBrakeSlideProtectionFitted = false;
         public bool WheelBrakeSlideProtectionActive = false;
-        public bool WheelBrakeSlideProtectionEmergencyDisabled = false;
+        public bool WheelBrakeSlideProtectionLimitDisabled = false;
         public float WheelBrakeSlideProtectionTimerS = 7;
         public bool WheelBrakeSlideProtectionDumpValveLockout = false;
 
@@ -929,8 +929,8 @@ public virtual void UpdateBrakeSlideCalculation()
 
                 if (this is MSTSDieselLocomotive || this is MSTSElectricLocomotive)
                 {
-
-                    if (WheelSlipWarning && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0) // If advanced adhesion model indicates wheel slip, then check other conditiond (throttle and brake force) to determine whether it is a wheel slip or brake skid
+                    // If advanced adhesion model indicates wheel slip warning, then check other conditions (throttle and brake force) to determine whether it is a wheel slip or brake skid
+                    if (WheelSlipWarning && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0) 
                     {
                         BrakeSkidWarning = true;  // set brake skid flag true
                     }
@@ -939,14 +939,15 @@ public virtual void UpdateBrakeSlideCalculation()
                         BrakeSkidWarning = false;
                     }
 
-                    if (WheelSlip && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0) // If advanced adhesion model indicates wheel slip, then check other conditiond (throttle and brake force) to determine whether it is a wheel slip or brake skid
+                    // If advanced adhesion model indicates wheel slip, then check other conditions (throttle and brake force) to determine whether it is a wheel slip or brake skid
+                    if (WheelSlip && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0)
                     {
-                       BrakeSkid = true;  // set brake skid flag true
-                    } 
-                   else
-                   {
-                       BrakeSkid = false;
-                   }
+                        BrakeSkid = true;  // set brake skid flag true
+                    }
+                    else
+                    {
+                        BrakeSkid = false;
+                    }
                 }
 
                 else if (!(this is MSTSDieselLocomotive) || !(this is MSTSElectricLocomotive))
@@ -955,11 +956,12 @@ public virtual void UpdateBrakeSlideCalculation()
                     // Calculate tread force on wheel - use the retard force as this is related to brakeshoe coefficient, and doesn't vary with skid.
                     BrakeWheelTreadForceN = BrakeRetardForceN;
 
+                    // Determine whether car is experiencing a wheel slip during braking
                     if (!BrakeSkidWarning && AbsSpeedMpS > 0.01)
                     {
                         var wagonbrakeadhesiveforcen = MassKG * GravitationalAccelerationMpS2 * Train.WagonCoefficientFriction; // Adhesive force wheel normal 
 
-                        if (BrakeWheelTreadForceN > 0.80f * WagonBrakeAdhesiveForceN)
+                        if (BrakeWheelTreadForceN > 0.80f * WagonBrakeAdhesiveForceN && ThrottlePercent > 0.01)
                         {
                             BrakeSkidWarning = true; 	// wagon wheel is about to slip
                         }
@@ -970,7 +972,7 @@ public virtual void UpdateBrakeSlideCalculation()
                     }
 
                     // Reset WSP dump valve lockout
-                    if (WheelBrakeSlideProtectionFitted && WheelBrakeSlideProtectionDumpValveLockout && (ThrottlePercent == 0 || AbsSpeedMpS == 0))
+                    if (WheelBrakeSlideProtectionFitted && WheelBrakeSlideProtectionDumpValveLockout && (ThrottlePercent > 0.01 || AbsSpeedMpS <= 0.002))
                     {
                         WheelBrakeSlideProtectionTimerS = 7;
                         WheelBrakeSlideProtectionDumpValveLockout = false;