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

Fix

Browse Source
This commit is contained in:
parallelbgls
2017-12-27 18:45:42 +08:00
parent 61284758e6
commit f1b476ab95
9 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modbus.Net/Modbus.Net.Modbus/ModbusAsciiInTcpProtocolLinker.cs
View File

@@ -25,7 +25,7 @@ namespace Modbus.Net.Modbus
public ModbusAsciiInTcpProtocolLinker(string ip, int port) public ModbusAsciiInTcpProtocolLinker(string ip, int port)
: base(ip, port) : base(ip, port)
{ {
((BaseConnector)BaseConnector).AddController(new FifoController(500)); ((BaseConnector)BaseConnector).AddController(new FifoController(0));
} }
/// <summary> /// <summary>

2
Modbus.Net/Modbus.Net.Modbus/ModbusAsciiProtocolLinker.cs
View File

@@ -17,7 +17,7 @@ namespace Modbus.Net.Modbus
public ModbusAsciiProtocolLinker(string com, int slaveAddress) public ModbusAsciiProtocolLinker(string com, int slaveAddress)
: base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress) : base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
{ {
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[] { new List<(int,int)> { (0,0), (1,1) }}, 100)); ((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[] { new List<(int,int)> { (1,1), (2,2) }, new List<(int, int)> { (3, 3), (4, 4) }}, 0));
} }
/// <summary> /// <summary>

2
Modbus.Net/Modbus.Net.Modbus/ModbusRtuInTcpProtocolLinker.cs
View File

@@ -24,7 +24,7 @@ namespace Modbus.Net.Modbus
public ModbusRtuInTcpProtocolLinker(string ip, int port) public ModbusRtuInTcpProtocolLinker(string ip, int port)
: base(ip, port) : base(ip, port)
{ {
((BaseConnector)BaseConnector).AddController(new FifoController(500)); ((BaseConnector)BaseConnector).AddController(new FifoController(0));
} }
/// <summary> /// <summary>

2
Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocolLinker.cs
View File

@@ -16,7 +16,7 @@ namespace Modbus.Net.Modbus
public ModbusRtuProtocolLinker(string com, int slaveAddress) public ModbusRtuProtocolLinker(string com, int slaveAddress)
: base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress) : base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
{ {
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[]{new List<(int,int)>{(0,0), (1,1)}}, 100)); ((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[]{new List<(int,int)>{(0,0)}, new List<(int, int)>{(1,1)}}, 0));
} }
/// <summary> /// <summary>

2
Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocolLinker.cs
View File

@@ -23,7 +23,7 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口</param> /// <param name="port">端口</param>
public ModbusTcpProtocolLinker(string ip, int port) : base(ip, port) public ModbusTcpProtocolLinker(string ip, int port) : base(ip, port)
{ {
((BaseConnector)BaseConnector).AddController(new FifoController(500)); ((BaseConnector)BaseConnector).AddController(new FifoController(0));
} }
/// <summary> /// <summary>

2
Modbus.Net/Modbus.Net.Siemens/SiemensPpiProtocolLinker.cs
View File

@@ -18,7 +18,7 @@ namespace Modbus.Net.Siemens
public SiemensPpiProtocolLinker(string com, int slaveAddress) public SiemensPpiProtocolLinker(string com, int slaveAddress)
: base(com, 9600, Parity.Even, StopBits.One, 8, slaveAddress) : base(com, 9600, Parity.Even, StopBits.One, 8, slaveAddress)
{ {
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[] { new List<(int,int)> { (4,5) }, new List<(int,int)> {(5,4) }, new List<(int,int)> { (11 ,11), (12,12) } }, 100)); ((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[] { new List<(int,int)> { (4,5) }, new List<(int,int)> {(5,4) }, new List<(int,int)> { (11 ,11), (12,12) } }, 0));
} }
/// <summary> /// <summary>

6
Modbus.Net/Modbus.Net/ComConnector.cs
View File

@@ -481,6 +481,7 @@ namespace Modbus.Net
{ {
try try
{ {
Thread.Sleep(100);
var returnBytes = ReadMsg(); var returnBytes = ReadMsg();
if (returnBytes != null) if (returnBytes != null)
{ {
@@ -496,9 +497,7 @@ namespace Modbus.Net
} }
RefreshReceiveCount(); RefreshReceiveCount();
} }
Thread.Sleep(500);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -513,7 +512,6 @@ namespace Modbus.Net
{ {
CheckOpen(); CheckOpen();
Thread.Sleep(100);
var i = ReadComm(out var data, 10, 5000, 1000); var i = ReadComm(out var data, 10, 5000, 1000);
if (i > 0) if (i > 0)
{ {

7
Modbus.Net/Modbus.Net/FifoController.cs
View File

@@ -1,9 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using Serilog; using Serilog;
namespace Modbus.Net namespace Modbus.Net
@@ -19,7 +16,7 @@ namespace Modbus.Net
private int _waitingListMaxCount = 10000; private int _waitingListMaxCount = 10000;
private Semaphore _taskCycleSema; private readonly Semaphore _taskCycleSema;
/// <summary> /// <summary>
/// 间隔时间 /// 间隔时间
@@ -77,7 +74,7 @@ namespace Modbus.Net
} }
} }
if (sendSuccess) if (sendSuccess)
{ {
_taskCycleSema.WaitOne(); _taskCycleSema.WaitOne();
} }
} }

7
Modbus.Net/Modbus.Net/MatchController.cs
View File

@@ -1,10 +1,5 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Serilog;
namespace Modbus.Net namespace Modbus.Net
{ {