Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Change from falg to requested

This commit is contained in:
atef 2023-09-01 14:14:34 +02:00
parent 9bbccfd34b
commit 26422284dd
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/App/SaliMax/src/Ess/Controller.cs
View File

@ -209,7 +209,7 @@ public static class Controller
// no need to return false in case of EOC reached
// because the BMS will set the Time Since TOC to 0 as soon a battery reach EOC
// then Calibration Charge flag will be set false by the software
return statusRecord.Battery.CalibrationChargeFlag;
return statusRecord.Battery.CalibrationChargeRequested;
}

2
csharp/Lib/Devices/Battery48TL/Battery48TlRecord.Api.cs
View File

@ -36,7 +36,7 @@ public partial class Battery48TlRecord
public DcPower HeatingPower => HeatingCurrent * Dc.Voltage;
public Boolean CalibrationChargeFlag => TimeSinceTOC > OneWeekInMinutes;
public Boolean CalibrationChargeRequested => TimeSinceTOC > OneWeekInMinutes;
public readonly struct Leds_
{

22
csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs
View File

@ -15,7 +15,7 @@ public class Battery48TlRecords
public required Temperature Temperature { get; init; }
public required DcPower HeatingPower { get; init; }
public required UInt16 TimeSinceToc { get; init; }
public required Boolean CalibrationChargeFlag { get; init; }
public required Boolean CalibrationChargeRequested { get; init; }
public required IReadOnlyList<Battery48TlRecord> Devices { get; init; }
@ -26,16 +26,16 @@ public class Battery48TlRecords
return new Battery48TlRecords
{
Devices = records,
Eoc = records.All(r => r.Eoc),
Warnings = records.SelectMany(r => r.Warnings).Distinct().ToList(),
Alarms = records.SelectMany(r => r.Alarms).Distinct().ToList(),
Soc = records.Average(r => r.Soc.Value),
CurrentMinSoc = records.Min(r => r.Soc.Value),
Temperature = records.Average(b => b.Temperatures.Cells.Average.Value),
HeatingPower = records.Sum(b => b.HeatingPower),
TimeSinceToc = records.Max(r => r.TimeSinceTOC),
CalibrationChargeFlag = records.Any(r => r.CalibrationChargeFlag),
Devices = records,
Eoc = records.All(r => r.Eoc),
Warnings = records.SelectMany(r => r.Warnings).Distinct().ToList(),
Alarms = records.SelectMany(r => r.Alarms).Distinct().ToList(),
Soc = records.Average(r => r.Soc.Value),
CurrentMinSoc = records.Min(r => r.Soc.Value),
Temperature = records.Average(b => b.Temperatures.Cells.Average.Value),
HeatingPower = records.Sum(b => b.HeatingPower),
TimeSinceToc = records.Max(r => r.TimeSinceTOC),
CalibrationChargeRequested = records.Any(r => r.CalibrationChargeRequested),
Dc = new()
{