Skip to content

Commit a880a31

Browse files
committed
Automatic merge of T1.6-rc3-30-gdf7bf1a26 and 17 pull requests
- Pull request #1104 at 1f7af77: Handle simple adhesion within the axle module - Pull request #1057 at 1c2bcb4: Switchable brake system - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 7fc8de1: Automatic speed control - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1123 at dc286f5: Handle null control active locomotive - Pull request #1125 at 7a4f055: Lift #1096 into 1.6 release - Pull request #1129 at 034b6e2: adds missing es.po files - Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID. - Pull request #1131 at d8f0d8c: fix: Skip byte position from compressed files as it is not supported - Pull request #1132 at 1dd9be8: Fixes For Correct Questionable Braking Parameters - Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller
19 parents e158b20 + df7bf1a + 1f7af77 + 1c2bcb4 + e10390b + 7fc8de1 + 387388e + 270f22f + 91d2d26 + dc286f5 + 7a4f055 + 034b6e2 + 251a677 + d8f0d8c + 1dd9be8 + 8dc00d5 + 5845a1a + 689494b + fab5457 commit a880a31

File tree

1 file changed

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

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,7 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
22472247
float supplyPressure = locoAirSystem.SupplyReservoirPresent ? locoAirSystem.SupplyResPressurePSI : loco.MainResPressurePSI; // Pressure of reservoir used for brake pipe charging
22482248

22492249
if (supplyPressure - locoAirSystem.BrakeLine1PressurePSI < 15.0f) // Reduce recharge rate if near MR pressure as per reality
2250-
PressureDiffEqualToPipePSI *= MathHelper.Lerp(0, 1.0f, (supplyPressure - train.EqualReservoirPressurePSIorInHg) / 15.0f);
2250+
PressureDiffEqualToPipePSI *= MathHelper.Lerp(0, 1.0f, (supplyPressure - locoAirSystem.BrakeLine1PressurePSI) / 15.0f);
22512251
if (train.EqualReservoirPressurePSIorInHg - locoAirSystem.BrakeLine1PressurePSI < chargeSlowdown) // Reduce recharge rate if near EQ to simulate feed valve behavior
22522252
PressureDiffEqualToPipePSI *= (float)Math.Pow((train.EqualReservoirPressurePSIorInHg - locoAirSystem.BrakeLine1PressurePSI) / chargeSlowdown,
22532253
1.0f/3.0f);

0 commit comments

Comments
 (0)