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

if a battery is not reachable, Battery48TlDevices now does not give up and reports the remaining ones instead

This commit is contained in:
ig 2023-08-30 14:50:04 +02:00
parent 28d46d6689
commit 8596fddb04
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/Lib/Devices/Battery48TL/Battery48TLDevice.cs
View File

@ -14,6 +14,7 @@ public class Battery48TlDevice : ModbusDevice<Battery48TlRecord>
public const Int32 BaudRate = 115200;
public const Int32 DataBits = 8;
public Byte SlaveId { get; }
public Battery48TlDevice(String tty, Byte slaveId, SshHost host) : this
(
@ -41,6 +42,7 @@ public class Battery48TlDevice : ModbusDevice<Battery48TlRecord>
public Battery48TlDevice(ModbusClient client): base(client)
{
SlaveId = client.SlaveId;
}
}

18
csharp/Lib/Devices/Battery48TL/Battery48TlDevices.cs
View File

@ -13,7 +13,8 @@ public class Battery48TlDevices
try
{
var records = _Devices
.Select(d => d.Read())
.Select(TryRead)
.NotNull()
.ToArray(_Devices.Count);
return new Battery48TlRecords(records);
@ -26,4 +27,19 @@ public class Battery48TlDevices
return Battery48TlRecords.Null;
}
}
private static Battery48TlRecord? TryRead(Battery48TlDevice d)
{
try
{
return d.Read();
}
catch (Exception e)
{
Console.WriteLine($"Failed to read Battery node {d.SlaveId}\n{e.Message}");
// TODO: log
return null;
}
}
}

3
csharp/Lib/Protocols/Modbus/Clients/ModbusClient.cs
View File

@ -11,8 +11,9 @@ using UInt16s = IReadOnlyCollection<UInt16>;
public abstract class ModbusClient
{
public Byte SlaveId { get; }
internal Channel Channel { get; }
internal Byte SlaveId { get; }
internal Endian Endian { get; }
// TODO: add additional functions: coils...