Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

make BatteryStatus nullable

This commit is contained in:
ig 2023-09-01 11:12:23 +02:00
parent 851b936217
commit 7fc5f80e8c
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/App/SaliMax/src/Ess/StatusRecord.cs
View File

@ -14,7 +14,7 @@ public record StatusRecord
{ {
public required AcDcDevicesRecord AcDc { get; init; } public required AcDcDevicesRecord AcDc { get; init; }
public required DcDcDevicesRecord DcDc { 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? GridMeter { get; init; }
public required EmuMeterRegisters? LoadOnAcIsland { get; init; } public required EmuMeterRegisters? LoadOnAcIsland { get; init; }
public required AcPowerDevice? LoadOnAcGrid { get; init; } public required AcPowerDevice? LoadOnAcGrid { get; init; }

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

@ -18,11 +18,8 @@ using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc.Control;
using InnovEnergy.Lib.Protocols.Modbus.Channels; using InnovEnergy.Lib.Protocols.Modbus.Channels;
using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Time.Unix;
using InnovEnergy.Lib.Units; using InnovEnergy.Lib.Units;
using InnovEnergy.Lib.Units.Power;
using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Utils;
using static InnovEnergy.Lib.Devices.Trumpf.SystemControl.DataTypes.SystemConfig; using static InnovEnergy.Lib.Devices.Trumpf.SystemControl.DataTypes.SystemConfig;
using AcPower = InnovEnergy.Lib.Units.Composite.AcPower;
using Exception = System.Exception;
#pragma warning disable IL2026 #pragma warning disable IL2026
@ -75,6 +72,7 @@ internal static class Program
e.LogError(); e.LogError();
} }
} }
// ReSharper disable once FunctionNeverReturns
} }
private static async Task Run() private static async Task Run()
@ -115,9 +113,9 @@ internal static class Program
return new StatusRecord return new StatusRecord
{ {
AcDc = acDc , AcDc = acDc,
DcDc = dcDc , DcDc = dcDc,
Battery = battery , Battery = battery,
Relays = relays, Relays = relays,
GridMeter = gridMeter, GridMeter = gridMeter,
@ -171,6 +169,7 @@ internal static class Program
{ {
Watchdog.NotifyAlive(); Watchdog.NotifyAlive();
var t = UnixTime.Now;
var record = ReadStatus(); var record = ReadStatus();
int i = 1; int i = 1;
@ -218,15 +217,6 @@ internal static class Program
// ReSharper disable once FunctionNeverReturns // ReSharper disable once FunctionNeverReturns
} }
private static async Task<T?> ResultOrNull<T>(this Task<T> task)
{
if (task.Status == TaskStatus.RanToCompletion)
return await task;
return default;
}
private static void ControlConstants(this StatusRecord r) private static void ControlConstants(this StatusRecord r)
{ {

4
csharp/Lib/StatusApi/Connections/IPvConnection.cs
View File

@ -4,10 +4,10 @@ namespace InnovEnergy.Lib.StatusApi.Connections;
public interface IPvConnection public interface IPvConnection
{ {
IReadOnlyList<DcBus> Strings { get; } IReadOnlyList<DcBus> Strings { get; }
} }
public interface IPvConnection<out T> where T : IReadOnlyList<DcBus> public interface IPvConnection<out T> where T : IReadOnlyList<DcBus>
{ {
T Strings { get; } T Strings { get; }
} }