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

2015-07-10 update 2

Browse Source
This commit is contained in:
parallelbgls
2015-07-10 14:03:54 +08:00
parent c72622674a
commit 95a42af267
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modbus.Net/ModBus.Net/ComConnector.cs
View File

@@ -15,7 +15,7 @@ namespace ModBus.Net
public delegate byte[] GetDate(byte[] bts); public delegate byte[] GetDate(byte[] bts);
private GetDate mygetDate; //private GetDate mygetDate;
private readonly string _com; private readonly string _com;
public ComConnector(string com, int timeoutTime) public ComConnector(string com, int timeoutTime)
@@ -249,7 +249,6 @@ namespace ModBus.Net
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception(ex.Message); throw new Exception(ex.Message);
break;
} }
} }
ReadBuf[nBytelen] = 0x00; ReadBuf[nBytelen] = 0x00;

2
Modbus.Net/ModBus.Net/TaskManager.cs
View File

@@ -349,7 +349,7 @@ namespace ModBus.Net
ReturnValues(new KeyValuePair<int, Dictionary<string,ReturnUnit>>(machine.Id, ans)); ReturnValues(new KeyValuePair<int, Dictionary<string,ReturnUnit>>(machine.Id, ans));
} }
} }
catch (Exception e) catch (Exception)
{ {
if (ReturnValues != null) if (ReturnValues != null)

11
Modbus.Net/ModBus.Net/TcpConnector.cs
View File

@@ -32,7 +32,6 @@ namespace ModBus.Net
private int _sendCount; private int _sendCount;
private int _receiveCount; private int _receiveCount;
private int _errorCount; private int _errorCount;
private NetworkStream _stream;
// 2MB 的接收缓冲区，目的是一次接收完服务器发回的消息 // 2MB 的接收缓冲区，目的是一次接收完服务器发回的消息
private readonly byte[] _receiveBuffer = new byte[1024]; private readonly byte[] _receiveBuffer = new byte[1024];
@@ -89,7 +88,7 @@ namespace ModBus.Net
{ {
_timeoutObject.Reset(); _timeoutObject.Reset();
_socketClient = new TcpClient(); _socketClient = new TcpClient();
_socketClient.BeginConnect(_host, _port, new AsyncCallback(CallBackMethod), _socketClient); _socketClient.BeginConnect(_host, _port, CallBackMethod, _socketClient);
if (_timeoutObject.WaitOne(TimeoutTime, false)) if (_timeoutObject.WaitOne(TimeoutTime, false))
{ {
if (_isConnectionSuccessful) if (_isConnectionSuccessful)
@@ -222,8 +221,9 @@ namespace ModBus.Net
{ {
await ConnectAsync(); await ConnectAsync();
} }
await _stream.WriteAsync(datagram, 0, datagram.Length); var stream = _socketClient.GetStream();
await stream.WriteAsync(datagram, 0, datagram.Length);
RefreshSendCount(); RefreshSendCount();
//this.AddInfo("send text len = " + datagramText.Length.ToString()); //this.AddInfo("send text len = " + datagramText.Length.ToString());
@@ -333,7 +333,8 @@ namespace ModBus.Net
{ {
try try
{ {
_stream.Close(); var stream = _socketClient.GetStream();
stream.Close();
_socketClient.Client.Shutdown(SocketShutdown.Both); _socketClient.Client.Shutdown(SocketShutdown.Both);
_socketClient.Client.Close(); _socketClient.Client.Close();
} }