Merge pull request #512 from Sharpe49/fix-hill-start

cjakeman · web-flow · commit 883b49b52b77 · 2021-10-16T13:22:11.000+01:00
Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -1586,7 +1586,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 (Math.Abs(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
`@@ -1586,7 +1586,7 @@ protected void CorrectBrakingParams()`
`1586`	`1586`	`/// </summary>`
`1587`	`1587`	`public void DynamicBrakeBlending(float elapsedClockSeconds)`
`1588`	`1588`	`{`
`1589`		`- if (airPipeSystem != null && ((airPipeSystem is EPBrakeSystem && Train.BrakeLine4 > 0f) \|\| airPipeSystem.BrakeLine1PressurePSI < TrainBrakeController.MaxPressurePSI - 1f)`
	`1589`	`+ if (Math.Abs(SpeedMpS) > DynamicBrakeSpeed1MpS && airPipeSystem != null && ((airPipeSystem is EPBrakeSystem && Train.BrakeLine4 > 0f) \|\| airPipeSystem.BrakeLine1PressurePSI < TrainBrakeController.MaxPressurePSI - 1f)`
`1590`	`1590`	`&& ThrottleController.CurrentValue == 0f && !(DynamicBrakeController != null && DynamicBrakeBlendingOverride && DynamicBrakeController.CurrentValue > 0f)`
`1591`	`1591`	`/* && (!DynamicBrakeBlendingLeverOverride && DynamicBrakeController != null && DynamicBrakeIntervention < DynamicBrakeController.CurrentValue)*/)`
`1592`	`1592`	`{`