diff --git a/csharp/App/SaliMax/src/Topology.cs b/csharp/App/SaliMax/src/Topology.cs index a448941d3..5ff0660ff 100644 --- a/csharp/App/SaliMax/src/Topology.cs +++ b/csharp/App/SaliMax/src/Topology.cs @@ -72,7 +72,7 @@ public static class Topology var h = g; var i = status.PvOnDc?.Dc.Power.Value; var k = status.DcDc.Dc.Link.Power.Value; - var l = k; + var l = status.Battery is not null ? status.Battery.Dc.Power.Value : 0; var j = status.LoadOnDc?.Power.Value; var d = status.AcGridToAcIsland?.Power.Active; var c = status.LoadOnAcGrid?.Power.Active; @@ -396,9 +396,10 @@ public static class Topology var voltage = bat.Dc.Voltage.ToDisplayString(); var soc = bat.Devices.Any() ? bat.Devices.Average(b => b.Soc).Percent().ToDisplayString() : "0"; var current = bat.Dc.Current.ToDisplayString(); + var busCurrent = bat.Devices.Any() ? bat.Devices.Sum(b => b.BusCurrent).A().ToDisplayString() : "0"; var temp = bat.Temperature.ToDisplayString(); var heatingPower = bat.HeatingPower.ToDisplayString(); - var alarms = bat.Alarms.Count + " Alarms"; + var alarms = bat.Alarms.Count + " Alarms"; var warnings = bat.Warnings.Count + " Warnings"; var nBatteries = bat.Devices.Count; @@ -408,6 +409,7 @@ public static class Topology voltage, soc, current, + busCurrent, temp, heatingPower, warnings, @@ -447,7 +449,7 @@ public static class Topology battery.Soc.ToDisplayString(), battery.Dc.Current.ToDisplayString() + " C/D", battery.Temperatures.Cells.Average.ToDisplayString(), - battery.BusCurrent.ToDisplayString() + " T", + battery.BusCurrent.ToDisplayString() , batteryWarnings, batteryAlarms, battery.HeatingCurrent.ToDisplayString() + " H"