Merge pull request #579 from mbm-OR/bugfix/Fix-DPU-Load-values-burst

mbm-OR · web-flow · commit 4b00b105798d · 2022-02-07T14:38:57.000+01:00
Fix for https://bugs.launchpad.net/or/+bug/1959336.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
@@ -982,11 +982,11 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
             switch (loadUnits)
             {
                 case CABViewControlUnits.AMPS:
-                    if (ThrottlePercent > 0)
+                    if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)
                     {
                         data = (data / MaxForceN) * MaxCurrentA;
                     }
-                    if (DynamicBrakePercent > 0)
+                    if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)
                     {
                         data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
                     }

Original file line number	Diff line number	Diff line change
`@@ -982,11 +982,11 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView`
`982`	`982`	`switch (loadUnits)`
`983`	`983`	`{`
`984`	`984`	`case CABViewControlUnits.AMPS:`
`985`		`- if (ThrottlePercent > 0)`
	`985`	`+ if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)`
`986`	`986`	`{`
`987`	`987`	`data = (data / MaxForceN) * MaxCurrentA;`
`988`	`988`	`}`
`989`		`- if (DynamicBrakePercent > 0)`
	`989`	`+ if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)`
`990`	`990`	`{`
`991`	`991`	`data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;`
`992`	`992`	`}`