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

Emergency Fix for Modbus.Net.Modbus, LittleEndianLsb not working

Browse Source
This commit is contained in:
parallelbgls
2017-12-26 16:00:42 +08:00
parent ee9415f0e6
commit b4a5eb17b8
11 changed files with 110 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modbus.Net/Modbus.Net.Modbus.Core/Modbus.Net.Modbus.Core.csproj
View File

@@ -4,7 +4,7 @@
<AssemblyName>Modbus.Net.Modbus.Core</AssemblyName> <AssemblyName>Modbus.Net.Modbus.Core</AssemblyName>
<RootNamespace>Modbus.Net.Modbus</RootNamespace> <RootNamespace>Modbus.Net.Modbus</RootNamespace>
<PackageId>Modbus.Net.Modbus.Core</PackageId> <PackageId>Modbus.Net.Modbus.Core</PackageId>
<Version>1.3.10</Version> <Version>1.3.10.2</Version>
<Authors>Chris L.(Luo Sheng)</Authors> <Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian IoT Science Technology Co.,Ltd.</Company> <Company>Hangzhou Delian IoT Science Technology Co.,Ltd.</Company>
<Product>Modbus.Net.Modbus</Product> <Product>Modbus.Net.Modbus</Product>

2
Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
View File

@@ -5,7 +5,7 @@
<AssemblyName>Modbus.Net.Modbus</AssemblyName> <AssemblyName>Modbus.Net.Modbus</AssemblyName>
<RootNamespace>Modbus.Net.Modbus</RootNamespace> <RootNamespace>Modbus.Net.Modbus</RootNamespace>
<PackageId>Modbus.Net.Modbus</PackageId> <PackageId>Modbus.Net.Modbus</PackageId>
<Version>1.3.10</Version> <Version>1.3.10.2</Version>
<Authors>Chris L.(Luo Sheng)</Authors> <Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian IoT Science Technology Co.,Ltd.</Company> <Company>Hangzhou Delian IoT Science Technology Co.,Ltd.</Company>
<Product>Modbus.Net.Modbus</Product> <Product>Modbus.Net.Modbus</Product>

17
Modbus.Net/src/Modbus.Common/ModbusAsciiInTcpProtocal.cs
View File

@@ -12,21 +12,19 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusAsciiInTcpProtocal(byte slaveAddress, byte masterAddress)
public ModbusAsciiInTcpProtocal(byte slaveAddress, byte masterAddress, Endian endian) : this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress)
: this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress, endian)
{ {
} }
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
/// </summary> /// </summary>
/// <param name="com">串口地址</param> /// <param name="ip">ip地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusAsciiInTcpProtocal(string ip, byte slaveAddress, byte masterAddress)
public ModbusAsciiInTcpProtocal(string ip, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusAsciiInTcpProtocalLinker(ip, slaveAddress); ProtocalLinker = new ModbusAsciiInTcpProtocalLinker(ip, slaveAddress);
} }
@@ -38,9 +36,8 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口</param> /// <param name="port">端口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusAsciiInTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress)
public ModbusAsciiInTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusTcpProtocalLinker(ip, port); ProtocalLinker = new ModbusTcpProtocalLinker(ip, port);
} }

10
Modbus.Net/src/Modbus.Common/ModbusAsciiProtocal.cs
View File

@@ -12,9 +12,8 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusAsciiProtocal(byte slaveAddress, byte masterAddress)
public ModbusAsciiProtocal(byte slaveAddress, byte masterAddress, Endian endian) : this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress)
: this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress, endian)
{ {
} }
@@ -24,9 +23,8 @@ namespace Modbus.Net.Modbus
/// <param name="com">串口地址</param> /// <param name="com">串口地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusAsciiProtocal(string com, byte slaveAddress, byte masterAddress)
public ModbusAsciiProtocal(string com, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusAsciiProtocalLinker(com, slaveAddress); ProtocalLinker = new ModbusAsciiProtocalLinker(com, slaveAddress);
} }

5
Modbus.Net/src/Modbus.Common/ModbusProtocal.cs
View File

@@ -98,9 +98,8 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站地址</param> /// <param name="slaveAddress">从站地址</param>
/// <param name="masterAddress">主站地址</param> /// <param name="masterAddress">主站地址</param>
/// <param name="endian">端格式</param> protected ModbusProtocal(byte slaveAddress, byte masterAddress)
protected ModbusProtocal(byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress, Endian.BigEndianLsb)
: base(slaveAddress, masterAddress, endian)
{ {
} }

18
Modbus.Net/src/Modbus.Common/ModbusRtuInTcpProtocal.cs
View File

@@ -13,9 +13,8 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusRtuInTcpProtocal(byte slaveAddress, byte masterAddress)
public ModbusRtuInTcpProtocal(byte slaveAddress, byte masterAddress, Endian endian) : this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress)
: this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress, endian)
{ {
} }
@@ -25,9 +24,8 @@ namespace Modbus.Net.Modbus
/// <param name="ip">ip地址</param> /// <param name="ip">ip地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusRtuInTcpProtocal(string ip, byte slaveAddress, byte masterAddress)
public ModbusRtuInTcpProtocal(string ip, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusTcpProtocalLinker(ip); ProtocalLinker = new ModbusTcpProtocalLinker(ip);
} }
@@ -35,12 +33,12 @@ namespace Modbus.Net.Modbus
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
/// </summary> /// </summary>
/// <param name="com">串口</param> /// <param name="ip">ip地址</param>
/// <param name="port">端口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusRtuInTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress)
public ModbusRtuInTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusRtuInTcpProtocalLinker(ip, port); ProtocalLinker = new ModbusRtuInTcpProtocalLinker(ip, port);
} }

10
Modbus.Net/src/Modbus.Common/ModbusRtuProtocal.cs
View File

@@ -12,9 +12,8 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusRtuProtocal(byte slaveAddress, byte masterAddress)
public ModbusRtuProtocal(byte slaveAddress, byte masterAddress, Endian endian) : this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress)
: this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress, endian)
{ {
} }
@@ -24,9 +23,8 @@ namespace Modbus.Net.Modbus
/// <param name="com">串口</param> /// <param name="com">串口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusRtuProtocal(string com, byte slaveAddress, byte masterAddress)
public ModbusRtuProtocal(string com, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusRtuProtocalLinker(com, slaveAddress); ProtocalLinker = new ModbusRtuProtocalLinker(com, slaveAddress);
} }

15
Modbus.Net/src/Modbus.Common/ModbusTcpProtocal.cs
View File

@@ -12,9 +12,8 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusTcpProtocal(byte slaveAddress, byte masterAddress)
public ModbusTcpProtocal(byte slaveAddress, byte masterAddress, Endian endian) : this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress)
: this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress, endian)
{ {
} }
@@ -24,9 +23,8 @@ namespace Modbus.Net.Modbus
/// <param name="ip">ip地址</param> /// <param name="ip">ip地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusTcpProtocal(string ip, byte slaveAddress, byte masterAddress)
public ModbusTcpProtocal(string ip, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusTcpProtocalLinker(ip); ProtocalLinker = new ModbusTcpProtocalLinker(ip);
} }
@@ -38,9 +36,8 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口</param> /// <param name="port">端口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param> public ModbusTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress)
public ModbusTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress)
: base(slaveAddress, masterAddress, endian)
{ {
ProtocalLinker = new ModbusTcpProtocalLinker(ip, port); ProtocalLinker = new ModbusTcpProtocalLinker(ip, port);
} }

29
Modbus.Net/src/Modbus.Common/ModbusUtility.cs
View File

@@ -35,6 +35,9 @@ namespace Modbus.Net.Modbus
AsciiInTcp = 4, AsciiInTcp = 4,
} }
/// <summary>
/// 写单个数据方法接口
/// </summary>
public interface IUtilityMethodWriteSingle : IUtilityMethod public interface IUtilityMethodWriteSingle : IUtilityMethod
{ {
/// <summary> /// <summary>
@@ -145,49 +148,49 @@ namespace Modbus.Net.Modbus
case ModbusType.Rtu: case ModbusType.Rtu:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusRtuProtocal(SlaveAddress, MasterAddress)
: new ModbusRtuProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian); : new ModbusRtuProtocal(ConnectionString, SlaveAddress, MasterAddress);
break; break;
} }
//Tcp协议 //Tcp协议
case ModbusType.Tcp: case ModbusType.Tcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusTcpProtocal(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian) ? new ModbusTcpProtocal(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian)); MasterAddress));
break; break;
} }
//Ascii协议 //Ascii协议
case ModbusType.Ascii: case ModbusType.Ascii:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiProtocal(SlaveAddress, MasterAddress)
: new ModbusAsciiProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian); : new ModbusAsciiProtocal(ConnectionString, SlaveAddress, MasterAddress);
break; break;
} }
//Rtu协议 //Rtu协议
case ModbusType.RtuInTcp: case ModbusType.RtuInTcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian) ? new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusRtuInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusRtuInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian)); MasterAddress));
break; break;
} }
//Ascii协议 //Ascii协议
case ModbusType.AsciiInTcp: case ModbusType.AsciiInTcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusAsciiInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusAsciiInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian)); MasterAddress));
break; break;
} }
} }

60
Tests/Modbus.Net.Tests/EndianTest.cs Normal file
View File

@@ -0,0 +1,60 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
namespace Modbus.Net.Tests
{
[TestClass]
public class EndianTest
{
private BaseMachine _modbusTcpMachine;
private BaseMachine _modbusTcpMachine2;
[TestInitialize]
public void Init()
{
_modbusTcpMachine = new ModbusMachine(ModbusType.Tcp, "127.0.0.1", null, true, 1, 0);
_modbusTcpMachine2 = new ModbusMachine(ModbusType.Tcp, "127.0.0.1", null, true, 1, 0, Endian.LittleEndianLsb);
}
[TestMethod]
public async Task ModbusEndianSingle()
{
Random r = new Random();
var addresses = new List<AddressUnit>
{
new AddressUnit
{
Id = "0",
Area = "4X",
Address = 1,
SubAddress = 0,
CommunicationTag = "A1",
DataType = typeof(ushort)
}
};
var dic1 = new Dictionary<string, double>()
{
{
"4X 1", r.Next(0, UInt16.MaxValue)
}
};
_modbusTcpMachine.GetAddresses = addresses;
_modbusTcpMachine2.GetAddresses = addresses;
await _modbusTcpMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineGetDataType.Address);
var ans2 = await _modbusTcpMachine2.GetDatasAsync(MachineGetDataType.Address);
Assert.AreEqual(ans["4X 1.0"].PlcValue, dic1["4X 1"]);
Assert.AreEqual(ans2["4X 1.0"].PlcValue, (ushort)dic1["4X 1"] % 256 * 256 + (ushort)dic1["4X 1"] / 256);
}
}
}

1
Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
View File

@@ -52,6 +52,7 @@
</Otherwise> </Otherwise>
</Choose> </Choose>
<ItemGroup> <ItemGroup>
<Compile Include="EndianTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ModbusTest.cs" /> <Compile Include="ModbusTest.cs" />
<Compile Include="SiemensTest.cs" /> <Compile Include="SiemensTest.cs" />