Merge pull request #469 from peternewell/brake-enhamcements#4

cjakeman · web-flow · commit 1c391e5b73c7 · 2021-09-09T16:35:11.000+01:00
Correct an error introduced with braking enhancement Blueprint https://blueprints.launchpad.net/or/+spec/brake-enhancements
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
@@ -34,12 +34,12 @@ public EPBrakeSystem(TrainCar car)
         public override void Update(float elapsedClockSeconds)
         {
             MSTSLocomotive lead = (MSTSLocomotive)Car.Train.LeadLocomotive;
+            float demandedAutoCylPressurePSI = 0;
 
-            // Only allow brakes to operate if car is connected to an SME system
+            // Only allow EP brake tokens to operate if car is connected to an EP system
             if (lead != null && lead.BrakeSystem is EPBrakeSystem && Car.BrakeSystem is EPBrakeSystem && (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPFullServ || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPOnly || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPApply))
             {
 
-                float demandedAutoCylPressurePSI = 0;
                 if (BrakeLine3PressurePSI >= 1000f || Car.Train.BrakeLine4 < 0)
                 {
                     HoldingValve = ValveState.Release;
@@ -53,9 +53,13 @@ public override void Update(float elapsedClockSeconds)
                     demandedAutoCylPressurePSI = Math.Min(Math.Max(Car.Train.BrakeLine4, 0), 1) * MaxCylPressurePSI;
                     HoldingValve = AutoCylPressurePSI <= demandedAutoCylPressurePSI ? ValveState.Lap : ValveState.Release;
                 }
+            }
 
-                base.Update(elapsedClockSeconds);
+                base.Update(elapsedClockSeconds); // Allow processing of other valid tokens
 
+            // Only allow EP brake tokens to operate if car is connected to an EP system
+            if (lead != null && lead.BrakeSystem is EPBrakeSystem && Car.BrakeSystem is EPBrakeSystem && (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPFullServ || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPOnly || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPApply))
+            {
                 if (AutoCylPressurePSI < demandedAutoCylPressurePSI && !Car.WheelBrakeSlideProtectionActive)
                 {
                     float dp = elapsedClockSeconds * MaxApplicationRatePSIpS;
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs
@@ -38,12 +38,11 @@ public SMEBrakeSystem(TrainCar car)
         public override void Update(float elapsedClockSeconds)
         {
             MSTSLocomotive lead = (MSTSLocomotive)Car.Train.LeadLocomotive;
+            float demandedAutoCylPressurePSI = 0;
 
-            // Only allow brakes to operate if car is connected to an SME system
+            // Only allow SME brake tokens to operate if car is connected to an SME system
             if (lead != null && lead.BrakeSystem is SMEBrakeSystem && Car.BrakeSystem is SMEBrakeSystem && (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMEFullServ || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMEOnly || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMEReleaseStart || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMESelfLap))
-            {
-
-                float demandedAutoCylPressurePSI = 0;
+            {                
                 if (BrakeLine3PressurePSI >= 1000f || Car.Train.BrakeLine4 < 0)
                 {
                     HoldingValve = ValveState.Release;
@@ -57,9 +56,12 @@ public override void Update(float elapsedClockSeconds)
                     demandedAutoCylPressurePSI = Math.Min(Math.Max(Car.Train.BrakeLine4, 0), 1) * MaxCylPressurePSI;
                     HoldingValve = AutoCylPressurePSI <= demandedAutoCylPressurePSI ? ValveState.Lap : ValveState.Release;
                 }
+            }
+                base.Update(elapsedClockSeconds); // Allow processing of other valid tokens
 
-                base.Update(elapsedClockSeconds);
-
+            // Only allow SME brake tokens to operate if car is connected to an SME system
+            if (lead != null && lead.BrakeSystem is SMEBrakeSystem && Car.BrakeSystem is SMEBrakeSystem && (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMEFullServ || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMEOnly || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMEReleaseStart || lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.SMESelfLap))
+            {
                 if (AutoCylPressurePSI < demandedAutoCylPressurePSI && !Car.WheelBrakeSlideProtectionActive)
                 {
                     float dp = elapsedClockSeconds * MaxApplicationRatePSIpS;

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ public EPBrakeSystem(TrainCar car)`
`34`	`34`	`public override void Update(float elapsedClockSeconds)`
`35`	`35`	`{`
`36`	`36`	`MSTSLocomotive lead = (MSTSLocomotive)Car.Train.LeadLocomotive;`
	`37`	`+ float demandedAutoCylPressurePSI = 0;`
`37`	`38`
`38`		`- // Only allow brakes to operate if car is connected to an SME system`
	`39`	`+ // Only allow EP brake tokens to operate if car is connected to an EP system`
`39`	`40`	`if (lead != null && lead.BrakeSystem is EPBrakeSystem && Car.BrakeSystem is EPBrakeSystem && (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPFullServ \|\| lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPOnly \|\| lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPApply))`
`40`	`41`	`{`
`41`	`42`
`42`		`- float demandedAutoCylPressurePSI = 0;`
`43`	`43`	`if (BrakeLine3PressurePSI >= 1000f \|\| Car.Train.BrakeLine4 < 0)`
`44`	`44`	`{`
`45`	`45`	`HoldingValve = ValveState.Release;`
`@@ -53,9 +53,13 @@ public override void Update(float elapsedClockSeconds)`
`53`	`53`	`demandedAutoCylPressurePSI = Math.Min(Math.Max(Car.Train.BrakeLine4, 0), 1) * MaxCylPressurePSI;`
`54`	`54`	`HoldingValve = AutoCylPressurePSI <= demandedAutoCylPressurePSI ? ValveState.Lap : ValveState.Release;`
`55`	`55`	`}`
	`56`	`+ }`
`56`	`57`
`57`		`- base.Update(elapsedClockSeconds);`
	`58`	`+ base.Update(elapsedClockSeconds); // Allow processing of other valid tokens`
`58`	`59`
	`60`	`+ // Only allow EP brake tokens to operate if car is connected to an EP system`
	`61`	`+ if (lead != null && lead.BrakeSystem is EPBrakeSystem && Car.BrakeSystem is EPBrakeSystem && (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPFullServ \|\| lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPOnly \|\| lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.EPApply))`
	`62`	`+ {`
`59`	`63`	`if (AutoCylPressurePSI < demandedAutoCylPressurePSI && !Car.WheelBrakeSlideProtectionActive)`
`60`	`64`	`{`
`61`	`65`	`float dp = elapsedClockSeconds * MaxApplicationRatePSIpS;`