Automatic merge of T1.4-68-g723f722c7 and 7 pull requests

openrails-bot · openrails-bot · commit 3ab29e1b4c8a · 2021-11-29T06:51:25.000Z
- Pull request #510 at ca2494d: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #525 at b5ac1d2: Add SignalTypeName and DrawStateName to SignalFeatures - Pull request #527 at 95b52ab: Brake cuts power refactor and new parameters - Pull request #531 at b2affac: Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab - Pull request #533 at 62a1c27: fix for shapes hidden by animations( 0 ) - Pull request #534 at ba3f85a: deletes RunActivityLAA.* post-build - Pull request #538 at c457f11: Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
@@ -1046,8 +1046,8 @@ public void Update(float elapsedClockSeconds)
                         // During a manual gear change brake engine shaft speed to match wheel shaft speed
                         DemandedRPM = IdleRPM;
 
-                        // once engine speed is less then shaft speed reset gear change
-                        if (RealRPM <= GearBox.ShaftRPM && GearBox.ShaftRPM < MaxRPM)
+                        // once engine speed is less then shaft speed reset gear change, or is at idle rpm, reset gear change
+                        if ((RealRPM <= GearBox.ShaftRPM && GearBox.ShaftRPM < MaxRPM) || RealRPM == IdleRPM)
                         {
                             GearBox.ManualGearChange = false;
                             GearBox.ManualGearBoxChangeOn = false;
@@ -1090,7 +1090,7 @@ public void Update(float elapsedClockSeconds)
                         DemandedRPM = IdleRPM;
 
                         // once engine speed is less then shaft speed reset gear change
-                        if (RealRPM <= GearBox.ShaftRPM)
+                        if (RealRPM <= GearBox.ShaftRPM || RealRPM == IdleRPM)
                         {
                             GearBox.ManualGearChange = false;
                         }

Original file line number	Diff line number	Diff line change
`@@ -1046,8 +1046,8 @@ public void Update(float elapsedClockSeconds)`
`1046`	`1046`	`// During a manual gear change brake engine shaft speed to match wheel shaft speed`
`1047`	`1047`	`DemandedRPM = IdleRPM;`
`1048`	`1048`
`1049`		`- // once engine speed is less then shaft speed reset gear change`
`1050`		`- if (RealRPM <= GearBox.ShaftRPM && GearBox.ShaftRPM < MaxRPM)`
	`1049`	`+ // once engine speed is less then shaft speed reset gear change, or is at idle rpm, reset gear change`
	`1050`	`+ if ((RealRPM <= GearBox.ShaftRPM && GearBox.ShaftRPM < MaxRPM) \|\| RealRPM == IdleRPM)`
`1051`	`1051`	`{`
`1052`	`1052`	`GearBox.ManualGearChange = false;`
`1053`	`1053`	`GearBox.ManualGearBoxChangeOn = false;`
`@@ -1090,7 +1090,7 @@ public void Update(float elapsedClockSeconds)`
`1090`	`1090`	`DemandedRPM = IdleRPM;`
`1091`	`1091`
`1092`	`1092`	`// once engine speed is less then shaft speed reset gear change`
`1093`		`- if (RealRPM <= GearBox.ShaftRPM)`
	`1093`	`+ if (RealRPM <= GearBox.ShaftRPM \|\| RealRPM == IdleRPM)`
`1094`	`1094`	`{`
`1095`	`1095`	`GearBox.ManualGearChange = false;`
`1096`	`1096`	`}`