Skip to content

Commit

Permalink
Automatic merge of T1.5.1-542-ga8a4343d9 and 15 pull requests
Browse files Browse the repository at this point in the history 
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #831 at 61bbf43: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at a9760ec: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #857 at 9afc8c3: Adding Air Flow Meters
- Pull request #859 at 30d7b53: Steam adhesion bug#1
- Pull request #860 at d2b8a52: Changes in the Car Operations Menu for the lines with brake information
- Pull request #861 at 2c39260: Curve friction#1
- Pull request #862 at 489f261: Fix engine leak problem
- Pull request #863 at a34b857: Alternate preset 3D cabviewpoints
- Pull request #864 at cfdada3: Fixes for Undesired Emergency Applications
- Pull request #865 at 7d62bb2: Dispatcher window improvements
  • Loading branch information
@openrails-bot
openrails-bot committed Aug 21, 2023
17 parents ae94dd3 + a8a4343 + 98dd1a7 + cc3af66 + 61bbf43 + d00beb9 + 410a585 + a9760ec + b39e5d8 + 9afc8c3 + 30d7b53 + d2b8a52 + 2c39260 + 489f261 + a34b857 + cfdada3 + 7d62bb2 commit 63fa159
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 13 deletions.
5 changes: 5 additions & 0 deletions Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs
View file
Expand Up @@ -40,6 +40,7 @@ public abstract class BrakeSystem
public float BrakePipeVolumeM3 = 1.4e-2f; // volume of a single brake line
public bool ControllerRunningLock = false; // Stops Running controller from becoming active until BP = EQ Res, used in EQ vacuum brakes
public float BrakeCylFraction;
public float AngleCockOpeningTime = 30.0f; // Time taken to fully open a closed anglecock

/// <summary>
/// Front brake hoses connection status
Expand All @@ -49,10 +50,14 @@ public abstract class BrakeSystem
/// Front angle cock opened/closed status
/// </summary>
public bool AngleCockAOpen = true;
public float AngleCockAOpenAmount = 1.0f; // 0 - anglecock fully closed, 1 - anglecock fully open, allows for partial opening
public float? AngleCockAOpenTime = null; // Time elapsed since anglecock open command was sent
/// <summary>
/// Rear angle cock opened/closed status
/// </summary>
public bool AngleCockBOpen = true;
public float AngleCockBOpenAmount = 1.0f; // 0 - anglecock fully closed, 1 - anglecock fully open, allows for partial opening
public float? AngleCockBOpenTime = null; // Time elapsed since anglecock open command was sent
/// <summary>
/// Auxiliary brake reservoir vent valve open/closed status
/// </summary>
Expand Down
112 changes: 102 additions & 10 deletions Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
View file
Expand Up @@ -92,6 +92,9 @@ public class AirSinglePipe : MSTSBrakeSystem
protected float prevBrakePipePressurePSI = 0f;
protected float prevBrakePipePressurePSI_sound = 0f;

protected float BrakePipeChangePSIpS;
protected SmoothedData SmoothedBrakePipeChangePSIpS;


/// <summary>
/// EP brake holding valve. Needs to be closed (Lap) in case of brake application or holding.
Expand All @@ -115,6 +118,8 @@ public AirSinglePipe(TrainCar car)
BrakePipeVolumeM3 = (0.032f * 0.032f * (float)Math.PI / 4f) * Math.Max ( 5.0f, (1 + car.CarLengthM)); // Using DN32 (1-1/4") pipe
DebugType = "1P";

SmoothedBrakePipeChangePSIpS = new SmoothedData(0.25f);

// Force graduated releasable brakes. Workaround for MSTS with bugs preventing to set eng/wag files correctly for this.
if (Car.Simulator.Settings.GraduatedRelease) (Car as MSTSWagon).BrakeValve = MSTSWagon.BrakeValveType.Distributor;

Expand Down Expand Up @@ -208,7 +213,7 @@ public override string[] GetDebugStatus(Dictionary<BrakeSystemComponent, Pressur
string.Empty, // Spacer because the state above needs 2 columns.
(Car as MSTSWagon).HandBrakePresent ? string.Format("{0:F0}%", HandbrakePercent) : string.Empty,
FrontBrakeHoseConnected ? "I" : "T",
string.Format("A{0} B{1}", AngleCockAOpen ? "+" : "-", AngleCockBOpen ? "+" : "-"),
string.Format("A{0} B{1}", AngleCockAOpenAmount >= 1 ? "+" : AngleCockAOpenAmount <= 0 ? "-" : "/", AngleCockBOpenAmount >= 1 ? "+" : AngleCockBOpenAmount <= 0 ? "-" : "/"),
BleedOffValveOpen ? Simulator.Catalog.GetString("Open") : string.Empty,
};

Expand Down Expand Up @@ -333,7 +338,9 @@ public override void Save(BinaryWriter outf)
outf.Write((int)TripleValveState);
outf.Write(FrontBrakeHoseConnected);
outf.Write(AngleCockAOpen);
outf.Write(AngleCockAOpenAmount);
outf.Write(AngleCockBOpen);
outf.Write(AngleCockBOpenAmount);
outf.Write(BleedOffValveOpen);
outf.Write((int)HoldingValve);
outf.Write(UniformChargingActive);
Expand All @@ -357,7 +364,9 @@ public override void Restore(BinaryReader inf)
TripleValveState = (ValveState)inf.ReadInt32();
FrontBrakeHoseConnected = inf.ReadBoolean();
AngleCockAOpen = inf.ReadBoolean();
AngleCockAOpenAmount = inf.ReadSingle();
AngleCockBOpen = inf.ReadBoolean();
AngleCockBOpenAmount = inf.ReadSingle();
BleedOffValveOpen = inf.ReadBoolean();
HoldingValve = (ValveState)inf.ReadInt32();
UniformChargingActive = inf.ReadBoolean();
Expand Down Expand Up @@ -385,6 +394,8 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
{
loco.MainResPressurePSI = loco.MaxMainResPressurePSI;
}

SmoothedBrakePipeChangePSIpS.ForceSmoothValue(0);
}

public override void Initialize()
Expand Down Expand Up @@ -460,12 +471,15 @@ public void UpdateTripleValveState(float elapsedClockSeconds)
var prevState = TripleValveState;
var valveType = (Car as MSTSWagon).BrakeValve;
bool disableGradient = !(Car.Train.LeadLocomotive is MSTSLocomotive) && Car.Train.TrainType != Orts.Simulation.Physics.Train.TRAINTYPE.STATIC;
// Small workaround to allow trains to more reliably go into emergency after uncoupling
bool emergencyTripped = (Car.Train.TrainType == Orts.Simulation.Physics.Train.TRAINTYPE.STATIC) ?
BrakeLine1PressurePSI <= EmergResPressurePSI * AuxCylVolumeRatio / (AuxCylVolumeRatio + 1) : Math.Max(-SmoothedBrakePipeChangePSIpS.SmoothedValue, 0) > EmergencyValveActuationRatePSIpS;

if (valveType == MSTSWagon.BrakeValveType.Distributor)
{
float applicationPSI = ControlResPressurePSI - BrakeLine1PressurePSI;
float targetPressurePSI = applicationPSI * AuxCylVolumeRatio;
if (!disableGradient && EmergencyValveActuationRatePSIpS > 0 && (prevBrakePipePressurePSI - BrakeLine1PressurePSI) > Math.Max(elapsedClockSeconds, 0.0001f) * EmergencyValveActuationRatePSIpS)
if (!disableGradient && EmergencyValveActuationRatePSIpS > 0 && emergencyTripped)
{
if (prevState == ValveState.Release) // If valve transitions from release to emergency, quick service activates
{
Expand Down Expand Up @@ -502,7 +516,7 @@ public void UpdateTripleValveState(float elapsedClockSeconds)
}
else if (valveType == MSTSWagon.BrakeValveType.TripleValve || valveType == MSTSWagon.BrakeValveType.DistributingValve)
{
if (!disableGradient && EmergencyValveActuationRatePSIpS > 0 && (prevBrakePipePressurePSI - BrakeLine1PressurePSI) > Math.Max(elapsedClockSeconds, 0.0001f) * EmergencyValveActuationRatePSIpS)
if (!disableGradient && EmergencyValveActuationRatePSIpS > 0 && emergencyTripped)
{
if (prevState == ValveState.Release) // If valve transitions from release to emergency, quick service activates
{
Expand Down Expand Up @@ -552,11 +566,53 @@ public void UpdateTripleValveState(float elapsedClockSeconds)
else EmergencyDumpStartTime = null;
}

public void UpdateAngleCockState(bool AngleCockOpen, ref float AngleCockOpenAmount, ref float? AngleCockOpenTime)
{
float currentTime = (float)this.Car.Simulator.GameTime;

if (AngleCockOpen && AngleCockOpenAmount < 1.0f)
{
if (AngleCockOpenTime == null)
{
AngleCockOpenTime = currentTime;
}
else if (currentTime - AngleCockOpenTime > AngleCockOpeningTime)
{
// Finish opening anglecock at a faster rate once time has elapsed
AngleCockOpenAmount = (currentTime - ((float)AngleCockOpenTime + AngleCockOpeningTime)) / 5 + 0.3f;

if (AngleCockOpenAmount >= 1.0f)
{
AngleCockOpenAmount = 1.0f;
AngleCockOpenTime = null;
}
}
else
{
// Gradually open anglecock toward 30% over 30 seconds
AngleCockOpenAmount = 0.3f * (currentTime - (float)AngleCockOpenTime) / AngleCockOpeningTime;
}
}
else if (!AngleCockOpen && AngleCockOpenAmount > 0.0f)
{
AngleCockOpenAmount = 0.0f;
AngleCockOpenTime = null;
}
}

public override void Update(float elapsedClockSeconds)
{
var valveType = (Car as MSTSWagon).BrakeValve;
float threshold = valveType == MSTSWagon.BrakeValveType.Distributor ? Math.Max((ControlResPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio, 0) : 0;

BrakePipeChangePSIpS = (BrakeLine1PressurePSI - prevBrakePipePressurePSI) / Math.Max(elapsedClockSeconds, 0.0001f);
SmoothedBrakePipeChangePSIpS.Update(Math.Max(elapsedClockSeconds, 0.0001f), BrakePipeChangePSIpS);

// Update anglecock opening. Anglecocks set to gradually open over 30 seconds, but close instantly.
// Gradual opening prevents undesired emergency applications
UpdateAngleCockState(AngleCockAOpen, ref AngleCockAOpenAmount, ref AngleCockAOpenTime);
UpdateAngleCockState(AngleCockBOpen, ref AngleCockBOpenAmount, ref AngleCockBOpenTime);

if (BleedOffValveOpen)
{
if (valveType == MSTSWagon.BrakeValveType.Distributor)
Expand Down Expand Up @@ -596,7 +652,6 @@ public override void Update(float elapsedClockSeconds)
{
float dp = 0;
float dpPipe = 0;
float brakePipeChange = Math.Max(prevBrakePipePressurePSI - BrakeLine1PressurePSI, 0);
if (QuickServiceActive) // Quick service: Brake pipe pressure is locally reduced to speed up initial reduction
{
if (QuickServiceVentRatePSIpS > 0)
Expand All @@ -613,13 +668,16 @@ public override void Update(float elapsedClockSeconds)
{
if (AcceleratedApplicationFactor > 0) // Accelerated application: Air is vented from the brake pipe to speed up service applications
{
dpPipe = Math.Min(brakePipeChange * AcceleratedApplicationFactor, elapsedClockSeconds * AcceleratedApplicationLimitPSIpS); // Amount of air vented is proportional to pressure reduction from external sources
// Amount of air vented is proportional to pressure reduction from external sources
dpPipe = MathHelper.Clamp(-SmoothedBrakePipeChangePSIpS.SmoothedValue * AcceleratedApplicationFactor, 0, AcceleratedApplicationLimitPSIpS) * elapsedClockSeconds;
}
dp = elapsedClockSeconds * MaxApplicationRatePSIpS;
}
if (BrakeLine1PressurePSI - dpPipe < 0)
{
// Prevent pipe pressure from going negative, also reset quick service to prevent runaway condition
dpPipe = BrakeLine1PressurePSI;
QuickServiceActive = false;
}

if (TripleValveState != ValveState.Emergency && BrakeLine1PressurePSI < AuxResPressurePSI + 1)
Expand All @@ -643,7 +701,9 @@ public override void Update(float elapsedClockSeconds)
AutoCylPressurePSI += dp;
BrakeLine1PressurePSI -= dpPipe;

if (QuickServiceActive && AutoCylPressurePSI > QuickServiceLimitPSI) // Reset quick service if brake cylinder is above limiting valve setting
// Reset quick service if brake cylinder is above limiting valve setting
// Also reset quick service if cylinders manage to equalize to prevent runaway condition
if (QuickServiceActive && (AutoCylPressurePSI > QuickServiceLimitPSI || AutoCylPressurePSI >= AuxResPressurePSI))
QuickServiceActive = false;

if (TripleValveState == ValveState.Emergency)
Expand Down Expand Up @@ -1128,7 +1188,8 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
int nSteps = (int)(elapsedClockSeconds / brakePipeTimeFactorS + 1);
float trainPipeTimeVariationS = elapsedClockSeconds / nSteps;
float trainPipeLeakLossPSI = lead == null ? 0.0f : (trainPipeTimeVariationS * lead.TrainBrakePipeLeakPSIorInHgpS);
float serviceTimeFactor = lead != null ? lead.TrainBrakeController != null && lead.TrainBrakeController.EmergencyBraking ? lead.BrakeEmergencyTimeFactorPSIpS : lead.BrakeServiceTimeFactorPSIpS : 0;
float serviceTimeFactor = lead != null && lead.TrainBrakeController != null ? lead.BrakeServiceTimeFactorPSIpS : 0.001f;
float emergencyTimeFactor = lead != null && lead.TrainBrakeController != null ? lead.BrakeEmergencyTimeFactorPSIpS : 0.001f;
for (int i = 0; i < nSteps; i++)
{
if (lead != null)
Expand All @@ -1141,7 +1202,17 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
lead.BrakeSystem.BrakeLine1PressurePSI -= trainPipeLeakLossPSI;
}

if (lead.TrainBrakeController.TrainBrakeControllerState != ControllerState.Neutral)
// Emergency brake - vent brake pipe to 0 psi regardless of equalizing res pressure
if (lead.TrainBrakeController.EmergencyBraking)
{
float emergencyVariationFactor = Math.Min(trainPipeTimeVariationS / emergencyTimeFactor, 0.95f);
float pressureDiffPSI = emergencyVariationFactor * lead.BrakeSystem.BrakeLine1PressurePSI;

if (lead.BrakeSystem.BrakeLine1PressurePSI - pressureDiffPSI < 0)
pressureDiffPSI = lead.BrakeSystem.BrakeLine1PressurePSI;
lead.BrakeSystem.BrakeLine1PressurePSI -= pressureDiffPSI;
}
else if (lead.TrainBrakeController.TrainBrakeControllerState != ControllerState.Neutral)
{
// Charge train brake pipe - adjust main reservoir pressure, and lead brake pressure line to maintain brake pipe equal to equalising resevoir pressure - release brakes
if (lead.BrakeSystem.BrakeLine1PressurePSI < train.EqualReservoirPressurePSIorInHg)
Expand Down Expand Up @@ -1225,6 +1296,13 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
// The sign in the equation determines the direction of air flow.
float trainPipePressureDiffPropagationPSI = pressureDiffPSI * Math.Min(trainPipeTimeVariationS / brakePipeTimeFactorS, 1);

// Flow is restricted when either anglecock is not opened fully
if (car.BrakeSystem.AngleCockAOpenAmount < 1 || prevCar.BrakeSystem.AngleCockBOpenAmount < 1)
{
trainPipePressureDiffPropagationPSI *= MathHelper.Min((float)Math.Pow(car.BrakeSystem.AngleCockAOpenAmount * prevCar.BrakeSystem.AngleCockBOpenAmount, 2), 1.0f);

}

// Air flows from high pressure to low pressure, until pressure is equal in both cars.
// Brake pipe volumes of both cars are taken into account, so pressure increase/decrease is proportional to relative volumes.
// If TrainPipePressureDiffPropagationPSI equals to p1-p0 the equalization is achieved in one step.
Expand All @@ -1243,11 +1321,25 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
// Empty the brake pipe if the brake hose is not connected and angle cocks are open
if (!car.BrakeSystem.FrontBrakeHoseConnected && car.BrakeSystem.AngleCockAOpen)
{
car.BrakeSystem.BrakeLine1PressurePSI = Math.Max(car.BrakeSystem.BrakeLine1PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);
float dp = car.BrakeSystem.BrakeLine1PressurePSI * trainPipeTimeVariationS / brakePipeTimeFactorS;

if (car.BrakeSystem.AngleCockAOpenAmount < 1)
dp *= MathHelper.Clamp((float)Math.Pow(car.BrakeSystem.AngleCockAOpenAmount, 2), 0.0f, 1.0f);

if (car.BrakeSystem.BrakeLine1PressurePSI - dp < 0)
dp = car.BrakeSystem.BrakeLine1PressurePSI;
car.BrakeSystem.BrakeLine1PressurePSI -= dp;
}
if ((nextCar == null || !nextCar.BrakeSystem.FrontBrakeHoseConnected) && car.BrakeSystem.AngleCockBOpen)
{
car.BrakeSystem.BrakeLine1PressurePSI = Math.Max(car.BrakeSystem.BrakeLine1PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);
float dp = car.BrakeSystem.BrakeLine1PressurePSI * trainPipeTimeVariationS / brakePipeTimeFactorS;

if (car.BrakeSystem.AngleCockBOpenAmount < 1)
dp *= MathHelper.Clamp((float)Math.Pow(car.BrakeSystem.AngleCockBOpenAmount, 2), 0.0f, 1.0f);

if (car.BrakeSystem.BrakeLine1PressurePSI - dp < 0)
dp = car.BrakeSystem.BrakeLine1PressurePSI;
car.BrakeSystem.BrakeLine1PressurePSI -= dp;
}
}
#if DEBUG_TRAIN_PIPE_LEAK
Expand Down
5 changes: 5 additions & 0 deletions Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
View file
Expand Up @@ -162,6 +162,11 @@ public override void Update(float elapsedClockSeconds)
float brakeShoeFriction = Car.GetBrakeShoeFrictionFactor();
Car.HuDBrakeShoeFriction = Car.GetBrakeShoeFrictionCoefficientHuD();

// Update anglecock opening. Anglecocks set to gradually open over 30 seconds, but close instantly.
// Gradual opening prevents undesired emergency applications
UpdateAngleCockState(AngleCockAOpen, ref AngleCockAOpenAmount, ref AngleCockAOpenTime);
UpdateAngleCockState(AngleCockBOpen, ref AngleCockBOpenAmount, ref AngleCockBOpenTime);

Car.BrakeRetardForceN = ( Car.MaxHandbrakeForceN * HandbrakePercent / 100) * brakeShoeFriction; // calculates value of force applied to wheel, independent of wheel skid
if (Car.BrakeSkid) // Test to see if wheels are skiding to excessive brake force
{
Expand Down
12 changes: 9 additions & 3 deletions Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs
View file
Expand Up @@ -123,9 +123,15 @@ public override void Update(float elapsedClockSeconds)
if (Train.Simulator.PlayerLocomotive.Train == Train && EOTState == EOTstate.ArmedTwoWay &&
(EOTEmergencyBrakingOn ||
(Train.Simulator.PlayerLocomotive as MSTSLocomotive).TrainBrakeController.GetStatus().ToLower().StartsWith("emergency")))
Train.Cars.Last().BrakeSystem.AngleCockBOpen = true;
{
// Simulate EOT opening brake pipe to atmosphere by instantly opening rear anglecock
this.BrakeSystem.AngleCockBOpen = true;
this.BrakeSystem.AngleCockBOpenAmount = 1;
}
else
Train.Cars.Last().BrakeSystem.AngleCockBOpen = false;
{
this.BrakeSystem.AngleCockBOpen = false;
}
base.Update(elapsedClockSeconds);
}

Expand Down Expand Up @@ -277,4 +283,4 @@ public void EmergencyBrake (bool toState)
}

}
}
}

0 comments on commit 63fa159

Please sign in to comment.