diff --git a/csharp/App/GrowattCommunication/DataTypes/Configuration.cs b/csharp/App/GrowattCommunication/DataTypes/Configuration.cs index ff9727969..ebda4ee93 100644 --- a/csharp/App/GrowattCommunication/DataTypes/Configuration.cs +++ b/csharp/App/GrowattCommunication/DataTypes/Configuration.cs @@ -1,6 +1,5 @@ using InnovEnergy.App.GrowattCommunication.ESS; -using InnovEnergy.App.GrowattCommunication.SystemConfig; namespace InnovEnergy.App.GrowattCommunication.DataTypes; @@ -11,5 +10,7 @@ public class Configuration public Double MaximumDischargingCurrent { get; set; } public Double MaximumChargingCurrent { get; set; } public EssMode OperatingPriority { get; set; } + public required Int16 BatteriesCount { get; set; } + } diff --git a/csharp/App/GrowattCommunication/SystemConfig/Config.cs b/csharp/App/GrowattCommunication/SystemConfig/Config.cs index f1891d140..cbb05ae9c 100644 --- a/csharp/App/GrowattCommunication/SystemConfig/Config.cs +++ b/csharp/App/GrowattCommunication/SystemConfig/Config.cs @@ -6,6 +6,7 @@ using static System.Text.Json.JsonSerializer; namespace InnovEnergy.App.GrowattCommunication.SystemConfig; +[SuppressMessage("Trimming", "IL2026:Members annotated with \'RequiresUnreferencedCodeAttribute\' require dynamic access otherwise can break functionality when trimming application code")] public class Config //TODO: let IE choose from config files (Json) and connect to GUI { private static String DefaultConfigFilePath => Path.Combine(Environment.CurrentDirectory, "config.json"); @@ -18,6 +19,8 @@ public class Config //TODO: let IE choose from config files (Json) and connect t public required Double MaximumDischargingCurrent { get; set; } public required Double MaximumChargingCurrent { get; set; } public required EssMode OperatingPriority { get; set; } + public required Int16 BatteriesCount { get; set; } + public required Double ModbusProtcolNumber { get; set; } public required S3Config? S3 { get; set; } @@ -31,6 +34,8 @@ public class Config //TODO: let IE choose from config files (Json) and connect t MaximumChargingCurrent = 180, MaximumDischargingCurrent = 180, OperatingPriority = EssMode.LoadPriority, + BatteriesCount = 0, + ModbusProtcolNumber = 1.2, S3 = new() { Bucket = "1-3e5b3069-214a-43ee-8d85-57d72000c19d",