Skip to content

Commit 01e3600

Browse files
committed
Automatic merge of T1.5.1-870-ge0bf062eb and 18 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 e6baa97: 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 3112a51: 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 #916 at 11ac52c: Distributed Power Air Brake Synchronization - Pull request #917 at fde18cf: Lighting Configuration Enhancements - Pull request #918 at f7ba507: Manual - News topics updated since 1.5.1
20 parents 4f927c4 + e0bf062 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + e6baa97 + 9b0b04f + 6834af0 + 3112a51 + 8e50570 + 6d911d7 + 11ac52c + fde18cf + f7ba507 commit 01e3600

File tree

7 files changed

+136
-19
lines changed

7 files changed

+136
-19
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,9 +2485,6 @@ be about 1 minute for every 12 cars. If the *Brake Pipe Charging Rate*
24852485
will be disabled and will also disable some but not all of the other new
24862486
brake features.
24872487

2488-
Brake system charging time depends on the train length as it should, but
2489-
at the moment there is no modeling of main reservoirs and compressors.
2490-
24912488
For EP brakes, two variants are available:
24922489

24932490
- If ``Wagon(ORTSEPBrakeControlsBrakePipe`` is set to 0 (default situation),
@@ -3195,6 +3192,9 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31953192
single: ORTSBrakePipeTimeFactor
31963193
single: ORTSEPBrakeControlsBrakePipe
31973194
single: ORTSCompressorIsMuControlled
3195+
single: Supply_Reservoir
3196+
single: ORTSSupplyResCapacity
3197+
single: ORTSSupplyResChargingRate
31983198

31993199
- ``Wagon(BrakePipeVolume`` -- Volume of car's brake pipe in cubic feet
32003200
(default .5).
@@ -3229,7 +3229,9 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
32293229
during release. Remains active until aux res has recharged.
32303230
- ``Wagon(ORTSMainResPipeAuxResCharging`` -- Boolean value that indicates,
32313231
for twin pipe systems, if the main reservoir pipe is used for charging the auxiliary
3232-
reservoirs. If set to false, the main reservoir pipe will not be used
3232+
reservoirs. Alternately, if equipped with a supply reservoir, the supply reservoir
3233+
will charge from the main reservoir pipe instead. If set to false, the main reservoir
3234+
pipe will not be used (default: true).
32333235
by the brake system.
32343236
- ``Wagon(ORTSEPBrakeControlsBrakePipe`` -- Set to 1 for UIC EP brake: brake pipe
32353237
pressure is electrically controlled at every fitted car.
@@ -3301,6 +3303,16 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
33013303
- ``Wagon(ORTSCylinderSpringPressure`` -- Below the specified pressure, no
33023304
brake force will be developed, simulating the pressure required to
33033305
overcome the brake cylinder return spring (default 0).
3306+
- ``BrakeEquipmentType(Supply_Reservoir`` -- Adds a supply reservoir to the
3307+
loco or wagon, which will constantly charge to the brake pipe pressure
3308+
or MR pipe (if equipped) pressure. If a supply reservoir is equipped,
3309+
supply res air will be used to pressurize the brake cylinders thru the relay
3310+
valve. This allows for a small, fast charging auxiliary reservoir to
3311+
be used with large brake cylinders.
3312+
- ``Wagon(ORTSSupplyResCapacity`` -- Volume of the supply reservoir. Larger
3313+
volumes relative to the brake cylinder volume allow for more brake applications.
3314+
- ``Wagon(ORTSSupplyResChargingRate`` -- The rate at which the pressure of the
3315+
supply reservoir will increase when charging from the brake pipe or MR pipe.
33043316
- ``Engine(ORTSMainResChargingRate`` -- Rate of main reservoir pressure change
33053317
in psi per second when the compressor is on (default .4).
33063318
- ``Engine(ORTSEngineBrakeReleaseRate`` -- Rate of engine brake pressure

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,8 @@ public bool LargeEjectorSoundOn
354354
{ BrakeSystemComponent.EmergencyReservoir, PressureUnit.None },
355355
{ BrakeSystemComponent.MainPipe, PressureUnit.None },
356356
{ BrakeSystemComponent.BrakePipe, PressureUnit.None },
357-
{ BrakeSystemComponent.BrakeCylinder, PressureUnit.None }
357+
{ BrakeSystemComponent.BrakeCylinder, PressureUnit.None },
358+
{ BrakeSystemComponent.SupplyReservoir, PressureUnit.None }
358359
};
359360

360361
protected float OdometerResetPositionM = 0;
@@ -752,6 +753,7 @@ protected void GetPressureUnit()
752753
BrakeSystemPressureUnits[BrakeSystemComponent.MainPipe] = BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir]; // Main Pipe is supplied by Main Reservoir
753754
BrakeSystemPressureUnits[BrakeSystemComponent.AuxiliaryReservoir] = BrakeSystemPressureUnits[BrakeSystemComponent.BrakePipe]; // Auxiliary Reservoir is supplied by Brake Pipe (in single pipe brakes)
754755
BrakeSystemPressureUnits[BrakeSystemComponent.EmergencyReservoir] = BrakeSystemPressureUnits[BrakeSystemComponent.BrakePipe]; // Emergency Reservoir is supplied by Brake Pipe
756+
BrakeSystemPressureUnits[BrakeSystemComponent.SupplyReservoir] = BrakeSystemPressureUnits[BrakeSystemComponent.BrakePipe]; // Supply Reservoir is supplied by Brake Pipe and MR Pipe
755757

756758
foreach (BrakeSystemComponent component in BrakeSystemPressureUnits.Keys.ToList())
757759
{

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,11 @@ public enum BrakeValveType
282282
/// </summary>
283283
public bool AuxiliaryReservoirPresent;
284284

285+
/// <summary>
286+
/// Indicates whether an additional supply reservoir is present on the wagon or not.
287+
/// </summary>
288+
public bool SupplyReservoirPresent;
289+
285290
/// <summary>
286291
/// Active locomotive for a control trailer
287292
/// </summary>
@@ -1305,6 +1310,9 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
13051310
case "manual_brake": ManualBrakePresent = true; break;
13061311
case "retainer_3_position": RetainerPositions = 3; break;
13071312
case "retainer_4_position": RetainerPositions = 4; break;
1313+
case "supply_reservoir":
1314+
SupplyReservoirPresent = true;
1315+
break;
13081316
}
13091317
}
13101318
break;
@@ -1654,6 +1662,7 @@ public virtual void Copy(MSTSWagon copy)
16541662
HandBrakePresent = copy.HandBrakePresent;
16551663
ManualBrakePresent = copy.ManualBrakePresent;
16561664
AuxiliaryReservoirPresent = copy.AuxiliaryReservoirPresent;
1665+
SupplyReservoirPresent = copy.SupplyReservoirPresent;
16571666
RetainerPositions = copy.RetainerPositions;
16581667
InteriorShapeFileName = copy.InteriorShapeFileName;
16591668
InteriorSoundFileName = copy.InteriorSoundFileName;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public enum BrakeSystemComponent
2929
EmergencyReservoir,
3030
MainPipe,
3131
BrakePipe,
32-
BrakeCylinder
32+
BrakeCylinder,
33+
SupplyReservoir
3334
}
3435

3536
public abstract class BrakeSystem

0 commit comments

Comments
 (0)