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-03-02 10:35:01 +08:00
parent fae5ec10b8
commit 9ded433d34
5 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs
View File

@@ -31,19 +31,23 @@ namespace Modbus.Net.Modbus
/// <summary> /// <summary>
/// Modbus设备 /// Modbus设备
/// </summary> /// </summary>
public class ModbusMachine : ModbusMachine<string, string> public class ModbusMachine : BaseMachine
{ {
public ModbusMachine(ModbusType connectionType, string connectionString, public ModbusMachine(ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit<string>> getAddresses, IEnumerable<AddressUnit> getAddresses, bool keepConnect, byte slaveAddress, byte masterAddress,
bool keepConnect, byte slaveAddress, byte masterAddress, Endian endian = Endian.BigEndianLsb) Endian endian = Endian.BigEndianLsb)
: base(connectionType, connectionString, getAddresses, keepConnect, slaveAddress, masterAddress, endian) : base(getAddresses, keepConnect, slaveAddress, masterAddress)
{ {
BaseUtility = new ModbusUtility(connectionType, connectionString, slaveAddress, masterAddress, endian);
AddressFormater = new AddressFormaterModbus();
AddressCombiner = new AddressCombinerContinus(AddressTranslator);
AddressCombinerSet = new AddressCombinerContinus(AddressTranslator);
} }
public ModbusMachine(ModbusType connectionType, string connectionString, public ModbusMachine(ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit<string>> getAddresses, IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress,
byte slaveAddress, byte masterAddress, Endian endian = Endian.BigEndianLsb) Endian endian = Endian.BigEndianLsb)
: base(connectionType, connectionString, getAddresses, slaveAddress, masterAddress, endian) : this(connectionType, connectionString, getAddresses, false, slaveAddress, masterAddress, endian)
{ {
} }
} }

13
Modbus.Net/Modbus.Net.OPC/OpcDaMachine.cs
View File

@@ -26,15 +26,18 @@ namespace Modbus.Net.OPC
/// <summary> /// <summary>
/// OpcDa设备 /// OpcDa设备
/// </summary> /// </summary>
public class OpcDaMachine : OpcDaMachine<string, string> public class OpcDaMachine : BaseMachine
{ {
public OpcDaMachine(string connectionString, IEnumerable<AddressUnit<string>> getAddresses, bool keepConnect) public OpcDaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses, bool keepConnect)
: base(connectionString, getAddresses, keepConnect) : base(getAddresses, keepConnect)
{ {
BaseUtility = new OpcDaUtility(connectionString);
AddressCombiner = new AddressCombinerSingle();
AddressCombinerSet = new AddressCombinerSingle();
} }
public OpcDaMachine(string connectionString, IEnumerable<AddressUnit<string>> getAddresses) public OpcDaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses)
: base(connectionString, getAddresses) : this(connectionString, getAddresses, false)
{ {
} }
} }

14
Modbus.Net/Modbus.Net.Siemens/SiemensMachine.cs
View File

@@ -29,17 +29,21 @@ namespace Modbus.Net.Siemens
/// <summary> /// <summary>
/// 西门子设备 /// 西门子设备
/// </summary> /// </summary>
public class SiemensMachine : SiemensMachine<string, string> public class SiemensMachine : BaseMachine
{ {
public SiemensMachine(SiemensType connectionType, string connectionString, SiemensMachineModel model, public SiemensMachine(SiemensType connectionType, string connectionString, SiemensMachineModel model,
IEnumerable<AddressUnit<string>> getAddresses, bool keepConnect, byte slaveAddress, byte masterAddress) IEnumerable<AddressUnit> getAddresses, bool keepConnect, byte slaveAddress, byte masterAddress)
: base(connectionType, connectionString, model, getAddresses, keepConnect, slaveAddress, masterAddress) : base(getAddresses, keepConnect, slaveAddress, masterAddress)
{ {
BaseUtility = new SiemensUtility(connectionType, connectionString, model, slaveAddress, masterAddress);
AddressFormater = new AddressFormaterSiemens();
AddressCombiner = new AddressCombinerContinus(AddressTranslator);
AddressCombinerSet = new AddressCombinerContinus(AddressTranslator);
} }
public SiemensMachine(SiemensType connectionType, string connectionString, SiemensMachineModel model, public SiemensMachine(SiemensType connectionType, string connectionString, SiemensMachineModel model,
IEnumerable<AddressUnit<string>> getAddresses, byte slaveAddress, byte masterAddress) IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress)
: base(connectionType, connectionString, model, getAddresses, slaveAddress, masterAddress) : this(connectionType, connectionString, model, getAddresses, false, slaveAddress, masterAddress)
{ {
} }
} }

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

@@ -59,16 +59,16 @@ namespace Modbus.Net
public abstract class BaseMachine : BaseMachine<string, string> public abstract class BaseMachine : BaseMachine<string, string>
{ {
protected BaseMachine(IEnumerable<AddressUnit<string>> getAddresses) : base(getAddresses) protected BaseMachine(IEnumerable<AddressUnit> getAddresses) : base(getAddresses)
{ {
} }
protected BaseMachine(IEnumerable<AddressUnit<string>> getAddresses, bool keepConnect) protected BaseMachine(IEnumerable<AddressUnit> getAddresses, bool keepConnect)
: base(getAddresses, keepConnect) : base(getAddresses, keepConnect)
{ {
} }
protected BaseMachine(IEnumerable<AddressUnit<string>> getAddresses, bool keepConnect, byte slaveAddress, protected BaseMachine(IEnumerable<AddressUnit> getAddresses, bool keepConnect, byte slaveAddress,
byte masterAddress) : base(getAddresses, keepConnect, slaveAddress, masterAddress) byte masterAddress) : base(getAddresses, keepConnect, slaveAddress, masterAddress)
{ {
} }

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

@@ -22,13 +22,6 @@ namespace Modbus.Net
Id Id
} }
/// <summary>
/// 返回结果的定义类
/// </summary>
public class TaskReturnDef : TaskReturnDef<string>
{
}
/// <summary> /// <summary>
/// 返回结果的定义类 /// 返回结果的定义类
/// </summary> /// </summary>