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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Kim 2023-03-09 13:20:46 +01:00
parent fd10522786 eb73beb1cd
commit a66d547291
2 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
csharp/Lib/Devices/AMPT/AmptCommunicationUnit.cs
View File

@ -27,30 +27,42 @@ public class AmptCommunicationUnit
{ {
try try
{ {
var modbus = OpenConnection(); OpenConnection();
return TryReadStatus(modbus); return TryReadStatus();
} }
catch catch
{ {
Modbus?.CloseConnection(); CloseConnection();
return null; return null;
} }
} }
private ModbusTcpClient OpenConnection() private void CloseConnection()
{
try
{
Modbus?.CloseConnection();
}
catch
{
// ignored
}
Modbus = null;
}
private void OpenConnection()
{ {
if (Modbus is null) if (Modbus is null)
{ {
var connection = new ModbusTcpConnection(Hostname, Port); var connection = new ModbusTcpConnection(Hostname, Port);
Modbus = new ModbusTcpClient(connection, SlaveAddress); Modbus = new ModbusTcpClient(connection, SlaveAddress);
} }
return Modbus;
} }
private static AmptCommunicationUnitStatus TryReadStatus(ModbusTcpClient modbus) private AmptCommunicationUnitStatus TryReadStatus()
{ {
var r = modbus.ReadHoldingRegisters(1, 116); var r = Modbus!.ReadHoldingRegisters(1, 116);
var currentFactor = Pow(10.0m, r.GetInt16(73)); var currentFactor = Pow(10.0m, r.GetInt16(73));
var voltageFactor = Pow(10.0m, r.GetInt16(74)); var voltageFactor = Pow(10.0m, r.GetInt16(74));

51
csharp/Lib/Devices/Adam6060/Adam6060Device.cs
View File

@ -7,31 +7,60 @@ namespace InnovEnergy.Lib.Devices.Adam6060;
public class Adam6060Device public class Adam6060Device
{ {
private ModbusTcpClient Modbus { get; } public String Hostname { get; }
public UInt16 Port { get; }
public Byte SlaveAddress { get; }
private ModbusTcpClient? Modbus { get; set; }
public Adam6060Device(String hostname, UInt16 port = 5004, Byte slaveAddress = 2) public Adam6060Device(String hostname, UInt16 port = 5004, Byte slaveAddress = 2)
{ {
var connection = new ModbusTcpConnection(hostname, port); Hostname = hostname;
Modbus = new ModbusTcpClient(connection, slaveAddress); Port = port;
SlaveAddress = slaveAddress;
}
private void OpenConnection()
{
if (Modbus is null)
{
var connection = new ModbusTcpConnection(Hostname, Port);
Modbus = new ModbusTcpClient(connection, SlaveAddress);
}
} }
public Adam6060Status? ReadStatus() public Adam6060Status? ReadStatus()
{ {
try try
{ {
OpenConnection();
return TryReadStatus(); return TryReadStatus();
} }
catch (Exception) catch
{ {
Modbus.CloseConnection(); CloseConnection();
return null; return null;
} }
} }
private void CloseConnection()
{
try
{
Modbus?.CloseConnection();
}
catch
{
// ignored
}
Modbus = null;
}
private Adam6060Status TryReadStatus() private Adam6060Status TryReadStatus()
{ {
var inputs = Modbus.ReadDiscreteInputs(DigitalInputsStartRegister, NbDigitalInputs); var inputs = Modbus!.ReadDiscreteInputs(DigitalInputsStartRegister, NbDigitalInputs);
var relays = Modbus.ReadDiscreteInputs(RelaysStartRegister, NbRelays); var relays = Modbus!.ReadDiscreteInputs(RelaysStartRegister, NbRelays);
return new Adam6060Status return new Adam6060Status
{ {
@ -55,7 +84,9 @@ public class Adam6060Device
{ {
try try
{ {
Modbus.WriteMultipleCoils(RelaysStartRegister, control.Relay0, OpenConnection();
Modbus!.WriteMultipleCoils(RelaysStartRegister, control.Relay0,
control.Relay1, control.Relay1,
control.Relay2, control.Relay2,
control.Relay3, control.Relay3,
@ -63,9 +94,9 @@ public class Adam6060Device
control.Relay5); control.Relay5);
return true; return true;
} }
catch (Exception) catch
{ {
Modbus.CloseConnection(); CloseConnection();
return false; return false;
} }
} }