From a4e368308200fb56cd46e901384bc987d3563481 Mon Sep 17 00:00:00 2001 From: Noe Date: Tue, 19 Mar 2024 13:12:47 +0100 Subject: [PATCH] Update Configuration from frontend --- csharp/App/Backend/DataTypes/Configuration.cs | 2 +- csharp/App/SaliMax/src/DataTypes/Configuration.cs | 2 +- csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs | 2 +- csharp/App/SaliMax/src/Program.cs | 6 +++--- .../App/SaliMax/src/SystemConfig/CalibrationChargeType.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/csharp/App/Backend/DataTypes/Configuration.cs b/csharp/App/Backend/DataTypes/Configuration.cs index c289f9562..7bd6a830c 100644 --- a/csharp/App/Backend/DataTypes/Configuration.cs +++ b/csharp/App/Backend/DataTypes/Configuration.cs @@ -4,7 +4,7 @@ public class Configuration { public Double MinimumSoC { get; set; } public Double GridSetPoint { get; set; } - public CalibrationChargeType ForceCalibrationCharge { get; set; } + public CalibrationChargeType CalibrationChargeState { get; set; } public DateTime CalibrationChargeDate { get; set; } } diff --git a/csharp/App/SaliMax/src/DataTypes/Configuration.cs b/csharp/App/SaliMax/src/DataTypes/Configuration.cs index 43146a0bb..f1f81bb95 100644 --- a/csharp/App/SaliMax/src/DataTypes/Configuration.cs +++ b/csharp/App/SaliMax/src/DataTypes/Configuration.cs @@ -6,7 +6,7 @@ public class Configuration { public Double MinimumSoC { get; set; } public Double GridSetPoint { get; set; } - public CalibrationChargeType ForceCalibrationChargeState { get; set; } + public CalibrationChargeType CalibrationChargeState { get; set; } public DateTime CalibrationChargeDate { get; set; } } diff --git a/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs b/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs index b79d9c28e..0d57a9c42 100644 --- a/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs +++ b/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs @@ -64,7 +64,7 @@ public static class MiddlewareAgent Configuration? config = JsonSerializer.Deserialize(message); - Console.WriteLine($"Received a configuration message: GridSetPoint is " + config.GridSetPoint + ", MinimumSoC is " + config.MinimumSoC + " and ForceCalibrationCharge is " + config.ForceCalibrationChargeState+ " and CalibrationChargeDate is " + config.CalibrationChargeDate); + Console.WriteLine($"Received a configuration message: GridSetPoint is " + config.GridSetPoint + ", MinimumSoC is " + config.MinimumSoC + " and ForceCalibrationCharge is " + config.CalibrationChargeState+ " and CalibrationChargeDate is " + config.CalibrationChargeDate); // Send the reply to the sender's endpoint UdpListener.Send(replyData, replyData.Length, serverEndpoint); diff --git a/csharp/App/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs index c004a34e6..463051a69 100644 --- a/csharp/App/SaliMax/src/Program.cs +++ b/csharp/App/SaliMax/src/Program.cs @@ -690,13 +690,13 @@ internal static class Program { status.Config.MinSoc = config.MinimumSoC; status.Config.GridSetPoint = config.GridSetPoint * 1000; // converted from kW to W - status.Config.ForceCalibrationChargeState = config.ForceCalibrationChargeState; + status.Config.ForceCalibrationChargeState = config.CalibrationChargeState; - if (config.ForceCalibrationChargeState == CalibrationChargeType.RepetitivelyEvery) + if (config.CalibrationChargeState == CalibrationChargeType.RepetitivelyEvery) { status.Config.DayAndTimeForRepetitiveCalibration = config.CalibrationChargeDate; } - else if (config.ForceCalibrationChargeState == CalibrationChargeType.AdditionallyOnce) + else if (config.CalibrationChargeState == CalibrationChargeType.AdditionallyOnce) { status.Config.DayAndTimeForAdditionalCalibration = config.CalibrationChargeDate; } diff --git a/csharp/App/SaliMax/src/SystemConfig/CalibrationChargeType.cs b/csharp/App/SaliMax/src/SystemConfig/CalibrationChargeType.cs index 01a0b4b3e..91cc45ff3 100644 --- a/csharp/App/SaliMax/src/SystemConfig/CalibrationChargeType.cs +++ b/csharp/App/SaliMax/src/SystemConfig/CalibrationChargeType.cs @@ -5,4 +5,4 @@ public enum CalibrationChargeType RepetitivelyEvery, AdditionallyOnce, ChargePermanently -} \ No newline at end of file +}