luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2016-01-12 update 1

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2016-01-12 15:29:35 +08:00
parent 2cbd5c1e4d
commit 3d67116006
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modbus.Net/ModBus.Net/BaseProtocal.cs
View File

@@ -60,7 +60,7 @@ namespace ModBus.Net
/// <returns></returns> /// <returns></returns>
public virtual byte[] SendReceive(params object[] content) public virtual byte[] SendReceive(params object[] content)
{ {
return ProtocalLinker.SendReceive(ProtocalUnit.TranslateContent(content)); return AsyncHelper.RunSync(() => SendReceiveAsync(content));
} }
/// <summary> /// <summary>
@@ -70,6 +70,10 @@ namespace ModBus.Net
/// <returns></returns> /// <returns></returns>
public virtual async Task<byte[]> SendReceiveAsync(params object[] content) public virtual async Task<byte[]> SendReceiveAsync(params object[] content)
{ {
if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
{
await ConnectAsync();
}
return await ProtocalLinker.SendReceiveAsync(ProtocalUnit.TranslateContent(content)); return await ProtocalLinker.SendReceiveAsync(ProtocalUnit.TranslateContent(content));
} }

4
Modbus.Net/ModBus.Net/Siemens/SiemensTcpProtocal.cs
View File

@@ -37,7 +37,7 @@ namespace ModBus.Net.Siemens
public override async Task<byte[]> SendReceiveAsync(params object[] content) public override async Task<byte[]> SendReceiveAsync(params object[] content)
{ {
while (!ProtocalLinker.IsConnected) if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
{ {
await ConnectAsync(); await ConnectAsync();
} }
@@ -51,7 +51,7 @@ namespace ModBus.Net.Siemens
public override async Task<OutputStruct> SendReceiveAsync(ProtocalUnit unit, InputStruct content) public override async Task<OutputStruct> SendReceiveAsync(ProtocalUnit unit, InputStruct content)
{ {
if (!ProtocalLinker.IsConnected) if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
{ {
if (connectTryCount > 10) return null; if (connectTryCount > 10) return null;
return await await ConnectAsync().ContinueWith(answer => answer.Result ? base.SendReceiveAsync(unit, content) : null); return await await ConnectAsync().ContinueWith(answer => answer.Result ? base.SendReceiveAsync(unit, content) : null);