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

2015-04-29 update 2 change a interface in SimenseUtility

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2015-04-29 15:43:34 +08:00
parent 6009d656ba
commit 1ee85d8992
3 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ namespace ModBus.Net
/// 协议收发主体
/// </summary>
protected BaseProtocal Wrapper;
protected virtual string ConnectionString { get; set; }
protected string ConnectionString { get; set; }
public bool IsConnected
{

8
Modbus.Net/ModBus.Net/SimenseMachine.cs
View File

@@ -8,17 +8,17 @@ namespace ModBus.Net
{
public class SimenseMachine : BaseMachine
{
public SimenseMachine(SimenseType connectionType, string connectionString,
public SimenseMachine(SimenseType connectionType, string connectionString, SimenseMachineModel model,
IEnumerable<AddressUnit> getAddresses, bool keepConnect) : base(getAddresses, keepConnect)
{
BaseUtility = new SimenseUtility(connectionType, connectionString);
BaseUtility = new SimenseUtility(connectionType, connectionString, model);
AddressFormater = new AddressFormaterSimense();
AddressCombiner = new AddressCombinerContinus();
}
public SimenseMachine(SimenseType connectionType, string connectionString,
public SimenseMachine(SimenseType connectionType, string connectionString, SimenseMachineModel model,
IEnumerable<AddressUnit> getAddresses)
: this(connectionType, connectionString, getAddresses, false)
: this(connectionType, connectionString, model, getAddresses, false)
{
}
}

76
Modbus.Net/ModBus.Net/SimenseUtility.cs
View File

@@ -9,48 +9,22 @@ public enum SimenseType
Ppi = 0,
Mpi = 1,
Tcp = 2
}
};
public enum SimenseMachineModel
{
S7_200 = 0,
S7_200_Smart = 1,
S7_300 = 2,
S7_400 = 3,
S7_1200 = 4,
S7_1500 = 5
};
namespace ModBus.Net
{
public class SimenseUtility : BaseUtility
{
private string _connectionString;
protected override string ConnectionString
{
get { return _connectionString; }
set
{
string[] splitStrings = value.Split(',');
switch (splitStrings[1])
{
case "200":
{
_tdpuSize = 0x09;
_taspSrc = 0x1001;
_tsapDst = 0x1000;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x03c0;
break;
}
case "300":
case "400":
{
_tdpuSize = 0x1a;
_taspSrc = 0x4b54;
_tsapDst = 0x0302;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x00f0;
break;
}
}
_connectionString = splitStrings[0];
}
}
private byte _tdpuSize;
private ushort _taspSrc;
private ushort _tsapDst;
@@ -88,11 +62,35 @@ namespace ModBus.Net
}
}
public SimenseUtility(SimenseType connectionType, string connectionString)
public SimenseUtility(SimenseType connectionType, string connectionString, SimenseMachineModel model)
{
ConnectionString = connectionString;
switch (model)
{
case SimenseMachineModel.S7_200:
{
_tdpuSize = 0x09;
_taspSrc = 0x1001;
_tsapDst = 0x1000;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x03c0;
break;
}
case SimenseMachineModel.S7_300:
case SimenseMachineModel.S7_400:
{
_tdpuSize = 0x1a;
_taspSrc = 0x4b54;
_tsapDst = 0x0302;
_maxCalling = 0x0001;
_maxCalled = 0x0001;
_maxPdu = 0x00f0;
break;
}
}
ConnectionType = connectionType;
AddressTranslator = new AddressTranslatorSimense();
AddressTranslator = new AddressTranslatorSimense();
}
public override void SetConnectionType(int connectionType)