Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled

Sharpe49 · Sharpe49 · commit 3aae640630c7 · 2021-10-03T08:04:19.000+02:00
(which blocks throttle during hill start) https://bugs.launchpad.net/or/+bug/1945886
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -1585,7 +1585,7 @@ protected void CorrectBrakingParams()
         /// </summary>
         public void DynamicBrakeBlending(float elapsedClockSeconds)
         {
-            if (airPipeSystem != null && ((airPipeSystem is EPBrakeSystem && Train.BrakeLine4 > 0f) || airPipeSystem.BrakeLine1PressurePSI < TrainBrakeController.MaxPressurePSI - 1f)
+            if (SpeedMpS > DynamicBrakeSpeed1MpS && airPipeSystem != null && ((airPipeSystem is EPBrakeSystem && Train.BrakeLine4 > 0f) || airPipeSystem.BrakeLine1PressurePSI < TrainBrakeController.MaxPressurePSI - 1f)
                 && ThrottleController.CurrentValue == 0f && !(DynamicBrakeController != null && DynamicBrakeBlendingOverride && DynamicBrakeController.CurrentValue > 0f)
                 /* && (!DynamicBrakeBlendingLeverOverride && DynamicBrakeController != null && DynamicBrakeIntervention < DynamicBrakeController.CurrentValue)*/)
             {

Original file line number	Diff line number	Diff line change
`@@ -1585,7 +1585,7 @@ protected void CorrectBrakingParams()`
`1585`	`1585`	`/// </summary>`
`1586`	`1586`	`public void DynamicBrakeBlending(float elapsedClockSeconds)`
`1587`	`1587`	`{`
`1588`		`- if (airPipeSystem != null && ((airPipeSystem is EPBrakeSystem && Train.BrakeLine4 > 0f) \|\| airPipeSystem.BrakeLine1PressurePSI < TrainBrakeController.MaxPressurePSI - 1f)`
	`1588`	`+ if (SpeedMpS > DynamicBrakeSpeed1MpS && airPipeSystem != null && ((airPipeSystem is EPBrakeSystem && Train.BrakeLine4 > 0f) \|\| airPipeSystem.BrakeLine1PressurePSI < TrainBrakeController.MaxPressurePSI - 1f)`
`1589`	`1589`	`&& ThrottleController.CurrentValue == 0f && !(DynamicBrakeController != null && DynamicBrakeBlendingOverride && DynamicBrakeController.CurrentValue > 0f)`
`1590`	`1590`	`/* && (!DynamicBrakeBlendingLeverOverride && DynamicBrakeController != null && DynamicBrakeIntervention < DynamicBrakeController.CurrentValue)*/)`
`1591`	`1591`	`{`