diff --git a/NA200H/ModBus.Net/Connector.cs b/NA200H/ModBus.Net/BaseConnector.cs
similarity index 90%
rename from NA200H/ModBus.Net/Connector.cs
rename to NA200H/ModBus.Net/BaseConnector.cs
index fc29bcf..5e3e60b 100644
--- a/NA200H/ModBus.Net/Connector.cs
+++ b/NA200H/ModBus.Net/BaseConnector.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace ModBus.Net
{
- public abstract class Connector
+ public abstract class BaseConnector
{
public abstract bool Connect();
public abstract bool Disconnect();
diff --git a/NA200H/ModBus.Net/ComConnector.cs b/NA200H/ModBus.Net/ComConnector.cs
index 5840324..511b3d1 100644
--- a/NA200H/ModBus.Net/ComConnector.cs
+++ b/NA200H/ModBus.Net/ComConnector.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace ModBus.Net
{
- public class ComConnector : Connector, IDisposable
+ public class ComConnector : BaseConnector, IDisposable
{
private SerialPort serialPort1 = new SerialPort();
diff --git a/NA200H/ModBus.Net/ModBus.Net.csproj b/NA200H/ModBus.Net/ModBus.Net.csproj
index 4e8073b..98f435b 100644
--- a/NA200H/ModBus.Net/ModBus.Net.csproj
+++ b/NA200H/ModBus.Net/ModBus.Net.csproj
@@ -44,17 +44,17 @@
-
+
True
True
ConfigurationManager.resx
-
+
-
-
+
+
@@ -62,7 +62,7 @@
-
+
Code
diff --git a/NA200H/ModBus.Net/ModbusComProtocal.cs b/NA200H/ModBus.Net/ModbusComProtocal.cs
deleted file mode 100644
index 7aed19f..0000000
--- a/NA200H/ModBus.Net/ModbusComProtocal.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ModBus.Net
-{
- public class ModbusComProtocal : ModbusProtocal
- {
- public ModbusComProtocal()
- {
- _protocalLinker = new ModbusComProtocalLinker();
- }
-
- public ModbusComProtocal(string com)
- {
- _protocalLinker = new ModbusComProtocalLinker(com);
- }
- }
-}
diff --git a/NA200H/ModBus.Net/ModbusRtuProtocal.cs b/NA200H/ModBus.Net/ModbusRtuProtocal.cs
new file mode 100644
index 0000000..e0b8055
--- /dev/null
+++ b/NA200H/ModBus.Net/ModbusRtuProtocal.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ModBus.Net
+{
+ public class ModbusRtuProtocal : ModbusProtocal
+ {
+ public ModbusRtuProtocal()
+ {
+ _protocalLinker = new ModbusRtuProtocalLinker();
+ }
+
+ public ModbusRtuProtocal(string com)
+ {
+ _protocalLinker = new ModbusRtuProtocalLinker(com);
+ }
+ }
+}
diff --git a/NA200H/ModBus.Net/ModbusComProtocalLinker.cs b/NA200H/ModBus.Net/ModbusRtuProtocalLinker.cs
similarity index 78%
rename from NA200H/ModBus.Net/ModbusComProtocalLinker.cs
rename to NA200H/ModBus.Net/ModbusRtuProtocalLinker.cs
index f1cc29b..b9349b9 100644
--- a/NA200H/ModBus.Net/ModbusComProtocalLinker.cs
+++ b/NA200H/ModBus.Net/ModbusRtuProtocalLinker.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace ModBus.Net
{
- class ModbusComProtocalLinker : ComProtocalLinker
+ class ModbusRtuProtocalLinker : RtuProtocalLinker
{
public override bool CheckRight(byte[] content)
{
@@ -21,12 +21,12 @@ namespace ModBus.Net
return true;
}
- public ModbusComProtocalLinker() : base()
+ public ModbusRtuProtocalLinker() : base()
{
}
- public ModbusComProtocalLinker(string com) : base(com)
+ public ModbusRtuProtocalLinker(string com) : base(com)
{
}
diff --git a/NA200H/ModBus.Net/ProtocalLinker.cs b/NA200H/ModBus.Net/ProtocalLinker.cs
index 3547b0c..9f2f959 100644
--- a/NA200H/ModBus.Net/ProtocalLinker.cs
+++ b/NA200H/ModBus.Net/ProtocalLinker.cs
@@ -7,7 +7,7 @@ namespace ModBus.Net
///
public abstract class ProtocalLinker
{
- protected Connector _baseConnector;
+ protected BaseConnector _baseConnector;
///
/// 发送并接收数据
diff --git a/NA200H/ModBus.Net/ComProtocalLinker.cs b/NA200H/ModBus.Net/RtuProtocalLinker.cs
similarity index 70%
rename from NA200H/ModBus.Net/ComProtocalLinker.cs
rename to NA200H/ModBus.Net/RtuProtocalLinker.cs
index f397213..ed2f0af 100644
--- a/NA200H/ModBus.Net/ComProtocalLinker.cs
+++ b/NA200H/ModBus.Net/RtuProtocalLinker.cs
@@ -6,15 +6,15 @@ using System.Threading.Tasks;
namespace ModBus.Net
{
- public abstract class ComProtocalLinker : ProtocalLinker
+ public abstract class RtuProtocalLinker : ProtocalLinker
{
- protected ComProtocalLinker()
+ protected RtuProtocalLinker()
{
//初始化连对象
_baseConnector = new ComConnector(ConfigurationManager.COM);
}
- protected ComProtocalLinker(string com)
+ protected RtuProtocalLinker(string com)
{
_baseConnector = new ComConnector(com);
}
diff --git a/NA200H/ModBus.Net/TCPProtocalLinker.cs b/NA200H/ModBus.Net/TCPProtocalLinker.cs
index 7ab3fcd..06c0ff4 100644
--- a/NA200H/ModBus.Net/TCPProtocalLinker.cs
+++ b/NA200H/ModBus.Net/TCPProtocalLinker.cs
@@ -13,12 +13,12 @@ namespace ModBus.Net
protected TcpProtocalLinker()
{
//初始化连对象
- _baseConnector = new TcpSocket(ConfigurationManager.IP, int.Parse(ConfigurationManager.Port), false);
+ _baseConnector = new TcpConnector(ConfigurationManager.IP, int.Parse(ConfigurationManager.Port), false);
}
protected TcpProtocalLinker(string ip)
{
- _baseConnector = new TcpSocket(ip, int.Parse(ConfigurationManager.Port), false);
+ _baseConnector = new TcpConnector(ip, int.Parse(ConfigurationManager.Port), false);
}
}
}
\ No newline at end of file
diff --git a/NA200H/ModBus.Net/TCPSocket.cs b/NA200H/ModBus.Net/TcpConnector.cs
similarity index 98%
rename from NA200H/ModBus.Net/TCPSocket.cs
rename to NA200H/ModBus.Net/TcpConnector.cs
index 9922d66..e700a2e 100644
--- a/NA200H/ModBus.Net/TCPSocket.cs
+++ b/NA200H/ModBus.Net/TcpConnector.cs
@@ -21,7 +21,7 @@ namespace ModBus.Net
/// Socket收发类
/// 作者:本类来源于CSDN,并由罗圣(Chris L.)根据实际需要修改
///
- public class TcpSocket : Connector, IDisposable
+ public class TcpConnector : BaseConnector, IDisposable
{
public delegate void ErrorShutdownEventHandler(object sender, EventArgs e);
@@ -38,7 +38,7 @@ namespace ModBus.Net
public int m_sendCount = 0;
private TcpClient m_socketClient;
- public TcpSocket(string ipaddress, int port, bool isAsync)
+ public TcpConnector(string ipaddress, int port, bool isAsync)
{
host = ipaddress;
this.port = port;
diff --git a/NA200H/NA200H.UI.Console/Program.cs b/NA200H/NA200H.UI.Console/Program.cs
index 5c7975f..5a920cd 100644
--- a/NA200H/NA200H.UI.Console/Program.cs
+++ b/NA200H/NA200H.UI.Console/Program.cs
@@ -88,7 +88,7 @@ namespace NA200H.UI.ConsoleApp
*/
//先初始化一个协议转换器,这里构造Modbus/Rtu协议。
- BaseProtocal wrapper = new ModbusComProtocal();
+ BaseProtocal wrapper = new ModbusRtuProtocal();
//调用方法一:手动构造
//第一步:先生成一个输入信息的object数组