Skip to content

Commit 0f90f83

Browse files
committed
Automatic merge of T1.5.1-972-g193ebe1d0 and 14 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 48aa537: Blueprint/train car operations UI window - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at c296b32: Downloading route content (Github, zip) - Pull request #912 at df43405: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #923 at 4c27204: Add curve squeal to route - Pull request #943 at 50d37b7: Dynamic Brakes Behavior & Display Improvements
16 parents 1ddc6f4 + 193ebe1 + dfc715e + d00beb9 + f92de76 + 48aa537 + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + c296b32 + df43405 + 26cc6a8 + abe2e52 + 4c27204 + 50d37b7 commit 0f90f83

File tree

1 file changed

+12
-12
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
539539
FullServPressurePSI = fullServPressurePSI;
540540
AutoCylAirPSIM3 = immediateRelease ? 0 : (maxPressurePSI - BrakeLine1PressurePSI) * AuxResVolumeM3;
541541
QuickServiceBulbPressurePSI = BrakeLine1PressurePSI < maxPressurePSI ? BrakeLine1PressurePSI : 0;
542-
if (CylSource == 0)
542+
if (CylSource == CylinderSource.AuxRes)
543543
AutoCylPressurePSI = ForceBrakeCylinderPressure(ref AutoCylAirPSIM3, AdvancedBrakeCylinderPressure(AutoCylAirPSIM3));
544544
else
545545
AutoCylPressurePSI = immediateRelease ? 0 : Math.Min((maxPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio, MaxTripleValveCylPressurePSI);
@@ -1167,7 +1167,7 @@ public override void Update(float elapsedClockSeconds)
11671167
AuxResPressurePSI -= elapsedClockSeconds * MaxApplicationRatePSIpS;
11681168
if (AuxResPressurePSI < 0)
11691169
AuxResPressurePSI = 0;
1170-
if (CylSource == 0)
1170+
if (CylSource == CylinderSource.AuxRes)
11711171
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, -elapsedClockSeconds * MaxReleaseRatePSIpS, 0);
11721172
else
11731173
AutoCylPressurePSI -= elapsedClockSeconds * MaxReleaseRatePSIpS;
@@ -1234,7 +1234,7 @@ public override void Update(float elapsedClockSeconds)
12341234
if (dp < 0)
12351235
dp = 0;
12361236

1237-
if (CylSource == 0) // Aux res is directly connected to brake cylinder, no relay valve
1237+
if (CylSource == CylinderSource.AuxRes) // Aux res is directly connected to brake cylinder, no relay valve
12381238
{
12391239
float prevAutoCylAirPSIM3 = AutoCylAirPSIM3;
12401240
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, dp, threshold);
@@ -1265,7 +1265,7 @@ public override void Update(float elapsedClockSeconds)
12651265
dp = elapsedClockSeconds * MaxReleaseRatePSIpS;
12661266
if (AutoCylPressurePSI - dp < AuxResPressurePSI + dp / AuxCylVolumeRatio)
12671267
dp = Math.Max((AutoCylPressurePSI - AuxResPressurePSI) * (AuxCylVolumeRatio / (1 + AuxCylVolumeRatio)), 0);
1268-
if (CylSource == 0)
1268+
if (CylSource == CylinderSource.AuxRes)
12691269
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, -dp, AuxResPressurePSI);
12701270
else
12711271
AutoCylPressurePSI -= dp;
@@ -1331,7 +1331,7 @@ public override void Update(float elapsedClockSeconds)
13311331
dp = (BrakeLine1PressurePSI - AutoCylPressurePSI) / (1 + CylBrakeLineVolumeRatio);
13321332
if (dp < 0)
13331333
dp = 0;
1334-
if (CylSource == 0)
1334+
if (CylSource == CylinderSource.AuxRes)
13351335
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, dp, BrakeLine1PressurePSI);
13361336
else
13371337
AutoCylPressurePSI += dp;
@@ -1388,7 +1388,7 @@ public override void Update(float elapsedClockSeconds)
13881388
if (dp < 0)
13891389
dp = 0;
13901390

1391-
if (CylSource == 0) // Aux res is directly connected to brake cylinder, no relay valve
1391+
if (CylSource == CylinderSource.AuxRes) // Aux res is directly connected to brake cylinder, no relay valve
13921392
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, -dp, threshold);
13931393
else
13941394
AutoCylPressurePSI -= dp;
@@ -1401,7 +1401,7 @@ public override void Update(float elapsedClockSeconds)
14011401
float dp = elapsedClockSeconds * ReleaseRatePSIpS;
14021402
if (AutoCylPressurePSI - dp < target)
14031403
dp = AutoCylPressurePSI - target;
1404-
if (CylSource == 0)
1404+
if (CylSource == CylinderSource.AuxRes)
14051405
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, -dp, target);
14061406
else
14071407
AutoCylPressurePSI -= dp;
@@ -1412,7 +1412,7 @@ public override void Update(float elapsedClockSeconds)
14121412
dp *= MathHelper.Clamp(MathHelper.Lerp(1.0f, 0.1f, (AutoCylPressurePSI - HighSpeedReducingPressurePSI) / 5.0f), 0.1f, 1.0f); // Rate of release reduces as pressure difference increases
14131413
if (AutoCylPressurePSI - dp < HighSpeedReducingPressurePSI)
14141414
dp = AutoCylPressurePSI - HighSpeedReducingPressurePSI;
1415-
if (CylSource == 0)
1415+
if (CylSource == CylinderSource.AuxRes)
14161416
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, -dp, HighSpeedReducingPressurePSI);
14171417
else
14181418
AutoCylPressurePSI -= dp;
@@ -1457,7 +1457,7 @@ public override void Update(float elapsedClockSeconds)
14571457
dp = (QuickServiceBulbPressurePSI - AutoCylPressurePSI) / (1 + volumeRatio);
14581458
if (dp < 0)
14591459
dp = 0;
1460-
if (CylSource == 0)
1460+
if (CylSource == CylinderSource.AuxRes)
14611461
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, dp, QuickServiceLimitPSI);
14621462
else
14631463
AutoCylPressurePSI += dp;
@@ -1737,7 +1737,7 @@ public override void Update(float elapsedClockSeconds)
17371737
{
17381738
float dp = elapsedClockSeconds * RelayValveApplicationRatePSIpS;
17391739
// Reduce glitchyness caused by extremely low demanded pressures
1740-
if (CylSource != 0 && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f)
1740+
if (CylSource != CylinderSource.AuxRes && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f)
17411741
dp *= 0.2f;
17421742
if (dp > demandedPressurePSI - CylPressurePSI)
17431743
dp = demandedPressurePSI - CylPressurePSI;
@@ -1776,7 +1776,7 @@ public override void Update(float elapsedClockSeconds)
17761776
{
17771777
float dp = elapsedClockSeconds * RelayValveReleaseRatePSIpS;
17781778
// Reduce glitchyness caused by extremely low demanded pressures
1779-
if (CylSource != 0 && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f)
1779+
if (CylSource != CylinderSource.AuxRes && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f)
17801780
dp *= 0.2f;
17811781
if (dp > CylPressurePSI - demandedPressurePSI)
17821782
dp = CylPressurePSI - demandedPressurePSI;
@@ -1822,7 +1822,7 @@ public override void Update(float elapsedClockSeconds)
18221822

18231823
if (AuxResPressurePSI - dp < 0)
18241824
dp = AuxResPressurePSI;
1825-
if (CylSource == 0)
1825+
if (CylSource == CylinderSource.AuxRes)
18261826
AutoCylPressurePSI = CalculateBrakeCylinderPressure(ref AutoCylAirPSIM3, -dp, 0);
18271827
else
18281828
AutoCylPressurePSI -= dp;

0 commit comments

Comments
 (0)