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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Noe 2024-02-07 13:54:23 +01:00
parent 34891e489d 95489c1409
commit 7668794943
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
csharp/App/SaliMax/src/AggregationService/Aggregator.cs
View File

@ -209,7 +209,6 @@ public static class Aggregator
var dSumGridImportPower = gridPowerImport.Any() ? gridPowerImport.Max()/1000 : 0.0; var dSumGridImportPower = gridPowerImport.Any() ? gridPowerImport.Max()/1000 : 0.0;
var dSumPvPower = pvPowerSum.Any() ? pvPowerSum.Max() : 0.0; var dSumPvPower = pvPowerSum.Any() ? pvPowerSum.Max() : 0.0;
Console.WriteLine("-------------------------------------------------------------------"+dSumPvPower);
AggregatedData aggregatedData = new AggregatedData AggregatedData aggregatedData = new AggregatedData
{ {

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

@ -106,7 +106,7 @@ public static class Controller
private static EssControl LimitDischargePower(this EssControl control, StatusRecord s) private static EssControl LimitDischargePower(this EssControl control, StatusRecord s)
{ {
var maxBatteryDischargeDelta = s.Battery?.Devices.Where(b => b.ConnectedToDcBus).Sum(b => b.MaxDischargePower) ?? 0; var maxBatteryDischargeDelta = s.Battery?.Devices.Where(b => b.IoStatus.ConnectedToDcBus).Sum(b => b.MaxDischargePower) ?? 0;
var keepMinSocLimitDelta = s.ControlBatteryPower(s.HoldMinSocPower()); var keepMinSocLimitDelta = s.ControlBatteryPower(s.HoldMinSocPower());
return control return control
@ -114,10 +114,6 @@ public static class Controller
.LimitDischargePower(keepMinSocLimitDelta , EssLimit.DischargeLimitedByMinSoc); .LimitDischargePower(keepMinSocLimitDelta , EssLimit.DischargeLimitedByMinSoc);
} }
private static Double ComputePowerDelta(this StatusRecord s, EssMode mode) private static Double ComputePowerDelta(this StatusRecord s, EssMode mode)
{ {
var chargePower = s.AcDc.Devices.Sum(d => d.Status.Nominal.Power.Value); var chargePower = s.AcDc.Devices.Sum(d => d.Status.Nominal.Power.Value);
@ -233,7 +229,7 @@ public static class Controller
private static Boolean CheckNextCalibrationTime(DateTime nextCalibrationTime) private static Boolean CheckNextCalibrationTime(DateTime nextCalibrationTime)
{ {
var currentDateAndTime = DateTime.Now; var currentDateAndTime = DateTime.Now;
Console.WriteLine(" next 10 am is: " + nextCalibrationTime); Console.WriteLine(" next 9 am is: " + nextCalibrationTime);
Console.WriteLine(" currentDateAndTime: " + currentDateAndTime); Console.WriteLine(" currentDateAndTime: " + currentDateAndTime);
// Check if the current time is greater than or equal to the original nextCalibrationTime // Check if the current time is greater than or equal to the original nextCalibrationTime
@ -250,7 +246,7 @@ public static class Controller
// Calculate the next 10 AM within the same day // Calculate the next 10 AM within the same day
var nextCalibrationTime = new DateTime(currentDateAndTime.Year, currentDateAndTime.Month, currentDateAndTime.Day, 9, 0, 0); // next 9am var nextCalibrationTime = new DateTime(currentDateAndTime.Year, currentDateAndTime.Month, currentDateAndTime.Day, 9, 0, 0); // next 9am
// If the current time is already past 10 AM, move to the next day // If the current time is already past 9 AM, move to the next day
if (currentDateAndTime.Hour >= 9) if (currentDateAndTime.Hour >= 9)
{ {
nextCalibrationTime = nextCalibrationTime.AddDays(1); nextCalibrationTime = nextCalibrationTime.AddDays(1);

2
csharp/App/SaliMax/src/Program.cs
View File

@ -464,7 +464,7 @@ internal static class Program
{ {
var numberOfBatteries = configFile.Devices.BatteryNodes.Length; var numberOfBatteries = configFile.Devices.BatteryNodes.Length;
var dischargingCurrentByBattery = configFile.MaxBatteryDischargingCurrent / numberOfBatteries; var dischargingCurrentByBattery = configFile.MaxBatteryDischargingCurrent / numberOfBatteries;
var numberOfConnectedBatteries = r.Battery.Devices.Where(d => d.ConnectedToDcBus).ToList().Count; var numberOfConnectedBatteries = r.Battery.Devices.Where(d => d.IoStatus.ConnectedToDcBus).ToList().Count;
maxBatteryDischargingCurrentLive = dischargingCurrentByBattery * numberOfConnectedBatteries; maxBatteryDischargingCurrentLive = dischargingCurrentByBattery * numberOfConnectedBatteries;
} }

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

@ -16,26 +16,21 @@ public partial class Battery48TlRecord
public Leds_ Leds => new Leds_(this); public Leds_ Leds => new Leds_(this);
public Temperatures_ Temperatures => new Temperatures_(this); public Temperatures_ Temperatures => new Temperatures_(this);
public StringActive_ BatteryStrings => new StringActive_(this); public StringActive_ BatteryStrings => new StringActive_(this);
public IoStatus_ IoStatus => new IoStatus_(this);
public Boolean ConnectedToDcBus => (_IoStates & 1) == 0;
public Boolean AlarmOutActive => (_IoStates & 2) == 0;
public Boolean InternalFanActive => (_IoStates & 4) == 1;
public Boolean VoltMeasurementAllowed => (_IoStates & 8) == 1;
public Boolean AuxRelayBus => (_IoStates & 16) == 0;
public Boolean RemoteStateActive => (_IoStates & 32) == 1;
public Boolean RiscActive => (_IoStates & 64) == 1;
public Boolean Eoc => Leds is { Green: On, Amber: Off, Blue : Off }; public Boolean Eoc => Leds is { Green: On, Amber: Off, Blue : Off };
public UInt16 IoStates => _IoStates; public UInt16 IoStates => _IoStates;
public String SerialNumber => $"{_SerialNum1:X4}{_SerialNum2:X4}{_SerialNum3:X4}{_SerialNum4:X4}".TrimEnd('0'); public String SerialNumber => $"{_SerialNum1:X4}{_SerialNum2:X4}{_SerialNum3:X4}{_SerialNum4:X4}".TrimEnd('0');
public String FwVersion => _FwVersion.ToString("X4");
public Strings Warnings => ParseWarnings().OrderBy(w => w).ToList();
public Strings Alarms => ParseAlarms() .OrderBy(w => w).ToList();
public String FwVersion => _FwVersion.ToString("X4"); public Percent Soc => _Soc;
public Strings Warnings => ParseWarnings().OrderBy(w => w).ToList(); public Double SOCAh => _SOCAh;
public Strings Alarms => ParseAlarms() .OrderBy(w => w).ToList();
public Percent Soc => _Soc;
public Double SOCAh => _SOCAh;
public Current BusCurrent => _BusCurrent; public Current BusCurrent => _BusCurrent;
//public UInt16 BusCurrentHex => _BusCurrentHex; //public UInt16 BusCurrentHex => _BusCurrentHex;
@ -75,6 +70,20 @@ public partial class Battery48TlRecord
private Battery48TlRecord Self { get; } private Battery48TlRecord Self { get; }
} }
public readonly struct IoStatus_
{
public Boolean ConnectedToDcBus => ((Self._IoStates >> 0) & 1) == 0;
public Boolean AlarmOutActive => ((Self._IoStates >> 1) & 1) == 0;
public Boolean InternalFanActive => ((Self._IoStates >> 2) & 1) == 1;
public Boolean VoltMeasurementAllowed => ((Self._IoStates >> 3) & 1) == 1;
public Boolean AuxRelayBus => ((Self._IoStates >> 4) & 1) == 0;
public Boolean RemoteStateActive => ((Self._IoStates >> 5) & 1) == 1;
public Boolean RiscActive => ((Self._IoStates >> 6) & 1) == 1;
internal IoStatus_(Battery48TlRecord self) => Self = self;
private Battery48TlRecord Self { get; }
}
public readonly struct Temperatures_ public readonly struct Temperatures_
{ {
public Boolean Heating => (Self._IoStates & 64) != 0; public Boolean Heating => (Self._IoStates & 64) != 0;