From 7fc5f80e8c18cb4327e0be95439a7e17ca22b49f Mon Sep 17 00:00:00 2001 From: ig Date: Fri, 1 Sep 2023 11:12:23 +0200 Subject: [PATCH] make BatteryStatus nullable --- csharp/App/SaliMax/src/Ess/StatusRecord.cs | 2 +- csharp/App/SaliMax/src/Program.cs | 20 +++++-------------- .../StatusApi/Connections/IPvConnection.cs | 4 ++-- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/csharp/App/SaliMax/src/Ess/StatusRecord.cs b/csharp/App/SaliMax/src/Ess/StatusRecord.cs index 162242816..fde5998e1 100644 --- a/csharp/App/SaliMax/src/Ess/StatusRecord.cs +++ b/csharp/App/SaliMax/src/Ess/StatusRecord.cs @@ -14,7 +14,7 @@ public record StatusRecord { public required AcDcDevicesRecord AcDc { get; init; } public required DcDcDevicesRecord DcDc { get; init; } - public required Battery48TlRecords Battery { get; init; } + public required Battery48TlRecords? Battery { get; init; } public required EmuMeterRegisters? GridMeter { get; init; } public required EmuMeterRegisters? LoadOnAcIsland { get; init; } public required AcPowerDevice? LoadOnAcGrid { get; init; } diff --git a/csharp/App/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs index e80c13b0c..d095dad19 100644 --- a/csharp/App/SaliMax/src/Program.cs +++ b/csharp/App/SaliMax/src/Program.cs @@ -18,11 +18,8 @@ using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc.Control; using InnovEnergy.Lib.Protocols.Modbus.Channels; using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Units; -using InnovEnergy.Lib.Units.Power; using InnovEnergy.Lib.Utils; using static InnovEnergy.Lib.Devices.Trumpf.SystemControl.DataTypes.SystemConfig; -using AcPower = InnovEnergy.Lib.Units.Composite.AcPower; -using Exception = System.Exception; #pragma warning disable IL2026 @@ -75,6 +72,7 @@ internal static class Program e.LogError(); } } + // ReSharper disable once FunctionNeverReturns } private static async Task Run() @@ -115,9 +113,9 @@ internal static class Program return new StatusRecord { - AcDc = acDc , - DcDc = dcDc , - Battery = battery , + AcDc = acDc, + DcDc = dcDc, + Battery = battery, Relays = relays, GridMeter = gridMeter, @@ -171,6 +169,7 @@ internal static class Program { Watchdog.NotifyAlive(); + var t = UnixTime.Now; var record = ReadStatus(); int i = 1; @@ -218,15 +217,6 @@ internal static class Program // ReSharper disable once FunctionNeverReturns } - - - private static async Task ResultOrNull(this Task task) - { - if (task.Status == TaskStatus.RanToCompletion) - return await task; - - return default; - } private static void ControlConstants(this StatusRecord r) { diff --git a/csharp/Lib/StatusApi/Connections/IPvConnection.cs b/csharp/Lib/StatusApi/Connections/IPvConnection.cs index 29a2d666e..7ff10a4f4 100644 --- a/csharp/Lib/StatusApi/Connections/IPvConnection.cs +++ b/csharp/Lib/StatusApi/Connections/IPvConnection.cs @@ -4,10 +4,10 @@ namespace InnovEnergy.Lib.StatusApi.Connections; public interface IPvConnection { - IReadOnlyList Strings { get; } + IReadOnlyList Strings { get; } } public interface IPvConnection where T : IReadOnlyList { T Strings { get; } -} \ No newline at end of file +} \ No newline at end of file