From 00f2e2f275100d6c6c3e53a735d857f4909e95fe Mon Sep 17 00:00:00 2001 From: atef Date: Mon, 29 Jul 2024 13:47:14 +0200 Subject: [PATCH] Moved The Dc link windows settings under the mode --- csharp/App/SaliMax/src/SystemConfig/Config.cs | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/csharp/App/SaliMax/src/SystemConfig/Config.cs b/csharp/App/SaliMax/src/SystemConfig/Config.cs index 9caa0ee00..f32c79072 100644 --- a/csharp/App/SaliMax/src/SystemConfig/Config.cs +++ b/csharp/App/SaliMax/src/SystemConfig/Config.cs @@ -16,7 +16,7 @@ public class Config //TODO: let IE choose from config files (Json) and connect t private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true }; public required Double MinSoc { get; set; } - public required Int16 CurtailP { get; set; } + public required UInt16 CurtailP { get; set; } public required CalibrationChargeType ForceCalibrationChargeState { get; set; } public required DateTime DayAndTimeForRepetitiveCalibration { get; set; } public required DateTime DayAndTimeForAdditionalCalibration { get; set; } @@ -28,13 +28,6 @@ public class Config //TODO: let IE choose from config files (Json) and connect t public required DevicesConfig IslandMode { get; set; } public required DevicesConfig GridTie { get; set; } - public required Double MaxBatteryChargingCurrent { get; set; } - public required Double MaxBatteryDischargingCurrent { get; set; } - public required Double MaxDcPower { get; set; } - - public required Double MaxChargeBatteryVoltage { get; set; } - public required Double MinDischargeBatteryVoltage { get; set; } - public required DeviceConfig Devices { get; set; } public required S3Config? S3 { get; set; } @@ -66,6 +59,13 @@ public class Config //TODO: let IE choose from config files (Json) and connect t UpperDcLinkVoltage = 50, LowerDcLinkVoltage = 50, ReferenceDcLinkVoltage = 750, + + MaxBatteryChargingCurrent = 210, + MaxBatteryDischargingCurrent = 210, + MaxDcPower = 10000, + + MaxChargeBatteryVoltage = 57, + MinDischargeBatteryVoltage = 0, }, }, @@ -83,6 +83,13 @@ public class Config //TODO: let IE choose from config files (Json) and connect t UpperDcLinkVoltage = 50, LowerDcLinkVoltage = 50, ReferenceDcLinkVoltage = 750, + + MaxBatteryChargingCurrent = 210, + MaxBatteryDischargingCurrent = 210, + MaxDcPower = 10000, + + MaxChargeBatteryVoltage = 57, + MinDischargeBatteryVoltage = 0, }, }, @@ -146,6 +153,13 @@ public class Config //TODO: let IE choose from config files (Json) and connect t UpperDcLinkVoltage = 50, LowerDcLinkVoltage = 50, ReferenceDcLinkVoltage = 750, + + MaxBatteryChargingCurrent = 210, + MaxBatteryDischargingCurrent = 210, + MaxDcPower = 10000, + + MaxChargeBatteryVoltage = 57, + MinDischargeBatteryVoltage = 0, }, }, @@ -163,16 +177,16 @@ public class Config //TODO: let IE choose from config files (Json) and connect t UpperDcLinkVoltage = 20, LowerDcLinkVoltage = 20, ReferenceDcLinkVoltage = 750, + + MaxBatteryChargingCurrent = 210, + MaxBatteryDischargingCurrent = 210, + MaxDcPower = 10000, + + MaxChargeBatteryVoltage = 57, + MinDischargeBatteryVoltage = 0, }, }, - - MaxBatteryChargingCurrent = 210, - MaxBatteryDischargingCurrent = 210, - MaxDcPower = 10000, - - MaxChargeBatteryVoltage = 57, - MinDischargeBatteryVoltage = 0, S3 = new() {