Skip to content

Commit 560da40

Browse files
committed
Automatic merge of T1.5.1-870-ge0bf062eb and 17 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - 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 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - 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 #897 at 42f1dd9: feat: Improved system information collection - Pull request #903 at 9bead33: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at d595703: New Triple Valve Features Vol. 2 - Pull request #914 at 8e50570: Adjustments to Duplex steam - Pull request #915 at 6d911d7: Correct calculation error with curve friction - Pull request #917 at fde18cf: Lighting Configuration Enhancements - Pull request #918 at f7ba507: Manual - News topics updated since 1.5.1
19 parents 958e9e7 + e0bf062 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + 9bead33 + 9b0b04f + 6834af0 + d595703 + 8e50570 + 6d911d7 + fde18cf + f7ba507 commit 560da40

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3198,10 +3198,10 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31983198
Relay valves may be installed to achieve higher brake cylinder pressures,
31993199
dynamic brake blending or variable load compensation.
32003200
- ``Wagon(ORTSBrakeRelayValveInshot`` -- Sets the "in-shot" pressure for the relay
3201-
valve. Relay valves with a ratio less than 1 may not produce sufficient pressure
3202-
to extend the brake cylinders. In-shot solves this problem by applying additional
3203-
pressure at a 1:1 ratio, regardless of the actual relay valve ratio. The pressure
3204-
defined here is the maximum amount of additional pressure to apply.
3201+
valve. This pressure will be added to the regular output of the relay valve for any
3202+
application, effectively setting a minimum brake cylinder pressure. Many step down
3203+
relay valves (ratio less than 1) utilize in-shot to ensure brake cylinders extend
3204+
fully for light train brake applications.
32053205
- ``Wagon(ORTSEngineBrakeRelayValveRatio`` -- Same as ``ORTSBrakeRelayValveRatio``,
32063206
but for the engine brake.
32073207
- ``Wagon(ORTSEngineBrakeRelayValveInshot`` -- Same as ``ORTSBrakeRelayValveInshot``,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,13 +490,13 @@ public override void Initialize()
490490
if (Car.Simulator.Settings.SimpleControlPhysics && EmergResVolumeM3 > 2.0)
491491
EmergResVolumeM3 = 0.7f;
492492

493-
if (ServiceMaxCylPressurePSI == 0)
494-
ServiceMaxCylPressurePSI = MaxTripleValveCylPressurePSI;
493+
// Set default values for any optional tokens that are unset
495494
if (MaxTripleValveCylPressurePSI == 0)
496495
MaxTripleValveCylPressurePSI = MaxCylPressurePSI / RelayValveRatio;
496+
if (ServiceMaxCylPressurePSI == 0)
497+
ServiceMaxCylPressurePSI = MaxTripleValveCylPressurePSI;
497498
if (EngineRelayValveRatio == 0)
498499
EngineRelayValveRatio = RelayValveRatio;
499-
500500
if (ServiceApplicationRatePSIpS == 0)
501501
ServiceApplicationRatePSIpS = MaxApplicationRatePSIpS;
502502

@@ -546,7 +546,7 @@ public override void Initialize()
546546

547547
RelayValveFitted |= (Car is MSTSLocomotive loco && (loco.DynamicBrakeAutoBailOff || loco.DynamicBrakePartialBailOff)) ||
548548
(Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.DistributingValve || (Car as MSTSWagon).SupplyReservoirPresent ||
549-
TwoStageRelayValveRatio != 0;
549+
TwoStageRelayValveRatio != 0 || RelayValveInshot != 0 || EngineRelayValveInshot != 0;
550550

551551
// If user specified only one two stage speed, set the other to be equal
552552
if (TwoStageSpeedDownMpS == 0 && TwoStageSpeedUpMpS > 0)

0 commit comments

Comments
 (0)