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:
Kim 2023-09-08 09:46:00 +02:00
parent 50e01e6c8c 93539bee0e
commit 7da9389358
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,8 @@ internal static class Program
dcDevices.ForEach(d => d.Control.CurrentControl.MaxBatteryChargingCurrent = configFile.MaxBatteryChargingCurrent); dcDevices.ForEach(d => d.Control.CurrentControl.MaxBatteryChargingCurrent = configFile.MaxBatteryChargingCurrent);
dcDevices.ForEach(d => d.Control.CurrentControl.MaxBatteryDischargingCurrent = configFile.MaxBatteryDischargingCurrent); dcDevices.ForEach(d => d.Control.CurrentControl.MaxBatteryDischargingCurrent = configFile.MaxBatteryDischargingCurrent);
dcDevices.ForEach(d => d.Control.MaxDcPower = configFile.MaxDcPower);
dcDevices.ForEach(d => d.Control.VoltageLimits.MaxBatteryVoltage = configFile.MaxChargeBatteryVoltage); dcDevices.ForEach(d => d.Control.VoltageLimits.MaxBatteryVoltage = configFile.MaxChargeBatteryVoltage);
dcDevices.ForEach(d => d.Control.VoltageLimits.MinBatteryVoltage = configFile.MinDischargeBatteryVoltage); dcDevices.ForEach(d => d.Control.VoltageLimits.MinBatteryVoltage = configFile.MinDischargeBatteryVoltage);
dcDevices.ForEach(d => d.Control.ControlMode = DcControlMode.VoltageDroop); dcDevices.ForEach(d => d.Control.ControlMode = DcControlMode.VoltageDroop);

15
csharp/App/SaliMax/src/SystemConfig/Config.cs
View File

@ -22,8 +22,11 @@ public class Config //TODO: let IE choose from config files (Json) and connect t
public required Double HoldSocZone { get; set; } public required Double HoldSocZone { get; set; }
public required DevicesConfig IslandMode { get; set; } public required DevicesConfig IslandMode { get; set; }
public required DevicesConfig GridTie { get; set; } public required DevicesConfig GridTie { get; set; }
public required Double MaxBatteryChargingCurrent { get; set; } public required Double MaxBatteryChargingCurrent { get; set; }
public required Double MaxBatteryDischargingCurrent { get; set; } public required Double MaxBatteryDischargingCurrent { get; set; }
public required Double MaxDcPower { get; set; }
public required Double MaxChargeBatteryVoltage { get; set; } public required Double MaxChargeBatteryVoltage { get; set; }
public required Double MinDischargeBatteryVoltage { get; set; } public required Double MinDischargeBatteryVoltage { get; set; }
@ -76,10 +79,12 @@ public class Config //TODO: let IE choose from config files (Json) and connect t
}, },
}, },
MaxBatteryChargingCurrent = 210, MaxBatteryChargingCurrent = 210,
MaxBatteryDischargingCurrent = 210, MaxBatteryDischargingCurrent = 210,
MaxChargeBatteryVoltage = 57, MaxDcPower = 10000,
MinDischargeBatteryVoltage = 0,
MaxChargeBatteryVoltage = 57,
MinDischargeBatteryVoltage = 0,
Devices = new () Devices = new ()
{ {
TruConvertAcIp = new() { Host = "localhost", Port = 5001}, TruConvertAcIp = new() { Host = "localhost", Port = 5001},
@ -139,6 +144,8 @@ public class Config //TODO: let IE choose from config files (Json) and connect t
MaxBatteryChargingCurrent = 210, MaxBatteryChargingCurrent = 210,
MaxBatteryDischargingCurrent = 210, MaxBatteryDischargingCurrent = 210,
MaxDcPower = 10000,
MaxChargeBatteryVoltage = 57, MaxChargeBatteryVoltage = 57,
MinDischargeBatteryVoltage = 0, MinDischargeBatteryVoltage = 0,
S3 = new() S3 = new()