Skip to content

Commit

Permalink
Automatic merge of T1.5.1-542-ga8a4343d9 and 15 pull requests
Browse files Browse the repository at this point in the history
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #831 at 61bbf43: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at a9760ec: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #857 at 9afc8c3: Adding Air Flow Meters
- Pull request #859 at 8a7df84: Steam adhesion bug#1
- Pull request #860 at d2b8a52: Changes in the Car Operations Menu for the lines with brake information
- Pull request #861 at 589e716: Curve friction#1
- Pull request #862 at 489f261: Fix engine leak problem
- Pull request #863 at a34b857: Alternate preset 3D cabviewpoints
- Pull request #864 at 2fed4b9: Fixes for Undesired Emergency Applications
- Pull request #865 at 705126e: Dispatcher window improvements
  • Loading branch information
openrails-bot committed Aug 25, 2023
Showing 1 changed file with 3 additions and 1 deletion.
Expand Up @@ -812,13 +812,15 @@ public override void Update(float elapsedClockSeconds)
EmergResPressurePSI -= dp;
BrakeLine1PressurePSI += dp * EmergBrakeLineVolumeRatio;
}
else // Quick recharge: Emergency res air used to recharge aux res on older control valves
else if (!EmergResQuickRelease) // Quick recharge: Emergency res air used to recharge aux res on older control valves
{
float dp = elapsedClockSeconds * MaxAuxilaryChargingRatePSIpS;
if (AuxResPressurePSI + dp > EmergResPressurePSI - dp / EmergAuxVolumeRatio)
dp = (EmergResPressurePSI - AuxResPressurePSI) * EmergAuxVolumeRatio / (1 + EmergAuxVolumeRatio);
if (BrakeLine1PressurePSI < AuxResPressurePSI + dp)
dp = (BrakeLine1PressurePSI - AuxResPressurePSI);
if (dp < 0)
dp = 0;
AuxResPressurePSI += dp;
EmergResPressurePSI -= dp / EmergAuxVolumeRatio;
}
Expand Down

0 comments on commit 58d7940

Please sign in to comment.