Set brakes so that mixed SME and EP brakes do not operate together.

peternewell · peternewell · commit b7841edfb67b · 2021-09-02T20:13:30.000+10:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
@@ -18,6 +18,7 @@
 using ORTS.Common;
 using System;
 using System.Collections.Generic;
+using ORTS.Scripting.Api;
 
 namespace Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS
 {
@@ -33,7 +34,9 @@ public EPBrakeSystem(TrainCar car)
         public override void Update(float elapsedClockSeconds)
         {
             MSTSLocomotive lead = (MSTSLocomotive)Car.Train.LeadLocomotive;
-            if (lead != null && lead.BrakeSystem is EPBrakeSystem)
+
+            // Only allow brakes to operate if car is connected to an SME 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;
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs
@@ -18,6 +18,7 @@
 using ORTS.Common;
 using System;
 using System.Collections.Generic;
+using ORTS.Scripting.Api;
 
 namespace Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS
 {
@@ -33,7 +34,9 @@ public SMEBrakeSystem(TrainCar car)
         public override void Update(float elapsedClockSeconds)
         {
             MSTSLocomotive lead = (MSTSLocomotive)Car.Train.LeadLocomotive;
-            if (lead != null && lead.BrakeSystem is SMEBrakeSystem)
+
+            // Only allow brakes 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;

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`using ORTS.Common;`
`19`	`19`	`using System;`
`20`	`20`	`using System.Collections.Generic;`
	`21`	`+using ORTS.Scripting.Api;`
`21`	`22`
`22`	`23`	`namespace Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS`
`23`	`24`	`{`
`@@ -33,7 +34,9 @@ public EPBrakeSystem(TrainCar car)`
`33`	`34`	`public override void Update(float elapsedClockSeconds)`
`34`	`35`	`{`
`35`	`36`	`MSTSLocomotive lead = (MSTSLocomotive)Car.Train.LeadLocomotive;`
`36`		`- if (lead != null && lead.BrakeSystem is EPBrakeSystem)`
	`37`	`+`
	`38`	`+ // Only allow brakes to operate if car is connected to an SME system`
	`39`	`+ 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))`
`37`	`40`	`{`
`38`	`41`
`39`	`42`	`float demandedAutoCylPressurePSI = 0;`