Skip to content

Commit 394972a

Browse files
committed
Distributed power: remove wrong Flow field and correct wrong load field, by mbm_OR
1 parent 3d3e37a commit 394972a

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,6 @@ public string GetDPDebugStatus()
918918
throttle += "???";
919919

920920
var status = new StringBuilder();
921-
922921
status.AppendFormat("{0}({1})\t", CarID, DPUnitID);
923922
status.AppendFormat("{0} {1}\t", GetStringAttribute.GetPrettyName(Direction), Flipped ? Simulator.Catalog.GetString("(flipped)") : "");
924923
status.AppendFormat("{0}\t", IsLeadLocomotive() || RemoteControlGroup < 0 ? "———" : RemoteControlGroup == 0 ? Simulator.Catalog.GetString("Sync") : Simulator.Catalog.GetString("Async"));
@@ -967,16 +966,25 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
967966
status.AppendFormat("{0}({1})\t", CarID, DPUnitID);
968967
// Throttle
969968
status.AppendFormat("{0}\t", throttle);
969+
970970
// Load
971-
foreach (var eng in DieselEngines.DEList)
972-
status.AppendFormat("{0:F1}%\t", eng.LoadPercent);
971+
var data = 0.0f;
972+
if (ThrottlePercent > 0)
973+
{
974+
if (FilteredMotiveForceN != 0)
975+
data = FilteredMotiveForceN / MaxForceN * MaxCurrentA;
976+
else
977+
data = LocomotiveAxle.DriveForceN / MaxForceN * MaxCurrentA;
978+
}
979+
status.AppendFormat("{0:F0} amps\t", Math.Abs(data));
980+
973981
// BP
974982
var brakeInfoValue = brakeValue(Simulator.Catalog.GetString("BP"), Simulator.Catalog.GetString("EOT"));
975983
status.AppendFormat("{0:F0}\t", brakeInfoValue);
976984

977-
// Flow
978-
foreach (var eng in DieselEngines.DEList)
979-
status.AppendFormat("{0}/{1}\t", FormatStrings.FormatFuelVolume(pS.TopH(eng.DieselFlowLps), Simulator.PlayerLocomotive.IsMetric, Simulator.PlayerLocomotive.IsUK), FormatStrings.h);
985+
// Flow.
986+
// TODO:The BP air flow that feeds the brake tube is not yet modeled in Open Rails.
987+
980988
// Remote
981989
if (dataDpu)
982990
{
@@ -1073,13 +1081,11 @@ private static void SetDPULabels(bool dpuFull, int numberOfEngines)
10731081
labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Throttle"));
10741082
labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Load"));
10751083
labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("BP"));
1076-
labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Flow"));
10771084
if (!dpuFull)
10781085
{
10791086
labels.AppendFormat("{0}", Simulator.Catalog.GetString("Remote"));
10801087
DpuLabels = labels.ToString().Split('\t');
10811088
}
1082-
10831089
if (dpuFull)
10841090
{
10851091
labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Remote"));

0 commit comments

Comments
 (0)