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

2016-01-30 update 1

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2016-01-30 12:02:46 +08:00
parent a2c22e78da
commit a7162ebf70
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs
View File

@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.4.5.0128")] [assembly: AssemblyVersion("1.0.0.1")]
[assembly: AssemblyFileVersion("0.4.5.0128")] [assembly: AssemblyFileVersion("1.0.0.1")]

57
Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
View File

@@ -66,38 +66,47 @@ namespace ModBus.Net.Siemens
switch (model) switch (model)
{ {
case SiemensMachineModel.S7_200: case SiemensMachineModel.S7_200:
{
_tdpuSize = 0x09;
_taspSrc = 0x1001;
_tsapDst = 0x1000;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x03c0;
break;
}
case SiemensMachineModel.S7_300:
case SiemensMachineModel.S7_400:
{
_tdpuSize = 0x1a;
_taspSrc = 0x4b54;
_tsapDst = 0x0302;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x00f0;
break;
}
case SiemensMachineModel.S7_1200:
case SiemensMachineModel.S7_1500:
case SiemensMachineModel.S7_200_Smart:
{ {
_tdpuSize = 0x09; _tdpuSize = 0x09;
_taspSrc = 0x1001;
_tsapDst = 0x1000;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x03c0;
break;
}
case SiemensMachineModel.S7_300:
case SiemensMachineModel.S7_400:
{
_tdpuSize = 0x1a;
_taspSrc = 0x4b54; _taspSrc = 0x4b54;
_tsapDst = 0x0300; _tsapDst = 0x0302;
_maxCalling = 0x0001; _maxCalling = 0x0001;
_maxCalled = 0x0001; _maxCalled = 0x0001;
_maxPdu = 0x00f0; _maxPdu = 0x00f0;
break; break;
} }
case SiemensMachineModel.S7_1200:
case SiemensMachineModel.S7_1500:
{
_tdpuSize = 0x0a;
_taspSrc = 0x1011;
_tsapDst = 0x0301;
_maxCalling = 0x0003;
_maxCalled = 0x0003;
_maxPdu = 0x0100;
break;
}
case SiemensMachineModel.S7_200_Smart:
{
_tdpuSize = 0x0a;
_taspSrc = 0x0101;
_tsapDst = 0x0101;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x03c0;
break;
}
default: default:
{ {
throw new NotImplementedException("没有相应的西门子类型"); throw new NotImplementedException("没有相应的西门子类型");