Skip to content

Commit b9b4843

Browse files
committed
Tweak default values
1 parent e6e95f1 commit b9b4843

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ public float OdometerM
421421
protected bool DynamicBrakeBlendingOverride; // true when DB lever >0% should always override the blending. When false, the bigger command is applied.
422422
protected bool DynamicBrakeBlendingForceMatch = true; // if true, dynamic brake blending tries to achieve the same braking force as the airbrake would have.
423423
public float DynamicBrakeBlendingRetainedPressurePSI { get; private set; } = -1.0f; // the amount of pressure that will always be retained in the brake cylinders during blended braking
424-
public float DynamicBrakeBlendingMinSpeedMpS { get; private set; } = 2.25f; // below this speed, blended braking is disabled
424+
public float DynamicBrakeBlendingMinSpeedMpS { get; private set; } = -1.0f; // below this speed, blended braking is disabled
425425
protected bool DynamicBrakeControllerSetupLock; // if true if dynamic brake lever will lock until dynamic brake is available
426426

427427
public float DynamicBrakeBlendingPercent { get; protected set; } = -1;
@@ -1895,6 +1895,21 @@ public override void Initialize()
18951895
DynamicBrakeEngineBrakeReplacementSpeed = DynamicBrakeSpeed2MpS;
18961896
}
18971897

1898+
// Define blending minimum speed if it was left undefined (use MSTS minimum dynamic brake speed)
1899+
if (DynamicBrakeBlendingMinSpeedMpS < 0)
1900+
{
1901+
DynamicBrakeBlendingMinSpeedMpS = DynamicBrakeSpeed1MpS;
1902+
}
1903+
1904+
// Define blending retained pressure if it was left undefined
1905+
if (DynamicBrakeBlendingRetainedPressurePSI < 0)
1906+
{
1907+
if (BrakeSystem is AirSinglePipe airSystem)
1908+
DynamicBrakeBlendingRetainedPressurePSI = 2.0f * airSystem.BrakeCylinderSpringPressurePSI;
1909+
else
1910+
DynamicBrakeBlendingRetainedPressurePSI = 0.0f;
1911+
}
1912+
18981913
// Initialise track sanding parameters
18991914
if (MaxTrackSandBoxCapacityM3 == 0)
19001915
{
@@ -2020,15 +2035,6 @@ protected void CorrectBrakingParams()
20202035
(MaxDynamicBrakeForceN / MaxContinuousForceN < 0.3f && MaxDynamicBrakeForceN == 20000))
20212036
MaxDynamicBrakeForceN = Math.Min (MaxContinuousForceN * 0.5f, 150000); // 20000 is suggested as standard value in the MSTS documentation, but in general it is a too low value
20222037
}
2023-
2024-
// Define blending retained pressure if it was left undefined
2025-
if (DynamicBrakeBlendingRetainedPressurePSI < 0)
2026-
{
2027-
if (BrakeSystem is AirSinglePipe airSystem)
2028-
DynamicBrakeBlendingRetainedPressurePSI = 2.0f * airSystem.BrakeCylinderSpringPressurePSI;
2029-
else
2030-
DynamicBrakeBlendingRetainedPressurePSI = 0.0f;
2031-
}
20322038
}
20332039

20342040
/// <summary>

0 commit comments

Comments
 (0)