@@ -918,7 +918,6 @@ public string GetDPDebugStatus()
918
918
throttle += "???" ;
919
919
920
920
var status = new StringBuilder ( ) ;
921
-
922
921
status . AppendFormat ( "{0}({1})\t " , CarID , DPUnitID ) ;
923
922
status . AppendFormat ( "{0} {1}\t " , GetStringAttribute . GetPrettyName ( Direction ) , Flipped ? Simulator . Catalog . GetString ( "(flipped)" ) : "" ) ;
924
923
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
967
966
status . AppendFormat ( "{0}({1})\t " , CarID , DPUnitID ) ;
968
967
// Throttle
969
968
status . AppendFormat ( "{0}\t " , throttle ) ;
969
+
970
970
// 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
+
973
981
// BP
974
982
var brakeInfoValue = brakeValue ( Simulator . Catalog . GetString ( "BP" ) , Simulator . Catalog . GetString ( "EOT" ) ) ;
975
983
status . AppendFormat ( "{0:F0}\t " , brakeInfoValue ) ;
976
984
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
+
980
988
// Remote
981
989
if ( dataDpu )
982
990
{
@@ -1073,13 +1081,11 @@ private static void SetDPULabels(bool dpuFull, int numberOfEngines)
1073
1081
labels . AppendFormat ( "{0}\t " , Simulator . Catalog . GetString ( "Throttle" ) ) ;
1074
1082
labels . AppendFormat ( "{0}\t " , Simulator . Catalog . GetString ( "Load" ) ) ;
1075
1083
labels . AppendFormat ( "{0}\t " , Simulator . Catalog . GetString ( "BP" ) ) ;
1076
- labels . AppendFormat ( "{0}\t " , Simulator . Catalog . GetString ( "Flow" ) ) ;
1077
1084
if ( ! dpuFull )
1078
1085
{
1079
1086
labels . AppendFormat ( "{0}" , Simulator . Catalog . GetString ( "Remote" ) ) ;
1080
1087
DpuLabels = labels . ToString ( ) . Split ( '\t ' ) ;
1081
1088
}
1082
-
1083
1089
if ( dpuFull )
1084
1090
{
1085
1091
labels . AppendFormat ( "{0}\t " , Simulator . Catalog . GetString ( "Remote" ) ) ;
0 commit comments